tor-commits June 2018

tor-commits@lists.torproject.org

16 participants
2190 discussions

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 29 Jun '18

29 Jun '18

commit ea53d46a99f35ce57efb2a10774fb065b4ca22bf Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jun 29 06:16:19 2018 +0000 Update translations for tor-launcher-properties --- gu/torlauncher.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gu/torlauncher.properties b/gu/torlauncher.properties index a4d097a76..0f0bdee0d 100644 --- a/gu/torlauncher.properties +++ b/gu/torlauncher.properties @@ -45,7 +45,7 @@ torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor torlauncher.quit=Quit torlauncher.quit_win=Exit -torlauncher.done=Done +torlauncher.done=થઈ ગયું torlauncher.forAssistance=For assistance, contact %S torlauncher.forAssistance2=For assistance, visit %S

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 29 Jun '18

29 Jun '18

commit 72bdf054c1f0e223c64499c3623fdbb4890a3280 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jun 29 06:15:30 2018 +0000 Update translations for https_everywhere --- gu/ssl-observatory.dtd | 2 +- hi/ssl-observatory.dtd | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gu/ssl-observatory.dtd b/gu/ssl-observatory.dtd index b432a8f1d..bc967d2aa 100644 --- a/gu/ssl-observatory.dtd +++ b/gu/ssl-observatory.dtd @@ -50,7 +50,7 @@ intrusive corporate network:"> <!ENTITY ssl-observatory.prefs.show_cert_warning_tooltip "This will check submitted certificates against known Certificate Revocation Lists. Unfortunately we cannot guarantee that we will flag every revoked certificate, but if you do see a warning there's a good chance something is wrong."> -<!ENTITY ssl-observatory.prefs.done "Done"> +<!ENTITY ssl-observatory.prefs.done "થઈ ગયું"> <!ENTITY ssl-observatory.prefs.explanation "HTTPS Everywhere can use EFF's SSL Observatory. This does two things: (1) diff --git a/hi/ssl-observatory.dtd b/hi/ssl-observatory.dtd index 73a383877..73b1ae5f0 100644 --- a/hi/ssl-observatory.dtd +++ b/hi/ssl-observatory.dtd @@ -13,21 +13,21 @@ and auditing the certificates being presented to your browser. Would you like to turn it on?">--> <!ENTITY ssl-observatory.popup.title -"Should HTTPS Everywhere use the SSL Observatory?"> +"क्या HTTPS Everywhere SSL Observatory का उपयोग करना चाहिए?"> <!ENTITY ssl-observatory.popup.yes "हाँ">  <!ENTITY ssl-observatory.prefs.adv_priv_opts1 -"It is safe to enable this, unless you use a very -intrusive corporate network:"> +"यह सक्षम करने के लिए सुरक्षित है, जब तक आप बहुत उपयोग नहीं करते +दखल कॉर्पोरेट नेटवर्क:"> <!ENTITY ssl-observatory.prefs.adv_priv_opts2 -"Safe, unless you use a corporate network with secret intranet server names:"> +"सुरक्षित, जब तक कि आप गुप्त इंट्रानेट सर्वर नामों के साथ कॉर्पोरेट नेटवर्क का उपयोग न करें:"> <!ENTITY ssl-observatory.prefs.alt_roots -"Submit and check certificates signed by non-standard root CAs"> +"गैर-मानक रूट CA द्वारा हस्ताक्षरित प्रमाणपत्र जमा करें और जांचें"> <!ENTITY ssl-observatory.prefs.alt_roots_tooltip "It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network or Kaspersky antivirus software that monitors your browsing with a TLS proxy and a private root Certificate Authority. If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce. So we leave it off by default.">

1 0

[tor/master] Move buffers into container
by nickm＠torproject.org 28 Jun '18

28 Jun '18

commit d8b34e0886c9fd08fb51e0de4fadca7da82056ff Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 28 16:25:06 2018 -0400 Move buffers into container Split the network-only and compression-only parts of buffers into the appropriate modules. --- src/common/include.am | 2 - src/lib/compress/.may_include | 1 + src/lib/compress/compress.h | 4 + src/lib/compress/compress_buf.c | 77 ++++++++++ src/lib/compress/include.am | 3 +- src/lib/container/.may_include | 7 +- src/{common => lib/container}/buffers.c | 247 ++------------------------------ src/{common => lib/container}/buffers.h | 14 +- src/lib/container/include.am | 2 + src/lib/net/buffers_net.c | 192 +++++++++++++++++++++++++ src/lib/net/buffers_net.h | 26 ++++ src/lib/net/include.am | 2 + src/lib/tls/buffers_tls.c | 2 +- src/or/connection.c | 2 +- src/or/main.c | 1 + 15 files changed, 327 insertions(+), 255 deletions(-) diff --git a/src/common/include.am b/src/common/include.am index bb1a3ee42..e68a87b10 100644 --- a/src/common/include.am +++ b/src/common/include.am @@ -25,7 +25,6 @@ endif LIBOR_A_SRC = \ src/common/address_set.c \ - src/common/buffers.c \ src/common/compat.c \ src/common/util.c \ src/common/token_bucket.c \ @@ -60,7 +59,6 @@ src_common_libor_event_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) COMMONHEADERS = \ src/common/address_set.h \ - src/common/buffers.h \ src/common/compat.h \ src/common/compat_libevent.h \ src/common/handles.h \ diff --git a/src/lib/compress/.may_include b/src/lib/compress/.may_include index 036177469..68fe9f1c5 100644 --- a/src/lib/compress/.may_include +++ b/src/lib/compress/.may_include @@ -2,6 +2,7 @@ orconfig.h lib/arch/*.h lib/cc/*.h lib/compress/*.h +lib/container/*.h lib/ctime/*.h lib/intmath/*.h lib/log/*.h diff --git a/src/lib/compress/compress.h b/src/lib/compress/compress.h index f88cf2cb2..ae98e1aae 100644 --- a/src/lib/compress/compress.h +++ b/src/lib/compress/compress.h @@ -92,4 +92,8 @@ size_t tor_compress_state_size(const tor_compress_state_t *state); void tor_compress_init(void); void tor_compress_log_init_warnings(void); +struct buf_t; +int buf_add_compress(struct buf_t *buf, struct tor_compress_state_t *state, + const char *data, size_t data_len, int done); + #endif /* !defined(TOR_COMPRESS_H) */ diff --git a/src/lib/compress/compress_buf.c b/src/lib/compress/compress_buf.c new file mode 100644 index 000000000..4b8877238 --- /dev/null +++ b/src/lib/compress/compress_buf.c @@ -0,0 +1,77 @@ +/* Copyright (c) 2003, Roger Dingledine + * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. + * Copyright (c) 2007-2018, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +#define BUFFERS_PRIVATE +#include "lib/cc/compat_compiler.h" +#include "lib/container/buffers.h" +#include "lib/compress/compress.h" +#include "lib/log/util_bug.h" + +#ifdef PARANOIA +/** Helper: If PARANOIA is defined, assert that the buffer in local variable + * buf is well-formed. */ +#define check() STMT_BEGIN buf_assert_ok(buf); STMT_END +#else +#define check() STMT_NIL +#endif /* defined(PARANOIA) */ + +/** Compress or uncompress the data_len bytes in data using the + * compression state state, appending the result to buf. If + * done is true, flush the data in the state and finish the + * compression/uncompression. Return -1 on failure, 0 on success. */ +int +buf_add_compress(buf_t *buf, tor_compress_state_t *state, + const char *data, size_t data_len, + const int done) +{ + char *next; + size_t old_avail, avail; + int over = 0; + + do { + int need_new_chunk = 0; + if (!buf->tail || ! CHUNK_REMAINING_CAPACITY(buf->tail)) { + size_t cap = data_len / 4; + buf_add_chunk_with_capacity(buf, cap, 1); + } + next = CHUNK_WRITE_PTR(buf->tail); + avail = old_avail = CHUNK_REMAINING_CAPACITY(buf->tail); + switch (tor_compress_process(state, &next, &avail, + &data, &data_len, done)) { + case TOR_COMPRESS_DONE: + over = 1; + break; + case TOR_COMPRESS_ERROR: + return -1; + case TOR_COMPRESS_OK: + if (data_len == 0) { + tor_assert_nonfatal(!done); + over = 1; + } + break; + case TOR_COMPRESS_BUFFER_FULL: + if (avail) { + /* The compression module says we need more room + * (TOR_COMPRESS_BUFFER_FULL). Start a new chunk automatically, + * whether were going to or not. */ + need_new_chunk = 1; + } + if (data_len == 0 && !done) { + /* We've consumed all the input data, though, so there's no + * point in forging ahead right now. */ + over = 1; + } + break; + } + buf->datalen += old_avail - avail; + buf->tail->datalen += old_avail - avail; + if (need_new_chunk) { + buf_add_chunk_with_capacity(buf, data_len/4, 1); + } + + } while (!over); + check(); + return 0; +} diff --git a/src/lib/compress/include.am b/src/lib/compress/include.am index eb3a89c35..75c9032bd 100644 --- a/src/lib/compress/include.am +++ b/src/lib/compress/include.am @@ -5,8 +5,9 @@ if UNITTESTS_ENABLED noinst_LIBRARIES += src/lib/libtor-compress-testing.a endif -src_lib_libtor_compress_a_SOURCES = \ +src_lib_libtor_compress_a_SOURCES = \ src/lib/compress/compress.c \ + src/lib/compress/compress_buf.c \ src/lib/compress/compress_lzma.c \ src/lib/compress/compress_none.c \ src/lib/compress/compress_zlib.c \ diff --git a/src/lib/container/.may_include b/src/lib/container/.may_include index 2eecb503c..90de5eda4 100644 --- a/src/lib/container/.may_include +++ b/src/lib/container/.may_include @@ -9,9 +9,10 @@ lib/smartlist_core/*.h lib/string/*.h lib/testsupport/testsupport.h lib/intmath/*.h +lib/log/*.h + +# XXXX I am unsure about this one. It's only here for buffers.c +lib/time/*.h ht.h siphash.h - -# XXX I'd like to remove this. -lib/log/util_bug.h diff --git a/src/common/buffers.c b/src/lib/container/buffers.c similarity index 77% rename from src/common/buffers.c rename to src/lib/container/buffers.c index 4e5f56c73..ee1a73e8f 100644 --- a/src/common/buffers.c +++ b/src/lib/container/buffers.c @@ -1,6 +1,6 @@ /* Copyright (c) 2001 Matej Pfajfar. * Copyright (c) 2001-2004, Roger Dingledine. - * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. +n * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. * Copyright (c) 2007-2018, The Tor Project, Inc. */ /* See LICENSE for licensing information */ @@ -21,16 +21,22 @@ #define BUFFERS_PRIVATE #include "orconfig.h" #include <stddef.h> -#include "common/buffers.h" -#include "common/compat.h" -#include "lib/compress/compress.h" -#include "common/util.h" +#include "lib/container/buffers.h" #include "lib/cc/torint.h" #include "lib/log/torlog.h" +#include "lib/log/util_bug.h" +#include "lib/ctime/di_ops.h" +#include "lib/malloc/util_malloc.h" +#include "lib/string/printf.h" +#include "lib/time/compat_time.h" + #ifdef HAVE_UNISTD_H #include <unistd.h> #endif +#include <stdlib.h> +#include <string.h> + //#define PARANOIA #ifdef PARANOIA @@ -506,177 +512,6 @@ buf_get_total_allocation(void) return total_bytes_allocated_in_chunks; } -/** Read up to at_most bytes from the socket fd into - * chunk (which must be on buf). If we get an EOF, set - * *reached_eof to 1. Return -1 on error, 0 on eof or blocking, - * and the number of bytes read otherwise. */ -static inline int -read_to_chunk(buf_t *buf, chunk_t *chunk, tor_socket_t fd, size_t at_most, - int *reached_eof, int *socket_error) -{ - ssize_t read_result; - if (at_most > CHUNK_REMAINING_CAPACITY(chunk)) - at_most = CHUNK_REMAINING_CAPACITY(chunk); - read_result = tor_socket_recv(fd, CHUNK_WRITE_PTR(chunk), at_most, 0); - - if (read_result < 0) { - int e = tor_socket_errno(fd); - if (!ERRNO_IS_EAGAIN(e)) { /* it's a real error */ -#ifdef _WIN32 - if (e == WSAENOBUFS) - log_warn(LD_NET,"recv() failed: WSAENOBUFS. Not enough ram?"); -#endif - *socket_error = e; - return -1; - } - return 0; /* would block. */ - } else if (read_result == 0) { - log_debug(LD_NET,"Encountered eof on fd %d", (int)fd); - *reached_eof = 1; - return 0; - } else { /* actually got bytes. */ - buf->datalen += read_result; - chunk->datalen += read_result; - log_debug(LD_NET,"Read %ld bytes. %d on inbuf.", (long)read_result, - (int)buf->datalen); - tor_assert(read_result < INT_MAX); - return (int)read_result; - } -} - -/** Read from socket s, writing onto end of buf. Read at most - * at_most bytes, growing the buffer as necessary. If recv() returns 0 - * (because of EOF), set *reached_eof to 1 and return 0. Return -1 on - * error; else return the number of bytes read. - */ -/* XXXX indicate "read blocked" somehow? */ -int -buf_read_from_socket(buf_t *buf, tor_socket_t s, size_t at_most, - int *reached_eof, - int *socket_error) -{ - /* XXXX It's stupid to overload the return values for these functions: - * "error status" and "number of bytes read" are not mutually exclusive. - */ - int r = 0; - size_t total_read = 0; - - check(); - tor_assert(reached_eof); - tor_assert(SOCKET_OK(s)); - - if (BUG(buf->datalen >= INT_MAX)) - return -1; - if (BUG(buf->datalen >= INT_MAX - at_most)) - return -1; - - while (at_most > total_read) { - size_t readlen = at_most - total_read; - chunk_t *chunk; - if (!buf->tail || CHUNK_REMAINING_CAPACITY(buf->tail) < MIN_READ_LEN) { - chunk = buf_add_chunk_with_capacity(buf, at_most, 1); - if (readlen > chunk->memlen) - readlen = chunk->memlen; - } else { - size_t cap = CHUNK_REMAINING_CAPACITY(buf->tail); - chunk = buf->tail; - if (cap < readlen) - readlen = cap; - } - - r = read_to_chunk(buf, chunk, s, readlen, reached_eof, socket_error); - check(); - if (r < 0) - return r; /* Error */ - tor_assert(total_read+r < INT_MAX); - total_read += r; - if ((size_t)r < readlen) { /* eof, block, or no more to read. */ - break; - } - } - return (int)total_read; -} - -/** Helper for buf_flush_to_socket(): try to write sz bytes from chunk - * chunk of buffer buf onto socket s. On success, deduct - * the bytes written from *buf_flushlen. Return the number of bytes - * written on success, 0 on blocking, -1 on failure. - */ -static inline int -flush_chunk(tor_socket_t s, buf_t *buf, chunk_t *chunk, size_t sz, - size_t *buf_flushlen) -{ - ssize_t write_result; - - if (sz > chunk->datalen) - sz = chunk->datalen; - write_result = tor_socket_send(s, chunk->data, sz, 0); - - if (write_result < 0) { - int e = tor_socket_errno(s); - if (!ERRNO_IS_EAGAIN(e)) { /* it's a real error */ -#ifdef _WIN32 - if (e == WSAENOBUFS) - log_warn(LD_NET,"write() failed: WSAENOBUFS. Not enough ram?"); -#endif - return -1; - } - log_debug(LD_NET,"write() would block, returning."); - return 0; - } else { - *buf_flushlen -= write_result; - buf_drain(buf, write_result); - tor_assert(write_result < INT_MAX); - return (int)write_result; - } -} - -/** Write data from buf to the socket s. Write at most - * sz bytes, decrement *buf_flushlen by - * the number of bytes actually written, and remove the written bytes - * from the buffer. Return the number of bytes written on success, - * -1 on failure. Return 0 if write() would block. - */ -int -buf_flush_to_socket(buf_t *buf, tor_socket_t s, size_t sz, - size_t *buf_flushlen) -{ - /* XXXX It's stupid to overload the return values for these functions: - * "error status" and "number of bytes flushed" are not mutually exclusive. - */ - int r; - size_t flushed = 0; - tor_assert(buf_flushlen); - tor_assert(SOCKET_OK(s)); - if (BUG(*buf_flushlen > buf->datalen)) { - *buf_flushlen = buf->datalen; - } - if (BUG(sz > *buf_flushlen)) { - sz = *buf_flushlen; - } - - check(); - while (sz) { - size_t flushlen0; - tor_assert(buf->head); - if (buf->head->datalen >= sz) - flushlen0 = sz; - else - flushlen0 = buf->head->datalen; - - r = flush_chunk(s, buf, buf->head, flushlen0, buf_flushlen); - check(); - if (r < 0) - return r; - flushed += r; - sz -= r; - if (r == 0 || (size_t)r < flushlen0) /* can't flush any more now. */ - break; - } - tor_assert(flushed < INT_MAX); - return (int)flushed; -} - /** Append string_len bytes from string to the end of * buf. * @@ -1037,65 +872,6 @@ buf_get_line(buf_t *buf, char *data_out, size_t *data_len) return 1; } -/** Compress or uncompress the data_len bytes in data using the - * compression state state, appending the result to buf. If - * done is true, flush the data in the state and finish the - * compression/uncompression. Return -1 on failure, 0 on success. */ -int -buf_add_compress(buf_t *buf, tor_compress_state_t *state, - const char *data, size_t data_len, - const int done) -{ - char *next; - size_t old_avail, avail; - int over = 0; - - do { - int need_new_chunk = 0; - if (!buf->tail || ! CHUNK_REMAINING_CAPACITY(buf->tail)) { - size_t cap = data_len / 4; - buf_add_chunk_with_capacity(buf, cap, 1); - } - next = CHUNK_WRITE_PTR(buf->tail); - avail = old_avail = CHUNK_REMAINING_CAPACITY(buf->tail); - switch (tor_compress_process(state, &next, &avail, - &data, &data_len, done)) { - case TOR_COMPRESS_DONE: - over = 1; - break; - case TOR_COMPRESS_ERROR: - return -1; - case TOR_COMPRESS_OK: - if (data_len == 0) { - tor_assert_nonfatal(!done); - over = 1; - } - break; - case TOR_COMPRESS_BUFFER_FULL: - if (avail) { - /* The compression module says we need more room - * (TOR_COMPRESS_BUFFER_FULL). Start a new chunk automatically, - * whether were going to or not. */ - need_new_chunk = 1; - } - if (data_len == 0 && !done) { - /* We've consumed all the input data, though, so there's no - * point in forging ahead right now. */ - over = 1; - } - break; - } - buf->datalen += old_avail - avail; - buf->tail->datalen += old_avail - avail; - if (need_new_chunk) { - buf_add_chunk_with_capacity(buf, data_len/4, 1); - } - - } while (!over); - check(); - return 0; -} - /** Set *output to contain a copy of the data in *input */ int buf_set_to_copy(buf_t **output, @@ -1143,4 +919,3 @@ buf_assert_ok(buf_t *buf) tor_assert(buf->datalen == total); } } - diff --git a/src/common/buffers.h b/src/lib/container/buffers.h similarity index 90% rename from src/common/buffers.h rename to src/lib/container/buffers.h index 80103af77..8b16fb298 100644 --- a/src/common/buffers.h +++ b/src/lib/container/buffers.h @@ -12,10 +12,12 @@ #ifndef TOR_BUFFERS_H #define TOR_BUFFERS_H -#include "common/compat.h" +#include "lib/cc/compat_compiler.h" #include "lib/cc/torint.h" #include "lib/testsupport/testsupport.h" +#include <stdarg.h> + typedef struct buf_t buf_t; struct tor_compress_state_t; @@ -35,21 +37,12 @@ size_t buf_slack(const buf_t *buf); uint32_t buf_get_oldest_chunk_timestamp(const buf_t *buf, uint32_t now); size_t buf_get_total_allocation(void); -int buf_read_from_socket(buf_t *buf, tor_socket_t s, size_t at_most, - int *reached_eof, - int *socket_error); - -int buf_flush_to_socket(buf_t *buf, tor_socket_t s, size_t sz, - size_t *buf_flushlen); - int buf_add(buf_t *buf, const char *string, size_t string_len); void buf_add_string(buf_t *buf, const char *string); void buf_add_printf(buf_t *buf, const char *format, ...) CHECK_PRINTF(2, 3); void buf_add_vprintf(buf_t *buf, const char *format, va_list args) CHECK_PRINTF(2, 0); -int buf_add_compress(buf_t *buf, struct tor_compress_state_t *state, - const char *data, size_t data_len, int done); int buf_move_to_buf(buf_t *buf_out, buf_t *buf_in, size_t *buf_flushlen); void buf_move_all(buf_t *buf_out, buf_t *buf_in); void buf_peek(const buf_t *buf, char *string, size_t string_len); @@ -128,4 +121,3 @@ CHUNK_WRITE_PTR(chunk_t *chunk) #endif /* defined(BUFFERS_PRIVATE) */ #endif /* !defined(TOR_BUFFERS_H) */ - diff --git a/src/lib/container/include.am b/src/lib/container/include.am index 0e7acdff9..e91ad7d1c 100644 --- a/src/lib/container/include.am +++ b/src/lib/container/include.am @@ -7,6 +7,7 @@ endif src_lib_libtor_container_a_SOURCES = \ src/lib/container/bloomfilt.c \ + src/lib/container/buffers.c \ src/lib/container/map.c \ src/lib/container/order.c \ src/lib/container/smartlist.c @@ -19,6 +20,7 @@ src_lib_libtor_container_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) noinst_HEADERS += \ src/lib/container/bitarray.h \ src/lib/container/bloomfilt.h \ + src/lib/container/buffers.h \ src/lib/container/map.h \ src/lib/container/order.h \ src/lib/container/smartlist.h diff --git a/src/lib/net/buffers_net.c b/src/lib/net/buffers_net.c new file mode 100644 index 000000000..01be30f5a --- /dev/null +++ b/src/lib/net/buffers_net.c @@ -0,0 +1,192 @@ +/* Copyright (c) 2001 Matej Pfajfar. + * Copyright (c) 2001-2004, Roger Dingledine. + * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. + * Copyright (c) 2007-2018, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +#define BUFFERS_PRIVATE +#include "lib/net/buffers_net.h" +#include "lib/container/buffers.h" +#include "lib/log/torlog.h" +#include "lib/log/util_bug.h" + +#include <stdlib.h> + +#ifdef PARANOIA +/** Helper: If PARANOIA is defined, assert that the buffer in local variable + * buf is well-formed. */ +#define check() STMT_BEGIN buf_assert_ok(buf); STMT_END +#else +#define check() STMT_NIL +#endif /* defined(PARANOIA) */ + +/** Read up to at_most bytes from the socket fd into + * chunk (which must be on buf). If we get an EOF, set + * *reached_eof to 1. Return -1 on error, 0 on eof or blocking, + * and the number of bytes read otherwise. */ +static inline int +read_to_chunk(buf_t *buf, chunk_t *chunk, tor_socket_t fd, size_t at_most, + int *reached_eof, int *socket_error) +{ + ssize_t read_result; + if (at_most > CHUNK_REMAINING_CAPACITY(chunk)) + at_most = CHUNK_REMAINING_CAPACITY(chunk); + read_result = tor_socket_recv(fd, CHUNK_WRITE_PTR(chunk), at_most, 0); + + if (read_result < 0) { + int e = tor_socket_errno(fd); + if (!ERRNO_IS_EAGAIN(e)) { /* it's a real error */ +#ifdef _WIN32 + if (e == WSAENOBUFS) + log_warn(LD_NET,"recv() failed: WSAENOBUFS. Not enough ram?"); +#endif + *socket_error = e; + return -1; + } + return 0; /* would block. */ + } else if (read_result == 0) { + log_debug(LD_NET,"Encountered eof on fd %d", (int)fd); + *reached_eof = 1; + return 0; + } else { /* actually got bytes. */ + buf->datalen += read_result; + chunk->datalen += read_result; + log_debug(LD_NET,"Read %ld bytes. %d on inbuf.", (long)read_result, + (int)buf->datalen); + tor_assert(read_result < INT_MAX); + return (int)read_result; + } +} + +/** Read from socket s, writing onto end of buf. Read at most + * at_most bytes, growing the buffer as necessary. If recv() returns 0 + * (because of EOF), set *reached_eof to 1 and return 0. Return -1 on + * error; else return the number of bytes read. + */ +/* XXXX indicate "read blocked" somehow? */ +int +buf_read_from_socket(buf_t *buf, tor_socket_t s, size_t at_most, + int *reached_eof, + int *socket_error) +{ + /* XXXX It's stupid to overload the return values for these functions: + * "error status" and "number of bytes read" are not mutually exclusive. + */ + int r = 0; + size_t total_read = 0; + + check(); + tor_assert(reached_eof); + tor_assert(SOCKET_OK(s)); + + if (BUG(buf->datalen >= INT_MAX)) + return -1; + if (BUG(buf->datalen >= INT_MAX - at_most)) + return -1; + + while (at_most > total_read) { + size_t readlen = at_most - total_read; + chunk_t *chunk; + if (!buf->tail || CHUNK_REMAINING_CAPACITY(buf->tail) < MIN_READ_LEN) { + chunk = buf_add_chunk_with_capacity(buf, at_most, 1); + if (readlen > chunk->memlen) + readlen = chunk->memlen; + } else { + size_t cap = CHUNK_REMAINING_CAPACITY(buf->tail); + chunk = buf->tail; + if (cap < readlen) + readlen = cap; + } + + r = read_to_chunk(buf, chunk, s, readlen, reached_eof, socket_error); + check(); + if (r < 0) + return r; /* Error */ + tor_assert(total_read+r < INT_MAX); + total_read += r; + if ((size_t)r < readlen) { /* eof, block, or no more to read. */ + break; + } + } + return (int)total_read; +} + +/** Helper for buf_flush_to_socket(): try to write sz bytes from chunk + * chunk of buffer buf onto socket s. On success, deduct + * the bytes written from *buf_flushlen. Return the number of bytes + * written on success, 0 on blocking, -1 on failure. + */ +static inline int +flush_chunk(tor_socket_t s, buf_t *buf, chunk_t *chunk, size_t sz, + size_t *buf_flushlen) +{ + ssize_t write_result; + + if (sz > chunk->datalen) + sz = chunk->datalen; + write_result = tor_socket_send(s, chunk->data, sz, 0); + + if (write_result < 0) { + int e = tor_socket_errno(s); + if (!ERRNO_IS_EAGAIN(e)) { /* it's a real error */ +#ifdef _WIN32 + if (e == WSAENOBUFS) + log_warn(LD_NET,"write() failed: WSAENOBUFS. Not enough ram?"); +#endif + return -1; + } + log_debug(LD_NET,"write() would block, returning."); + return 0; + } else { + *buf_flushlen -= write_result; + buf_drain(buf, write_result); + tor_assert(write_result < INT_MAX); + return (int)write_result; + } +} + +/** Write data from buf to the socket s. Write at most + * sz bytes, decrement *buf_flushlen by + * the number of bytes actually written, and remove the written bytes + * from the buffer. Return the number of bytes written on success, + * -1 on failure. Return 0 if write() would block. + */ +int +buf_flush_to_socket(buf_t *buf, tor_socket_t s, size_t sz, + size_t *buf_flushlen) +{ + /* XXXX It's stupid to overload the return values for these functions: + * "error status" and "number of bytes flushed" are not mutually exclusive. + */ + int r; + size_t flushed = 0; + tor_assert(buf_flushlen); + tor_assert(SOCKET_OK(s)); + if (BUG(*buf_flushlen > buf->datalen)) { + *buf_flushlen = buf->datalen; + } + if (BUG(sz > *buf_flushlen)) { + sz = *buf_flushlen; + } + + check(); + while (sz) { + size_t flushlen0; + tor_assert(buf->head); + if (buf->head->datalen >= sz) + flushlen0 = sz; + else + flushlen0 = buf->head->datalen; + + r = flush_chunk(s, buf, buf->head, flushlen0, buf_flushlen); + check(); + if (r < 0) + return r; + flushed += r; + sz -= r; + if (r == 0 || (size_t)r < flushlen0) /* can't flush any more now. */ + break; + } + tor_assert(flushed < INT_MAX); + return (int)flushed; +} diff --git a/src/lib/net/buffers_net.h b/src/lib/net/buffers_net.h new file mode 100644 index 000000000..d03b61376 --- /dev/null +++ b/src/lib/net/buffers_net.h @@ -0,0 +1,26 @@ +/* Copyright (c) 2001 Matej Pfajfar. + * Copyright (c) 2001-2004, Roger Dingledine. + * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. + * Copyright (c) 2007-2018, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +/** + * \file buffers.h + * \brief Header file for buffers.c. + **/ + +#ifndef TOR_BUFFERS_NET_H +#define TOR_BUFFERS_NET_H + +#include <stddef.h> +#include "lib/net/socket.h" + +struct buf_t; +int buf_read_from_socket(struct buf_t *buf, tor_socket_t s, size_t at_most, + int *reached_eof, + int *socket_error); + +int buf_flush_to_socket(struct buf_t *buf, tor_socket_t s, size_t sz, + size_t *buf_flushlen); + +#endif /* !defined(TOR_BUFFERS_H) */ diff --git a/src/lib/net/include.am b/src/lib/net/include.am index 6f34479db..a375ac8ad 100644 --- a/src/lib/net/include.am +++ b/src/lib/net/include.am @@ -8,6 +8,7 @@ endif src_lib_libtor_net_a_SOURCES = \ src/lib/net/address.c \ src/lib/net/alertsock.c \ + src/lib/net/buffers_net.c \ src/lib/net/gethostname.c \ src/lib/net/ipv4.c \ src/lib/net/ipv6.c \ @@ -22,6 +23,7 @@ src_lib_libtor_net_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) noinst_HEADERS += \ src/lib/net/address.h \ src/lib/net/alertsock.h \ + src/lib/net/buffers_net.h \ src/lib/net/gethostname.h \ src/lib/net/ipv4.h \ src/lib/net/ipv6.h \ diff --git a/src/lib/tls/buffers_tls.c b/src/lib/tls/buffers_tls.c index 0f9dd7a4d..243e0eb0b 100644 --- a/src/lib/tls/buffers_tls.c +++ b/src/lib/tls/buffers_tls.c @@ -7,7 +7,7 @@ #define BUFFERS_PRIVATE #include "orconfig.h" #include <stddef.h> -#include "common/buffers.h" +#include "lib/container/buffers.h" #include "lib/tls/buffers_tls.h" #include "lib/cc/torint.h" #include "lib/log/torlog.h" diff --git a/src/or/connection.c b/src/or/connection.c index 01067e94f..974281331 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -103,6 +103,7 @@ #include "or/transports.h" #include "or/routerparse.h" #include "lib/sandbox/sandbox.h" +#include "lib/net/buffers_net.h" #ifdef HAVE_PWD_H #include <pwd.h> @@ -5315,4 +5316,3 @@ clock_skew_warning, (const connection_t *conn, long apparent_skew, int trusted, tor_free(warn); tor_free(ext_source); } - diff --git a/src/or/main.c b/src/or/main.c index 0ba38658a..67ebc980c 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -113,6 +113,7 @@ #include "lib/memarea/memarea.h" #include "lib/sandbox/sandbox.h" #include "lib/fs/lockfile.h" +#include "lib/net/buffers_net.h" #include <event2/event.h>

1 0

[tor/master] Fix paths for buffers.h; automated.
by nickm＠torproject.org 28 Jun '18

28 Jun '18

commit 935ba025653567f1700d2590b3ccd008460dbf6e Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 28 16:29:35 2018 -0400 Fix paths for buffers.h; automated. --- src/or/connection.c | 2 +- src/or/connection.h | 2 +- src/or/connection_edge.c | 2 +- src/or/connection_or.c | 2 +- src/or/control.c | 2 +- src/or/directory.c | 2 +- src/or/dirserv.c | 2 +- src/or/geoip.c | 2 +- src/or/main.c | 2 +- src/or/proto_cell.c | 2 +- src/or/proto_control0.c | 2 +- src/or/proto_ext_or.c | 2 +- src/or/proto_http.c | 2 +- src/or/proto_socks.c | 2 +- src/or/relay.c | 2 +- src/or/scheduler.c | 2 +- src/or/scheduler_kist.c | 2 +- src/test/fuzz/fuzz_http.c | 2 +- src/test/fuzz/fuzz_http_connect.c | 2 +- src/test/test.c | 2 +- src/test/test_buffers.c | 2 +- src/test/test_channeltls.c | 2 +- src/test/test_extorport.c | 2 +- src/test/test_helpers.c | 2 +- src/test/test_oom.c | 2 +- src/test/test_proto_http.c | 2 +- src/test/test_proto_misc.c | 2 +- src/test/test_socks.c | 2 +- src/test/test_util.c | 2 +- 29 files changed, 29 insertions(+), 29 deletions(-) diff --git a/src/or/connection.c b/src/or/connection.c index 974281331..e3e9c313a 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -57,7 +57,7 @@ #define CONNECTION_PRIVATE #include "or/or.h" #include "or/bridges.h" -#include "common/buffers.h" +#include "lib/container/buffers.h" #include "lib/tls/buffers_tls.h" /* * Define this so we get channel internal functions, since we're implementing diff --git a/src/or/connection.h b/src/or/connection.h index 7fcf71021..1bbe17bff 100644 --- a/src/or/connection.h +++ b/src/or/connection.h @@ -15,7 +15,7 @@ listener_connection_t *TO_LISTENER_CONN(connection_t *); /* XXXX For buf_datalen in inline function */ -#include "common/buffers.h" +#include "lib/container/buffers.h" const char *conn_type_to_string(int type); const char *conn_state_to_string(int type, int state); diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 5bb85255b..e8185a5fa 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -60,7 +60,7 @@ #include "lib/err/backtrace.h" #include "or/addressmap.h" -#include "common/buffers.h" +#include "lib/container/buffers.h" #include "or/channel.h" #include "or/circpathbias.h" #include "or/circuitlist.h" diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 7badcd370..9692e5d67 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -22,7 +22,7 @@ **/ #include "or/or.h" #include "or/bridges.h" -#include "common/buffers.h" +#include "lib/container/buffers.h" /* * Define this so we get channel internal functions, since we're implementing * part of a subclass (channel_tls_t). diff --git a/src/or/control.c b/src/or/control.c index 13814804a..7063b4cb3 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -38,7 +38,7 @@ #include "or/or.h" #include "or/addressmap.h" #include "or/bridges.h" -#include "common/buffers.h" +#include "lib/container/buffers.h" #include "or/channel.h" #include "or/channeltls.h" #include "or/circuitbuild.h" diff --git a/src/or/directory.c b/src/or/directory.c index 2d3f7fe9a..4e34af305 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -8,7 +8,7 @@ #include "or/or.h" #include "lib/err/backtrace.h" #include "or/bridges.h" -#include "common/buffers.h" +#include "lib/container/buffers.h" #include "or/circuitbuild.h" #include "or/config.h" #include "or/connection.h" diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 693160e80..62d4e7322 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -5,7 +5,7 @@ #define DIRSERV_PRIVATE #include "or/or.h" -#include "common/buffers.h" +#include "lib/container/buffers.h" #include "or/config.h" #include "or/confparse.h" #include "or/channel.h" diff --git a/src/or/geoip.c b/src/or/geoip.c index 4a55e3f8d..fac35d398 100644 --- a/src/or/geoip.c +++ b/src/or/geoip.c @@ -30,7 +30,7 @@ #define GEOIP_PRIVATE #include "or/or.h" #include "ht.h" -#include "common/buffers.h" +#include "lib/container/buffers.h" #include "or/config.h" #include "or/control.h" #include "or/dnsserv.h" diff --git a/src/or/main.c b/src/or/main.c index 67ebc980c..856e988cd 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -51,7 +51,7 @@ #include "or/addressmap.h" #include "lib/err/backtrace.h" #include "or/bridges.h" -#include "common/buffers.h" +#include "lib/container/buffers.h" #include "lib/tls/buffers_tls.h" #include "or/channel.h" #include "or/channeltls.h" diff --git a/src/or/proto_cell.c b/src/or/proto_cell.c index af0862a97..41554bd1b 100644 --- a/src/or/proto_cell.c +++ b/src/or/proto_cell.c @@ -5,7 +5,7 @@ /* See LICENSE for licensing information */ #include "or/or.h" -#include "common/buffers.h" +#include "lib/container/buffers.h" #include "or/proto_cell.h" #include "or/connection_or.h" diff --git a/src/or/proto_control0.c b/src/or/proto_control0.c index 5d83b11cb..34e7ddb8d 100644 --- a/src/or/proto_control0.c +++ b/src/or/proto_control0.c @@ -5,7 +5,7 @@ /* See LICENSE for licensing information */ #include "or/or.h" -#include "common/buffers.h" +#include "lib/container/buffers.h" #include "or/proto_control0.h" /** Return 1 iff buf looks more like it has an (obsolete) v0 controller diff --git a/src/or/proto_ext_or.c b/src/or/proto_ext_or.c index 495b489bc..f30d87623 100644 --- a/src/or/proto_ext_or.c +++ b/src/or/proto_ext_or.c @@ -5,7 +5,7 @@ /* See LICENSE for licensing information */ #include "or/or.h" -#include "common/buffers.h" +#include "lib/container/buffers.h" #include "or/ext_orport.h" #include "or/proto_ext_or.h" diff --git a/src/or/proto_http.c b/src/or/proto_http.c index 45f763b2a..ecc669e3a 100644 --- a/src/or/proto_http.c +++ b/src/or/proto_http.c @@ -6,7 +6,7 @@ #define PROTO_HTTP_PRIVATE #include "or/or.h" -#include "common/buffers.h" +#include "lib/container/buffers.h" #include "or/proto_http.h" /** Return true if cmd looks like a HTTP (proxy) request. */ diff --git a/src/or/proto_socks.c b/src/or/proto_socks.c index 46439d66b..94603c260 100644 --- a/src/or/proto_socks.c +++ b/src/or/proto_socks.c @@ -6,7 +6,7 @@ #include "or/or.h" #include "or/addressmap.h" -#include "common/buffers.h" +#include "lib/container/buffers.h" #include "or/control.h" #include "or/config.h" #include "lib/crypt_ops/crypto_util.h" diff --git a/src/or/relay.c b/src/or/relay.c index 9ff3d96c1..e8e1762b4 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -49,7 +49,7 @@ #include "or/or.h" #include "or/addressmap.h" #include "lib/err/backtrace.h" -#include "common/buffers.h" +#include "lib/container/buffers.h" #include "or/channel.h" #include "or/circpathbias.h" #include "or/circuitbuild.h" diff --git a/src/or/scheduler.c b/src/or/scheduler.c index 519010026..960972de8 100644 --- a/src/or/scheduler.c +++ b/src/or/scheduler.c @@ -9,7 +9,7 @@ #define SCHEDULER_KIST_PRIVATE #include "or/scheduler.h" #include "or/main.h" -#include "common/buffers.h" +#include "lib/container/buffers.h" #define TOR_CHANNEL_INTERNAL_ #include "or/channeltls.h" diff --git a/src/or/scheduler_kist.c b/src/or/scheduler_kist.c index b62281d58..3059952b9 100644 --- a/src/or/scheduler_kist.c +++ b/src/or/scheduler_kist.c @@ -4,7 +4,7 @@ #define SCHEDULER_KIST_PRIVATE #include "or/or.h" -#include "common/buffers.h" +#include "lib/container/buffers.h" #include "or/config.h" #include "or/connection.h" #include "or/networkstatus.h" diff --git a/src/test/fuzz/fuzz_http.c b/src/test/fuzz/fuzz_http.c index c82c658d9..772f2099b 100644 --- a/src/test/fuzz/fuzz_http.c +++ b/src/test/fuzz/fuzz_http.c @@ -8,7 +8,7 @@ #include "or/or.h" #include "lib/err/backtrace.h" -#include "common/buffers.h" +#include "lib/container/buffers.h" #include "or/config.h" #include "or/connection.h" #include "or/directory.h" diff --git a/src/test/fuzz/fuzz_http_connect.c b/src/test/fuzz/fuzz_http_connect.c index 32bd26135..bf0a9deba 100644 --- a/src/test/fuzz/fuzz_http_connect.c +++ b/src/test/fuzz/fuzz_http_connect.c @@ -8,7 +8,7 @@ #include "or/or.h" #include "lib/err/backtrace.h" -#include "common/buffers.h" +#include "lib/container/buffers.h" #include "or/config.h" #include "or/connection.h" #include "or/connection_edge.h" diff --git a/src/test/test.c b/src/test/test.c index 8ce756492..e3121293c 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -41,7 +41,7 @@ double fabs(double x); #include "or/or.h" #include "lib/err/backtrace.h" -#include "common/buffers.h" +#include "lib/container/buffers.h" #include "or/circuitlist.h" #include "or/circuitstats.h" #include "lib/compress/compress.h" diff --git a/src/test/test_buffers.c b/src/test/test_buffers.c index 080325538..66ee99722 100644 --- a/src/test/test_buffers.c +++ b/src/test/test_buffers.c @@ -6,7 +6,7 @@ #define BUFFERS_PRIVATE #define PROTO_HTTP_PRIVATE #include "or/or.h" -#include "common/buffers.h" +#include "lib/container/buffers.h" #include "lib/tls/buffers_tls.h" #include "lib/crypt_ops/crypto_rand.h" #include "or/proto_http.h" diff --git a/src/test/test_channeltls.c b/src/test/test_channeltls.c index bd1182677..aed766fc0 100644 --- a/src/test/test_channeltls.c +++ b/src/test/test_channeltls.c @@ -8,7 +8,7 @@ #define TOR_CHANNEL_INTERNAL_ #include "or/or.h" #include "lib/net/address.h" -#include "common/buffers.h" +#include "lib/container/buffers.h" #include "or/channel.h" #include "or/channeltls.h" #include "or/connection_or.h" diff --git a/src/test/test_extorport.c b/src/test/test_extorport.c index 3e99961ce..0032ef5b7 100644 --- a/src/test/test_extorport.c +++ b/src/test/test_extorport.c @@ -5,7 +5,7 @@ #define EXT_ORPORT_PRIVATE #define MAIN_PRIVATE #include "or/or.h" -#include "common/buffers.h" +#include "lib/container/buffers.h" #include "or/connection.h" #include "or/connection_or.h" #include "or/config.h" diff --git a/src/test/test_helpers.c b/src/test/test_helpers.c index 2b1c33aa6..ba279c790 100644 --- a/src/test/test_helpers.c +++ b/src/test/test_helpers.c @@ -14,7 +14,7 @@ #include "orconfig.h" #include "or/or.h" -#include "common/buffers.h" +#include "lib/container/buffers.h" #include "or/config.h" #include "or/confparse.h" #include "or/connection.h" diff --git a/src/test/test_oom.c b/src/test/test_oom.c index c78ec4099..2e5989c0d 100644 --- a/src/test/test_oom.c +++ b/src/test/test_oom.c @@ -8,7 +8,7 @@ #define CIRCUITLIST_PRIVATE #define CONNECTION_PRIVATE #include "or/or.h" -#include "common/buffers.h" +#include "lib/container/buffers.h" #include "or/circuitlist.h" #include "common/compat_libevent.h" #include "or/connection.h" diff --git a/src/test/test_proto_http.c b/src/test/test_proto_http.c index b98ee83ae..57bfe2463 100644 --- a/src/test/test_proto_http.c +++ b/src/test/test_proto_http.c @@ -8,7 +8,7 @@ #include "or/or.h" #include "test/test.h" -#include "common/buffers.h" +#include "lib/container/buffers.h" #include "or/proto_http.h" #include "test/log_test_helpers.h" diff --git a/src/test/test_proto_misc.c b/src/test/test_proto_misc.c index 979fc72f1..7f066e14a 100644 --- a/src/test/test_proto_misc.c +++ b/src/test/test_proto_misc.c @@ -8,7 +8,7 @@ #include "or/or.h" #include "test/test.h" -#include "common/buffers.h" +#include "lib/container/buffers.h" #include "or/connection_or.h" #include "or/ext_orport.h" #include "or/proto_cell.h" diff --git a/src/test/test_socks.c b/src/test/test_socks.c index 04c028058..1d2c0cf2b 100644 --- a/src/test/test_socks.c +++ b/src/test/test_socks.c @@ -4,7 +4,7 @@ /* See LICENSE for licensing information */ #include "or/or.h" -#include "common/buffers.h" +#include "lib/container/buffers.h" #include "or/config.h" #include "or/proto_socks.h" #include "test/test.h" diff --git a/src/test/test_util.c b/src/test/test_util.c index 77196028d..539782e93 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -13,7 +13,7 @@ #define SUBPROCESS_PRIVATE #include "lib/testsupport/testsupport.h" #include "or/or.h" -#include "common/buffers.h" +#include "lib/container/buffers.h" #include "or/config.h" #include "or/control.h" #include "or/transports.h"

1 0

[tor/master] Fix a bogus n in a comment
by nickm＠torproject.org 28 Jun '18

28 Jun '18

commit 365179cd16b8ccc0986d7a99db2607a95d0932a9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 28 17:21:15 2018 -0400 Fix a bogus n in a comment --- src/lib/container/buffers.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/container/buffers.c b/src/lib/container/buffers.c index ee1a73e8f..0e98033bf 100644 --- a/src/lib/container/buffers.c +++ b/src/lib/container/buffers.c @@ -1,6 +1,6 @@ /* Copyright (c) 2001 Matej Pfajfar. * Copyright (c) 2001-2004, Roger Dingledine. -n * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. + * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. * Copyright (c) 2007-2018, The Tor Project, Inc. */ /* See LICENSE for licensing information */

1 0

[tor/master] A couple of includes to make windows compile again
by nickm＠torproject.org 28 Jun '18

28 Jun '18

commit c84ab36eff6fcd54ffe9d271aa16e19acddeba54 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 28 16:37:59 2018 -0400 A couple of includes to make windows compile again --- src/lib/net/buffers_net.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/lib/net/buffers_net.c b/src/lib/net/buffers_net.c index 01be30f5a..edc9954f2 100644 --- a/src/lib/net/buffers_net.c +++ b/src/lib/net/buffers_net.c @@ -9,6 +9,11 @@ #include "lib/container/buffers.h" #include "lib/log/torlog.h" #include "lib/log/util_bug.h" +#include "lib/net/nettypes.h" + +#ifdef _WIN32 +#include <winsock2.h> +#endif #include <stdlib.h>

1 0

[tor/master] Add sys/capability.h and sys/prctl.h includes in setuid.c
by nickm＠torproject.org 28 Jun '18

28 Jun '18

commit be40ad51b68fa87bafb88e55db7856d373274a4d Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 28 15:34:51 2018 -0400 Add sys/capability.h and sys/prctl.h includes in setuid.c --- src/lib/process/setuid.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/lib/process/setuid.c b/src/lib/process/setuid.c index 6c6cb48f5..fa1cdc0f3 100644 --- a/src/lib/process/setuid.c +++ b/src/lib/process/setuid.c @@ -28,6 +28,12 @@ #ifdef HAVE_PWD_H #include <pwd.h> #endif +#ifdef HAVE_SYS_CAPABILITY_H +#include <sys/capability.h> +#endif +#ifdef HAVE_SYS_PRCTL_H +#include <sys/prctl.h> +#endif #include <errno.h> #include <string.h>

1 0

[tor/master] Move weakrng into lib/intmath
by nickm＠torproject.org 28 Jun '18

28 Jun '18

commit 48ebd9bf76a0e5ff60b88f8906919016de82e819 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 28 11:39:49 2018 -0400 Move weakrng into lib/intmath --- src/common/util.c | 42 --------------------------------- src/common/util.h | 14 ----------- src/common/workqueue.c | 1 + src/lib/crypt_ops/crypto_rand.c | 1 + src/lib/intmath/include.am | 6 +++-- src/lib/intmath/weakrng.c | 51 +++++++++++++++++++++++++++++++++++++++++ src/lib/intmath/weakrng.h | 25 ++++++++++++++++++++ src/or/cpuworker.c | 2 +- src/or/relay.c | 3 ++- src/test/test_util.c | 1 + src/test/test_workqueue.c | 1 + 11 files changed, 87 insertions(+), 60 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index 4a26998c1..304101ec0 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -460,48 +460,6 @@ load_windows_system_library(const TCHAR *library_name) } #endif /* defined(_WIN32) */ -/** Initialize the insecure RNG rng from a seed value seed. */ -void -tor_init_weak_random(tor_weak_rng_t *rng, unsigned seed) -{ - rng->state = (uint32_t)(seed & 0x7fffffff); -} - -/** Return a randomly chosen value in the range 0..TOR_WEAK_RANDOM_MAX based - * on the RNG state of rng. This entropy will not be cryptographically - * strong; do not rely on it for anything an adversary should not be able to - * predict. */ -int32_t -tor_weak_random(tor_weak_rng_t *rng) -{ - /* Here's a linear congruential generator. OpenBSD and glibc use these - * parameters; they aren't too bad, and should have maximal period over the - * range 0..INT32_MAX. We don't want to use the platform rand() or random(), - * since some platforms have bad weak RNGs that only return values in the - * range 0..INT16_MAX, which just isn't enough. */ - rng->state = (rng->state * 1103515245 + 12345) & 0x7fffffff; - return (int32_t) rng->state; -} - -/** Return a random number in the range [0 , top). {That is, the range - * of integers i such that 0 <= i < top.} Chooses uniformly. Requires that - * top is greater than 0. This randomness is not cryptographically strong; do - * not rely on it for anything an adversary should not be able to predict. */ -int32_t -tor_weak_random_range(tor_weak_rng_t *rng, int32_t top) -{ - /* We don't want to just do tor_weak_random() % top, since random() is often - * implemented with an LCG whose modulus is a power of 2, and those are - * cyclic in their low-order bits. */ - int divisor, result; - tor_assert(top > 0); - divisor = TOR_WEAK_RANDOM_MAX / top; - do { - result = (int32_t)(tor_weak_random(rng) / divisor); - } while (result >= top); - return result; -} - /** Cast a given double value to a int64_t. Return 0 if number is NaN. * Returns either INT64_MIN or INT64_MAX if number is outside of the int64_t * range. */ diff --git a/src/common/util.h b/src/common/util.h index 1967d23e4..7d7544006 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -95,18 +95,4 @@ int64_t tv_to_msec(const struct timeval *tv); HANDLE load_windows_system_library(const TCHAR *library_name); #endif -/* ===== Insecure rng */ -typedef struct tor_weak_rng_t { - uint32_t state; -} tor_weak_rng_t; - -#define TOR_WEAK_RNG_INIT {383745623} -#define TOR_WEAK_RANDOM_MAX (INT_MAX) -void tor_init_weak_random(tor_weak_rng_t *weak_rng, unsigned seed); -int32_t tor_weak_random(tor_weak_rng_t *weak_rng); -int32_t tor_weak_random_range(tor_weak_rng_t *rng, int32_t top); -/** Randomly return true according to rng with probability 1 in - * n */ -#define tor_weak_random_one_in_n(rng, n) (0==tor_weak_random_range((rng),(n))) - #endif /* !defined(TOR_UTIL_H) */ diff --git a/src/common/workqueue.c b/src/common/workqueue.c index 4735aadd7..0e8628da9 100644 --- a/src/common/workqueue.c +++ b/src/common/workqueue.c @@ -33,6 +33,7 @@ #include "tor_queue.h" #include "lib/net/alertsock.h" #include "lib/log/torlog.h" +#include "lib/intmath/weakrng.h" #include <event2/event.h> diff --git a/src/lib/crypt_ops/crypto_rand.c b/src/lib/crypt_ops/crypto_rand.c index 247a50224..8ac7d3bfe 100644 --- a/src/lib/crypt_ops/crypto_rand.c +++ b/src/lib/crypt_ops/crypto_rand.c @@ -30,6 +30,7 @@ #include "lib/log/torlog.h" #include "common/util.h" #include "lib/encoding/binascii.h" +#include "lib/intmath/weakrng.h" DISABLE_GCC_WARNING(redundant-decls) #include <openssl/rand.h> diff --git a/src/lib/intmath/include.am b/src/lib/intmath/include.am index 40459d106..1ae5d618d 100644 --- a/src/lib/intmath/include.am +++ b/src/lib/intmath/include.am @@ -8,7 +8,8 @@ endif src_lib_libtor_intmath_a_SOURCES = \ src/lib/intmath/addsub.c \ src/lib/intmath/bits.c \ - src/lib/intmath/muldiv.c + src/lib/intmath/muldiv.c \ + src/lib/intmath/weakrng.c src_lib_libtor_intmath_testing_a_SOURCES = \ $(src_lib_libtor_intmath_a_SOURCES) @@ -19,4 +20,5 @@ noinst_HEADERS += \ src/lib/intmath/addsub.h \ src/lib/intmath/cmp.h \ src/lib/intmath/bits.h \ - src/lib/intmath/muldiv.h + src/lib/intmath/muldiv.h \ + src/lib/intmath/weakrng.h diff --git a/src/lib/intmath/weakrng.c b/src/lib/intmath/weakrng.c new file mode 100644 index 000000000..2ecab97cc --- /dev/null +++ b/src/lib/intmath/weakrng.c @@ -0,0 +1,51 @@ +/* Copyright (c) 2003, Roger Dingledine + * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. + * Copyright (c) 2007-2018, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +#include "lib/intmath/weakrng.h" +#include "lib/err/torerr.h" + +#include <stdlib.h> + +/** Initialize the insecure RNG rng from a seed value seed. */ +void +tor_init_weak_random(tor_weak_rng_t *rng, unsigned seed) +{ + rng->state = (uint32_t)(seed & 0x7fffffff); +} + +/** Return a randomly chosen value in the range 0..TOR_WEAK_RANDOM_MAX based + * on the RNG state of rng. This entropy will not be cryptographically + * strong; do not rely on it for anything an adversary should not be able to + * predict. */ +int32_t +tor_weak_random(tor_weak_rng_t *rng) +{ + /* Here's a linear congruential generator. OpenBSD and glibc use these + * parameters; they aren't too bad, and should have maximal period over the + * range 0..INT32_MAX. We don't want to use the platform rand() or random(), + * since some platforms have bad weak RNGs that only return values in the + * range 0..INT16_MAX, which just isn't enough. */ + rng->state = (rng->state * 1103515245 + 12345) & 0x7fffffff; + return (int32_t) rng->state; +} + +/** Return a random number in the range [0 , top). {That is, the range + * of integers i such that 0 <= i < top.} Chooses uniformly. Requires that + * top is greater than 0. This randomness is not cryptographically strong; do + * not rely on it for anything an adversary should not be able to predict. */ +int32_t +tor_weak_random_range(tor_weak_rng_t *rng, int32_t top) +{ + /* We don't want to just do tor_weak_random() % top, since random() is often + * implemented with an LCG whose modulus is a power of 2, and those are + * cyclic in their low-order bits. */ + int divisor, result; + raw_assert(top > 0); + divisor = TOR_WEAK_RANDOM_MAX / top; + do { + result = (int32_t)(tor_weak_random(rng) / divisor); + } while (result >= top); + return result; +} diff --git a/src/lib/intmath/weakrng.h b/src/lib/intmath/weakrng.h new file mode 100644 index 000000000..e5a88b30f --- /dev/null +++ b/src/lib/intmath/weakrng.h @@ -0,0 +1,25 @@ +/* Copyright (c) 2003, Roger Dingledine + * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. + * Copyright (c) 2007-2018, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +#ifndef TOR_WEAKRNG_H +#define TOR_WEAKRNG_H + +#include "lib/cc/torint.h" + +/* ===== Insecure rng */ +typedef struct tor_weak_rng_t { + uint32_t state; +} tor_weak_rng_t; + +#define TOR_WEAK_RNG_INIT {383745623} +#define TOR_WEAK_RANDOM_MAX (INT_MAX) +void tor_init_weak_random(tor_weak_rng_t *weak_rng, unsigned seed); +int32_t tor_weak_random(tor_weak_rng_t *weak_rng); +int32_t tor_weak_random_range(tor_weak_rng_t *rng, int32_t top); +/** Randomly return true according to rng with probability 1 in + * n */ +#define tor_weak_random_one_in_n(rng, n) (0==tor_weak_random_range((rng),(n))) + +#endif diff --git a/src/or/cpuworker.c b/src/or/cpuworker.c index 24a75b16d..675079020 100644 --- a/src/or/cpuworker.c +++ b/src/or/cpuworker.c @@ -33,6 +33,7 @@ #include "common/workqueue.h" #include "or/or_circuit_st.h" +#include "lib/intmath/weakrng.h" static void queue_pending_tasks(void); @@ -596,4 +597,3 @@ cpuworker_cancel_circ_handshake(or_circuit_t *circ) circ->workqueue_entry = NULL; } } - diff --git a/src/or/relay.c b/src/or/relay.c index 85b5cf7aa..9ff3d96c1 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -94,6 +94,8 @@ #include "or/routerinfo_st.h" #include "or/socks_request_st.h" +#include "lib/intmath/weakrng.h" + static edge_connection_t *relay_lookup_conn(circuit_t *circ, cell_t *cell, cell_direction_t cell_direction, crypt_path_t *layer_hint); @@ -3084,4 +3086,3 @@ circuit_queue_streams_are_blocked(circuit_t *circ) return circ->streams_blocked_on_p_chan; } } - diff --git a/src/test/test_util.c b/src/test/test_util.c index 0c7e794b4..8afd9473e 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -25,6 +25,7 @@ #include "lib/process/env.h" #include "lib/process/pidfile.h" #include "lib/process/subprocess.h" +#include "lib/intmath/weakrng.h" #ifdef HAVE_PWD_H #include <pwd.h> diff --git a/src/test/test_workqueue.c b/src/test/test_workqueue.c index 5cda99b58..dda724b78 100644 --- a/src/test/test_workqueue.c +++ b/src/test/test_workqueue.c @@ -11,6 +11,7 @@ #include "lib/crypt_ops/crypto_rand.h" #include "lib/net/alertsock.h" #include "common/compat_libevent.h" +#include "lib/intmath/weakrng.h" #include <stdio.h>

1 0

[tor/master] Extract the alert-socket code into lib/net.
by nickm＠torproject.org 28 Jun '18

28 Jun '18

commit 544ab27a949406628809869111b7288017a5bcb1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 28 08:49:07 2018 -0400 Extract the alert-socket code into lib/net. This code was in compat_threads, since it was _used_ for efficiently notifying the main libevent thread from another thread. But in spite of its usage, it's fundamentally a part of the network code. --- src/common/compat_threads.c | 269 ----------------------------------------- src/common/compat_threads.h | 26 ---- src/common/workqueue.c | 2 +- src/lib/net/alertsock.c | 284 ++++++++++++++++++++++++++++++++++++++++++++ src/lib/net/alertsock.h | 39 ++++++ src/lib/net/include.am | 2 + src/test/test_workqueue.c | 2 +- 7 files changed, 327 insertions(+), 297 deletions(-) diff --git a/src/common/compat_threads.c b/src/common/compat_threads.c index e66143b35..87833c6cf 100644 --- a/src/common/compat_threads.c +++ b/src/common/compat_threads.c @@ -19,16 +19,6 @@ #include "common/util.h" #include "lib/log/torlog.h" -#ifdef HAVE_SYS_EVENTFD_H -#include <sys/eventfd.h> -#endif -#ifdef HAVE_FCNTL_H -#include <fcntl.h> -#endif -#ifdef HAVE_UNISTD_H -#include <unistd.h> -#endif - /** Allocate and return a new condition variable. */ tor_cond_t * tor_cond_new(void) @@ -66,265 +56,6 @@ in_main_thread(void) return main_thread_id == tor_get_thread_id(); } -#if defined(HAVE_EVENTFD) || defined(HAVE_PIPE) -/* As write(), but retry on EINTR, and return the negative error code on - * error. */ -static int -write_ni(int fd, const void *buf, size_t n) -{ - int r; - again: - r = (int) write(fd, buf, n); - if (r < 0) { - if (errno == EINTR) - goto again; - else - return -errno; - } - return r; -} -/* As read(), but retry on EINTR, and return the negative error code on error. - */ -static int -read_ni(int fd, void *buf, size_t n) -{ - int r; - again: - r = (int) read(fd, buf, n); - if (r < 0) { - if (errno == EINTR) - goto again; - else - return -errno; - } - return r; -} -#endif /* defined(HAVE_EVENTFD) || defined(HAVE_PIPE) */ - -/** As send(), but retry on EINTR, and return the negative error code on - * error. */ -static int -send_ni(int fd, const void *buf, size_t n, int flags) -{ - int r; - again: - r = (int) send(fd, buf, n, flags); - if (r < 0) { - int error = tor_socket_errno(fd); - if (ERRNO_IS_EINTR(error)) - goto again; - else - return -error; - } - return r; -} - -/** As recv(), but retry on EINTR, and return the negative error code on - * error. */ -static int -recv_ni(int fd, void *buf, size_t n, int flags) -{ - int r; - again: - r = (int) recv(fd, buf, n, flags); - if (r < 0) { - int error = tor_socket_errno(fd); - if (ERRNO_IS_EINTR(error)) - goto again; - else - return -error; - } - return r; -} - -#ifdef HAVE_EVENTFD -/* Increment the event count on an eventfd fd */ -static int -eventfd_alert(int fd) -{ - uint64_t u = 1; - int r = write_ni(fd, (void*)&u, sizeof(u)); - if (r < 0 && -r != EAGAIN) - return -1; - return 0; -} - -/* Drain all events from an eventfd fd. */ -static int -eventfd_drain(int fd) -{ - uint64_t u = 0; - int r = read_ni(fd, (void*)&u, sizeof(u)); - if (r < 0 && -r != EAGAIN) - return r; - return 0; -} -#endif /* defined(HAVE_EVENTFD) */ - -#ifdef HAVE_PIPE -/** Send a byte over a pipe. Return 0 on success or EAGAIN; -1 on error */ -static int -pipe_alert(int fd) -{ - ssize_t r = write_ni(fd, "x", 1); - if (r < 0 && -r != EAGAIN) - return (int)r; - return 0; -} - -/** Drain all input from a pipe fd and ignore it. Return 0 on - * success, -1 on error. */ -static int -pipe_drain(int fd) -{ - char buf[32]; - ssize_t r; - do { - r = read_ni(fd, buf, sizeof(buf)); - } while (r > 0); - if (r < 0 && errno != EAGAIN) - return -errno; - /* A value of r = 0 means EOF on the fd so successfully drained. */ - return 0; -} -#endif /* defined(HAVE_PIPE) */ - -/** Send a byte on socket fdt. Return 0 on success or EAGAIN, - * -1 on error. */ -static int -sock_alert(tor_socket_t fd) -{ - ssize_t r = send_ni(fd, "x", 1, 0); - if (r < 0 && !ERRNO_IS_EAGAIN(-r)) - return (int)r; - return 0; -} - -/** Drain all the input from a socket fd, and ignore it. Return 0 on - * success, -errno on error. */ -static int -sock_drain(tor_socket_t fd) -{ - char buf[32]; - ssize_t r; - do { - r = recv_ni(fd, buf, sizeof(buf), 0); - } while (r > 0); - if (r < 0 && !ERRNO_IS_EAGAIN(-r)) - return (int)r; - /* A value of r = 0 means EOF on the fd so successfully drained. */ - return 0; -} - -/** Allocate a new set of alert sockets, and set the appropriate function - * pointers, in socks_out. */ -int -alert_sockets_create(alert_sockets_t *socks_out, uint32_t flags) -{ - tor_socket_t socks[2] = { TOR_INVALID_SOCKET, TOR_INVALID_SOCKET }; - -#ifdef HAVE_EVENTFD - /* First, we try the Linux eventfd() syscall. This gives a 64-bit counter - * associated with a single file descriptor. */ -#if defined(EFD_CLOEXEC) && defined(EFD_NONBLOCK) - if (!(flags & ASOCKS_NOEVENTFD2)) - socks[0] = eventfd(0, EFD_CLOEXEC|EFD_NONBLOCK); -#endif - if (socks[0] < 0 && !(flags & ASOCKS_NOEVENTFD)) { - socks[0] = eventfd(0,0); - if (socks[0] >= 0) { - if (fcntl(socks[0], F_SETFD, FD_CLOEXEC) < 0 || - set_socket_nonblocking(socks[0]) < 0) { - // LCOV_EXCL_START -- if eventfd succeeds, fcntl will. - tor_assert_nonfatal_unreached(); - close(socks[0]); - return -1; - // LCOV_EXCL_STOP - } - } - } - if (socks[0] >= 0) { - socks_out->read_fd = socks_out->write_fd = socks[0]; - socks_out->alert_fn = eventfd_alert; - socks_out->drain_fn = eventfd_drain; - return 0; - } -#endif /* defined(HAVE_EVENTFD) */ - -#ifdef HAVE_PIPE2 - /* Now we're going to try pipes. First type the pipe2() syscall, if we - * have it, so we can save some calls... */ - if (!(flags & ASOCKS_NOPIPE2) && - pipe2(socks, O_NONBLOCK|O_CLOEXEC) == 0) { - socks_out->read_fd = socks[0]; - socks_out->write_fd = socks[1]; - socks_out->alert_fn = pipe_alert; - socks_out->drain_fn = pipe_drain; - return 0; - } -#endif /* defined(HAVE_PIPE2) */ - -#ifdef HAVE_PIPE - /* Now try the regular pipe() syscall. Pipes have a bit lower overhead than - * socketpairs, fwict. */ - if (!(flags & ASOCKS_NOPIPE) && - pipe(socks) == 0) { - if (fcntl(socks[0], F_SETFD, FD_CLOEXEC) < 0 || - fcntl(socks[1], F_SETFD, FD_CLOEXEC) < 0 || - set_socket_nonblocking(socks[0]) < 0 || - set_socket_nonblocking(socks[1]) < 0) { - // LCOV_EXCL_START -- if pipe succeeds, you can fcntl the output - tor_assert_nonfatal_unreached(); - close(socks[0]); - close(socks[1]); - return -1; - // LCOV_EXCL_STOP - } - socks_out->read_fd = socks[0]; - socks_out->write_fd = socks[1]; - socks_out->alert_fn = pipe_alert; - socks_out->drain_fn = pipe_drain; - return 0; - } -#endif /* defined(HAVE_PIPE) */ - - /* If nothing else worked, fall back on socketpair(). */ - if (!(flags & ASOCKS_NOSOCKETPAIR) && - tor_socketpair(AF_UNIX, SOCK_STREAM, 0, socks) == 0) { - if (set_socket_nonblocking(socks[0]) < 0 || - set_socket_nonblocking(socks[1])) { - // LCOV_EXCL_START -- if socketpair worked, you can make it nonblocking. - tor_assert_nonfatal_unreached(); - tor_close_socket(socks[0]); - tor_close_socket(socks[1]); - return -1; - // LCOV_EXCL_STOP - } - socks_out->read_fd = socks[0]; - socks_out->write_fd = socks[1]; - socks_out->alert_fn = sock_alert; - socks_out->drain_fn = sock_drain; - return 0; - } - return -1; -} - -/** Close the sockets in socks. */ -void -alert_sockets_close(alert_sockets_t *socks) -{ - if (socks->alert_fn == sock_alert) { - /* they are sockets. */ - tor_close_socket(socks->read_fd); - tor_close_socket(socks->write_fd); - } else { - close(socks->read_fd); - if (socks->write_fd != socks->read_fd) - close(socks->write_fd); - } - socks->read_fd = socks->write_fd = -1; -} - #ifndef HAVE_STDATOMIC_H /** Initialize a new atomic counter with the value 0 */ void diff --git a/src/common/compat_threads.h b/src/common/compat_threads.h index d1fdfc96c..69350421b 100644 --- a/src/common/compat_threads.h +++ b/src/common/compat_threads.h @@ -52,32 +52,6 @@ int tor_cond_wait(tor_cond_t *cond, tor_mutex_t *mutex, void tor_cond_signal_one(tor_cond_t *cond); void tor_cond_signal_all(tor_cond_t *cond); -/** Helper type used to manage waking up the main thread while it's in - * the libevent main loop. Used by the work queue code. */ -typedef struct alert_sockets_s { - /* XXXX This structure needs a better name. */ - /** Socket that the main thread should listen for EV_READ events on. - * Note that this socket may be a regular fd on a non-Windows platform. - */ - tor_socket_t read_fd; - /** Socket to use when alerting the main thread. */ - tor_socket_t write_fd; - /** Function to alert the main thread */ - int (*alert_fn)(tor_socket_t write_fd); - /** Function to make the main thread no longer alerted. */ - int (*drain_fn)(tor_socket_t read_fd); -} alert_sockets_t; - -/* Flags to disable one or more alert_sockets backends. */ -#define ASOCKS_NOEVENTFD2 (1u<<0) -#define ASOCKS_NOEVENTFD (1u<<1) -#define ASOCKS_NOPIPE2 (1u<<2) -#define ASOCKS_NOPIPE (1u<<3) -#define ASOCKS_NOSOCKETPAIR (1u<<4) - -int alert_sockets_create(alert_sockets_t *socks_out, uint32_t flags); -void alert_sockets_close(alert_sockets_t *socks); - typedef struct tor_threadlocal_s { #ifdef _WIN32 DWORD index; diff --git a/src/common/workqueue.c b/src/common/workqueue.c index 84945882d..fd31ccd7f 100644 --- a/src/common/workqueue.c +++ b/src/common/workqueue.c @@ -31,6 +31,7 @@ #include "common/util.h" #include "common/workqueue.h" #include "tor_queue.h" +#include "lib/net/alertsock.h" #include "lib/log/torlog.h" #include <event2/event.h> @@ -675,4 +676,3 @@ replyqueue_process(replyqueue_t *queue) tor_mutex_release(&queue->lock); } - diff --git a/src/lib/net/alertsock.c b/src/lib/net/alertsock.c new file mode 100644 index 000000000..c6ea1551f --- /dev/null +++ b/src/lib/net/alertsock.c @@ -0,0 +1,284 @@ +/* Copyright (c) 2003-2004, Roger Dingledine + * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. + * Copyright (c) 2007-2018, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +#include "orconfig.h" +#include "lib/net/alertsock.h" +#include "lib/net/socket.h" +#include "lib/log/util_bug.h" + +#ifdef HAVE_SYS_EVENTFD_H +#include <sys/eventfd.h> +#endif +#ifdef HAVE_FCNTL_H +#include <fcntl.h> +#endif +#ifdef HAVE_UNISTD_H +#include <unistd.h> +#endif +#ifdef HAVE_SYS_SOCKET_H +#include <sys/socket.h> +#endif +#ifdef _WIN32 +#include <winsock2.h> +#endif + +#if defined(HAVE_EVENTFD) || defined(HAVE_PIPE) +/* As write(), but retry on EINTR, and return the negative error code on + * error. */ +static int +write_ni(int fd, const void *buf, size_t n) +{ + int r; + again: + r = (int) write(fd, buf, n); + if (r < 0) { + if (errno == EINTR) + goto again; + else + return -errno; + } + return r; +} +/* As read(), but retry on EINTR, and return the negative error code on error. + */ +static int +read_ni(int fd, void *buf, size_t n) +{ + int r; + again: + r = (int) read(fd, buf, n); + if (r < 0) { + if (errno == EINTR) + goto again; + else + return -errno; + } + return r; +} +#endif /* defined(HAVE_EVENTFD) || defined(HAVE_PIPE) */ + +/** As send(), but retry on EINTR, and return the negative error code on + * error. */ +static int +send_ni(int fd, const void *buf, size_t n, int flags) +{ + int r; + again: + r = (int) send(fd, buf, n, flags); + if (r < 0) { + int error = tor_socket_errno(fd); + if (ERRNO_IS_EINTR(error)) + goto again; + else + return -error; + } + return r; +} + +/** As recv(), but retry on EINTR, and return the negative error code on + * error. */ +static int +recv_ni(int fd, void *buf, size_t n, int flags) +{ + int r; + again: + r = (int) recv(fd, buf, n, flags); + if (r < 0) { + int error = tor_socket_errno(fd); + if (ERRNO_IS_EINTR(error)) + goto again; + else + return -error; + } + return r; +} + +#ifdef HAVE_EVENTFD +/* Increment the event count on an eventfd fd */ +static int +eventfd_alert(int fd) +{ + uint64_t u = 1; + int r = write_ni(fd, (void*)&u, sizeof(u)); + if (r < 0 && -r != EAGAIN) + return -1; + return 0; +} + +/* Drain all events from an eventfd fd. */ +static int +eventfd_drain(int fd) +{ + uint64_t u = 0; + int r = read_ni(fd, (void*)&u, sizeof(u)); + if (r < 0 && -r != EAGAIN) + return r; + return 0; +} +#endif /* defined(HAVE_EVENTFD) */ + +#ifdef HAVE_PIPE +/** Send a byte over a pipe. Return 0 on success or EAGAIN; -1 on error */ +static int +pipe_alert(int fd) +{ + ssize_t r = write_ni(fd, "x", 1); + if (r < 0 && -r != EAGAIN) + return (int)r; + return 0; +} + +/** Drain all input from a pipe fd and ignore it. Return 0 on + * success, -1 on error. */ +static int +pipe_drain(int fd) +{ + char buf[32]; + ssize_t r; + do { + r = read_ni(fd, buf, sizeof(buf)); + } while (r > 0); + if (r < 0 && errno != EAGAIN) + return -errno; + /* A value of r = 0 means EOF on the fd so successfully drained. */ + return 0; +} +#endif /* defined(HAVE_PIPE) */ + +/** Send a byte on socket fdt. Return 0 on success or EAGAIN, + * -1 on error. */ +static int +sock_alert(tor_socket_t fd) +{ + ssize_t r = send_ni(fd, "x", 1, 0); + if (r < 0 && !ERRNO_IS_EAGAIN(-r)) + return (int)r; + return 0; +} + +/** Drain all the input from a socket fd, and ignore it. Return 0 on + * success, -errno on error. */ +static int +sock_drain(tor_socket_t fd) +{ + char buf[32]; + ssize_t r; + do { + r = recv_ni(fd, buf, sizeof(buf), 0); + } while (r > 0); + if (r < 0 && !ERRNO_IS_EAGAIN(-r)) + return (int)r; + /* A value of r = 0 means EOF on the fd so successfully drained. */ + return 0; +} + +/** Allocate a new set of alert sockets, and set the appropriate function + * pointers, in socks_out. */ +int +alert_sockets_create(alert_sockets_t *socks_out, uint32_t flags) +{ + tor_socket_t socks[2] = { TOR_INVALID_SOCKET, TOR_INVALID_SOCKET }; + +#ifdef HAVE_EVENTFD + /* First, we try the Linux eventfd() syscall. This gives a 64-bit counter + * associated with a single file descriptor. */ +#if defined(EFD_CLOEXEC) && defined(EFD_NONBLOCK) + if (!(flags & ASOCKS_NOEVENTFD2)) + socks[0] = eventfd(0, EFD_CLOEXEC|EFD_NONBLOCK); +#endif + if (socks[0] < 0 && !(flags & ASOCKS_NOEVENTFD)) { + socks[0] = eventfd(0,0); + if (socks[0] >= 0) { + if (fcntl(socks[0], F_SETFD, FD_CLOEXEC) < 0 || + set_socket_nonblocking(socks[0]) < 0) { + // LCOV_EXCL_START -- if eventfd succeeds, fcntl will. + tor_assert_nonfatal_unreached(); + close(socks[0]); + return -1; + // LCOV_EXCL_STOP + } + } + } + if (socks[0] >= 0) { + socks_out->read_fd = socks_out->write_fd = socks[0]; + socks_out->alert_fn = eventfd_alert; + socks_out->drain_fn = eventfd_drain; + return 0; + } +#endif /* defined(HAVE_EVENTFD) */ + +#ifdef HAVE_PIPE2 + /* Now we're going to try pipes. First type the pipe2() syscall, if we + * have it, so we can save some calls... */ + if (!(flags & ASOCKS_NOPIPE2) && + pipe2(socks, O_NONBLOCK|O_CLOEXEC) == 0) { + socks_out->read_fd = socks[0]; + socks_out->write_fd = socks[1]; + socks_out->alert_fn = pipe_alert; + socks_out->drain_fn = pipe_drain; + return 0; + } +#endif /* defined(HAVE_PIPE2) */ + +#ifdef HAVE_PIPE + /* Now try the regular pipe() syscall. Pipes have a bit lower overhead than + * socketpairs, fwict. */ + if (!(flags & ASOCKS_NOPIPE) && + pipe(socks) == 0) { + if (fcntl(socks[0], F_SETFD, FD_CLOEXEC) < 0 || + fcntl(socks[1], F_SETFD, FD_CLOEXEC) < 0 || + set_socket_nonblocking(socks[0]) < 0 || + set_socket_nonblocking(socks[1]) < 0) { + // LCOV_EXCL_START -- if pipe succeeds, you can fcntl the output + tor_assert_nonfatal_unreached(); + close(socks[0]); + close(socks[1]); + return -1; + // LCOV_EXCL_STOP + } + socks_out->read_fd = socks[0]; + socks_out->write_fd = socks[1]; + socks_out->alert_fn = pipe_alert; + socks_out->drain_fn = pipe_drain; + return 0; + } +#endif /* defined(HAVE_PIPE) */ + + /* If nothing else worked, fall back on socketpair(). */ + if (!(flags & ASOCKS_NOSOCKETPAIR) && + tor_socketpair(AF_UNIX, SOCK_STREAM, 0, socks) == 0) { + if (set_socket_nonblocking(socks[0]) < 0 || + set_socket_nonblocking(socks[1])) { + // LCOV_EXCL_START -- if socketpair worked, you can make it nonblocking. + tor_assert_nonfatal_unreached(); + tor_close_socket(socks[0]); + tor_close_socket(socks[1]); + return -1; + // LCOV_EXCL_STOP + } + socks_out->read_fd = socks[0]; + socks_out->write_fd = socks[1]; + socks_out->alert_fn = sock_alert; + socks_out->drain_fn = sock_drain; + return 0; + } + return -1; +} + +/** Close the sockets in socks. */ +void +alert_sockets_close(alert_sockets_t *socks) +{ + if (socks->alert_fn == sock_alert) { + /* they are sockets. */ + tor_close_socket(socks->read_fd); + tor_close_socket(socks->write_fd); + } else { + close(socks->read_fd); + if (socks->write_fd != socks->read_fd) + close(socks->write_fd); + } + socks->read_fd = socks->write_fd = -1; +} diff --git a/src/lib/net/alertsock.h b/src/lib/net/alertsock.h new file mode 100644 index 000000000..026a15cad --- /dev/null +++ b/src/lib/net/alertsock.h @@ -0,0 +1,39 @@ +/* Copyright (c) 2003-2004, Roger Dingledine + * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. + * Copyright (c) 2007-2018, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +#ifndef TOR_ALERTSOCK_H +#define TOR_ALERTSOCK_H + +#include "orconfig.h" +#include "lib/net/nettypes.h" +#include "lib/cc/torint.h" + +/** Helper type used to manage waking up the main thread while it's in + * the libevent main loop. Used by the work queue code. */ +typedef struct alert_sockets_t { + /* XXXX This structure needs a better name. */ + /** Socket that the main thread should listen for EV_READ events on. + * Note that this socket may be a regular fd on a non-Windows platform. + */ + tor_socket_t read_fd; + /** Socket to use when alerting the main thread. */ + tor_socket_t write_fd; + /** Function to alert the main thread */ + int (*alert_fn)(tor_socket_t write_fd); + /** Function to make the main thread no longer alerted. */ + int (*drain_fn)(tor_socket_t read_fd); +} alert_sockets_t; + +/* Flags to disable one or more alert_sockets backends. */ +#define ASOCKS_NOEVENTFD2 (1u<<0) +#define ASOCKS_NOEVENTFD (1u<<1) +#define ASOCKS_NOPIPE2 (1u<<2) +#define ASOCKS_NOPIPE (1u<<3) +#define ASOCKS_NOSOCKETPAIR (1u<<4) + +int alert_sockets_create(alert_sockets_t *socks_out, uint32_t flags); +void alert_sockets_close(alert_sockets_t *socks); + +#endif diff --git a/src/lib/net/include.am b/src/lib/net/include.am index 6bd829165..90049c95d 100644 --- a/src/lib/net/include.am +++ b/src/lib/net/include.am @@ -7,6 +7,7 @@ endif src_lib_libtor_net_a_SOURCES = \ src/lib/net/address.c \ + src/lib/net/alertsock.c \ src/lib/net/ipv4.c \ src/lib/net/ipv6.c \ src/lib/net/resolve.c \ @@ -19,6 +20,7 @@ src_lib_libtor_net_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) noinst_HEADERS += \ src/lib/net/address.h \ + src/lib/net/alertsock.h \ src/lib/net/ipv4.h \ src/lib/net/ipv6.h \ src/lib/net/nettypes.h \ diff --git a/src/test/test_workqueue.c b/src/test/test_workqueue.c index fe23c5319..7c525aa28 100644 --- a/src/test/test_workqueue.c +++ b/src/test/test_workqueue.c @@ -9,6 +9,7 @@ #include "common/workqueue.h" #include "lib/crypt_ops/crypto_curve25519.h" #include "lib/crypt_ops/crypto_rand.h" +#include "lib/net/alertsock.h" #include "common/compat_libevent.h" #include <stdio.h> @@ -450,4 +451,3 @@ main(int argc, char **argv) return 0; } } -

1 0

[tor/master] Move lockfile code into lib/fs
by nickm＠torproject.org 28 Jun '18

28 Jun '18

commit aa3edfd2053bb418907f204e171ae8f7e78c30eb Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 28 11:33:50 2018 -0400 Move lockfile code into lib/fs --- src/common/compat.c | 111 ---------------------------------------- src/common/compat.h | 4 -- src/lib/fs/include.am | 2 + src/lib/fs/lockfile.c | 138 ++++++++++++++++++++++++++++++++++++++++++++++++++ src/lib/fs/lockfile.h | 14 +++++ src/or/main.c | 1 + 6 files changed, 155 insertions(+), 115 deletions(-) diff --git a/src/common/compat.c b/src/common/compat.c index 9fd966798..1199fdae9 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -131,116 +131,6 @@ SecureZeroMemory(PVOID ptr, SIZE_T cnt) #include "lib/net/address.h" #include "lib/sandbox/sandbox.h" -/** Represents a lockfile on which we hold the lock. */ -struct tor_lockfile_t { - /** Name of the file */ - char *filename; - /** File descriptor used to hold the file open */ - int fd; -}; - -/** Try to get a lock on the lockfile filename, creating it as - * necessary. If someone else has the lock and blocking is true, - * wait until the lock is available. Otherwise return immediately whether - * we succeeded or not. - * - * Set *locked_out to true if somebody else had the lock, and to false - * otherwise. - * - * Return a tor_lockfile_t on success, NULL on failure. - * - * (Implementation note: because we need to fall back to fcntl on some - * platforms, these locks are per-process, not per-thread. If you want - * to do in-process locking, use tor_mutex_t like a normal person. - * On Windows, when blocking is true, the maximum time that - * is actually waited is 10 seconds, after which NULL is returned - * and locked_out is set to 1.) - */ -tor_lockfile_t * -tor_lockfile_lock(const char *filename, int blocking, int *locked_out) -{ - tor_lockfile_t *result; - int fd; - *locked_out = 0; - - log_info(LD_FS, "Locking \"%s\"", filename); - fd = tor_open_cloexec(filename, O_RDWR|O_CREAT|O_TRUNC, 0600); - if (fd < 0) { - log_warn(LD_FS,"Couldn't open \"%s\" for locking: %s", filename, - strerror(errno)); - return NULL; - } - -#ifdef _WIN32 - _lseek(fd, 0, SEEK_SET); - if (_locking(fd, blocking ? _LK_LOCK : _LK_NBLCK, 1) < 0) { - if (errno != EACCES && errno != EDEADLOCK) - log_warn(LD_FS,"Couldn't lock \"%s\": %s", filename, strerror(errno)); - else - *locked_out = 1; - close(fd); - return NULL; - } -#elif defined(HAVE_FLOCK) - if (flock(fd, LOCK_EX|(blocking ? 0 : LOCK_NB)) < 0) { - if (errno != EWOULDBLOCK) - log_warn(LD_FS,"Couldn't lock \"%s\": %s", filename, strerror(errno)); - else - *locked_out = 1; - close(fd); - return NULL; - } -#else - { - struct flock lock; - memset(&lock, 0, sizeof(lock)); - lock.l_type = F_WRLCK; - lock.l_whence = SEEK_SET; - if (fcntl(fd, blocking ? F_SETLKW : F_SETLK, &lock) < 0) { - if (errno != EACCES && errno != EAGAIN) - log_warn(LD_FS, "Couldn't lock \"%s\": %s", filename, strerror(errno)); - else - *locked_out = 1; - close(fd); - return NULL; - } - } -#endif /* defined(_WIN32) || ... */ - - result = tor_malloc(sizeof(tor_lockfile_t)); - result->filename = tor_strdup(filename); - result->fd = fd; - return result; -} - -/** Release the lock held as lockfile. */ -void -tor_lockfile_unlock(tor_lockfile_t *lockfile) -{ - tor_assert(lockfile); - - log_info(LD_FS, "Unlocking \"%s\"", lockfile->filename); -#ifdef _WIN32 - _lseek(lockfile->fd, 0, SEEK_SET); - if (_locking(lockfile->fd, _LK_UNLCK, 1) < 0) { - log_warn(LD_FS,"Error unlocking \"%s\": %s", lockfile->filename, - strerror(errno)); - } -#elif defined(HAVE_FLOCK) - if (flock(lockfile->fd, LOCK_UN) < 0) { - log_warn(LD_FS, "Error unlocking \"%s\": %s", lockfile->filename, - strerror(errno)); - } -#else - /* Closing the lockfile is sufficient. */ -#endif /* defined(_WIN32) || ... */ - - close(lockfile->fd); - lockfile->fd = -1; - tor_free(lockfile->filename); - tor_free(lockfile); -} - /** Number of extra file descriptors to keep in reserve beyond those that we * tell Tor it's allowed to use. */ #define ULIMIT_BUFFER 32 /* keep 32 extra fd's beyond ConnLimit_ */ @@ -550,7 +440,6 @@ compute_num_cpus(void) return num_cpus; } - /** Called before we make any calls to network-related functions. * (Some operating systems require their network libraries to be * initialized.) */ diff --git a/src/common/compat.h b/src/common/compat.h index 018caab24..e455dc8ef 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -108,10 +108,6 @@ #endif /* !defined(timercmp) */ /* ===== File compatibility */ -typedef struct tor_lockfile_t tor_lockfile_t; -tor_lockfile_t *tor_lockfile_lock(const char *filename, int blocking, - int *locked_out); -void tor_lockfile_unlock(tor_lockfile_t *lockfile); /* ===== Net compatibility */ diff --git a/src/lib/fs/include.am b/src/lib/fs/include.am index dcfd0b201..0256c0f2f 100644 --- a/src/lib/fs/include.am +++ b/src/lib/fs/include.am @@ -9,6 +9,7 @@ src_lib_libtor_fs_a_SOURCES = \ src/lib/fs/conffile.c \ src/lib/fs/dir.c \ src/lib/fs/files.c \ + src/lib/fs/lockfile.c \ src/lib/fs/mmap.c \ src/lib/fs/path.c \ src/lib/fs/storagedir.c \ @@ -23,6 +24,7 @@ noinst_HEADERS += \ src/lib/fs/conffile.h \ src/lib/fs/dir.h \ src/lib/fs/files.h \ + src/lib/fs/lockfile.h \ src/lib/fs/mmap.h \ src/lib/fs/path.h \ src/lib/fs/storagedir.h \ diff --git a/src/lib/fs/lockfile.c b/src/lib/fs/lockfile.c new file mode 100644 index 000000000..3fc9cd426 --- /dev/null +++ b/src/lib/fs/lockfile.c @@ -0,0 +1,138 @@ +/* Copyright (c) 2003-2004, Roger Dingledine + * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. + * Copyright (c) 2007-2018, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +#include "orconfig.h" +#include "lib/fs/files.h" +#include "lib/fs/lockfile.h" +#include "lib/log/torlog.h" +#include "lib/log/util_bug.h" +#include "lib/malloc/util_malloc.h" + +#ifdef HAVE_SYS_FILE_H +#include <sys/file.h> +#endif +#ifdef HAVE_FCNTL_H +#include <fcntl.h> +#endif +#ifdef HAVE_UNISTD_H +#include <unistd.h> +#endif +#ifdef _WIN32 +#include <windows.h> +#include <sys/locking.h> +#endif + +#include <errno.h> +#include <string.h> + +/** Represents a lockfile on which we hold the lock. */ +struct tor_lockfile_t { + /** Name of the file */ + char *filename; + /** File descriptor used to hold the file open */ + int fd; +}; + +/** Try to get a lock on the lockfile filename, creating it as + * necessary. If someone else has the lock and blocking is true, + * wait until the lock is available. Otherwise return immediately whether + * we succeeded or not. + * + * Set *locked_out to true if somebody else had the lock, and to false + * otherwise. + * + * Return a tor_lockfile_t on success, NULL on failure. + * + * (Implementation note: because we need to fall back to fcntl on some + * platforms, these locks are per-process, not per-thread. If you want + * to do in-process locking, use tor_mutex_t like a normal person. + * On Windows, when blocking is true, the maximum time that + * is actually waited is 10 seconds, after which NULL is returned + * and locked_out is set to 1.) + */ +tor_lockfile_t * +tor_lockfile_lock(const char *filename, int blocking, int *locked_out) +{ + tor_lockfile_t *result; + int fd; + *locked_out = 0; + + log_info(LD_FS, "Locking \"%s\"", filename); + fd = tor_open_cloexec(filename, O_RDWR|O_CREAT|O_TRUNC, 0600); + if (fd < 0) { + log_warn(LD_FS,"Couldn't open \"%s\" for locking: %s", filename, + strerror(errno)); + return NULL; + } + +#ifdef _WIN32 + _lseek(fd, 0, SEEK_SET); + if (_locking(fd, blocking ? _LK_LOCK : _LK_NBLCK, 1) < 0) { + if (errno != EACCES && errno != EDEADLOCK) + log_warn(LD_FS,"Couldn't lock \"%s\": %s", filename, strerror(errno)); + else + *locked_out = 1; + close(fd); + return NULL; + } +#elif defined(HAVE_FLOCK) + if (flock(fd, LOCK_EX|(blocking ? 0 : LOCK_NB)) < 0) { + if (errno != EWOULDBLOCK) + log_warn(LD_FS,"Couldn't lock \"%s\": %s", filename, strerror(errno)); + else + *locked_out = 1; + close(fd); + return NULL; + } +#else + { + struct flock lock; + memset(&lock, 0, sizeof(lock)); + lock.l_type = F_WRLCK; + lock.l_whence = SEEK_SET; + if (fcntl(fd, blocking ? F_SETLKW : F_SETLK, &lock) < 0) { + if (errno != EACCES && errno != EAGAIN) + log_warn(LD_FS, "Couldn't lock \"%s\": %s", filename, strerror(errno)); + else + *locked_out = 1; + close(fd); + return NULL; + } + } +#endif /* defined(_WIN32) || ... */ + + result = tor_malloc(sizeof(tor_lockfile_t)); + result->filename = tor_strdup(filename); + result->fd = fd; + return result; +} + +/** Release the lock held as lockfile. */ +void +tor_lockfile_unlock(tor_lockfile_t *lockfile) +{ + tor_assert(lockfile); + + log_info(LD_FS, "Unlocking \"%s\"", lockfile->filename); +#ifdef _WIN32 + _lseek(lockfile->fd, 0, SEEK_SET); + if (_locking(lockfile->fd, _LK_UNLCK, 1) < 0) { + log_warn(LD_FS,"Error unlocking \"%s\": %s", lockfile->filename, + strerror(errno)); + } +#elif defined(HAVE_FLOCK) + if (flock(lockfile->fd, LOCK_UN) < 0) { + log_warn(LD_FS, "Error unlocking \"%s\": %s", lockfile->filename, + strerror(errno)); + } +#else + /* Closing the lockfile is sufficient. */ +#endif /* defined(_WIN32) || ... */ + + close(lockfile->fd); + lockfile->fd = -1; + tor_free(lockfile->filename); + tor_free(lockfile); +} diff --git a/src/lib/fs/lockfile.h b/src/lib/fs/lockfile.h new file mode 100644 index 000000000..1c5bb023b --- /dev/null +++ b/src/lib/fs/lockfile.h @@ -0,0 +1,14 @@ +/* Copyright (c) 2003-2004, Roger Dingledine + * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. + * Copyright (c) 2007-2018, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +#ifndef TOR_LOCKFILE_H +#define TOR_LOCKFILE_H + +typedef struct tor_lockfile_t tor_lockfile_t; +tor_lockfile_t *tor_lockfile_lock(const char *filename, int blocking, + int *locked_out); +void tor_lockfile_unlock(tor_lockfile_t *lockfile); + +#endif diff --git a/src/or/main.c b/src/or/main.c index 50e51915b..0ba38658a 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -112,6 +112,7 @@ #include "or/ext_orport.h" #include "lib/memarea/memarea.h" #include "lib/sandbox/sandbox.h" +#include "lib/fs/lockfile.h" #include <event2/event.h>

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits June 2018