Unverified Commit a1f73cb9 authored by teor's avatar teor
Browse files

Merge branch 'maint-0.4.2'

parents 042116e1 5dbdca01

changes/bug31837

0 → 100644
+5 −0
Original line number Diff line number Diff line 
  o Minor bugfixes (testing):

    - When testing port rebinding, don't busy-wait for tor to log. Instead,

      actually sleep for a short time before polling again. Also improve the

      formatting of control commands and log messages.

      Fixes bug 31837; bugfix on 0.3.5.1-alpha.

src/lib/err/backtrace.c

+6 −6
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ static pthread_mutex_t cb_buf_mutex = PTHREAD_MUTEX_INITIALIZER; 


/** Lock and return a static stack pointer buffer that can hold up to

 *  MAX_DEPTH function pointers. */

static void *

static void **

lock_cb_buf(void)

{

  /* Lock the mutex first, before even declaring the buffer. */
@@ -102,7 +102,7 @@ lock_cb_buf(void) 


/** Unlock the static stack pointer buffer. */

static void

unlock_cb_buf(void *cb_buf)

unlock_cb_buf(void **cb_buf)

{

  memset(cb_buf, 0, SIZEOF_CB_BUF);

  pthread_mutex_unlock(&cb_buf_mutex);
@@ -149,7 +149,7 @@ log_backtrace_impl(int severity, log_domain_mask_t domain, const char *msg, 
  char **symbols;

  size_t i;



  void *cb_buf = lock_cb_buf();

  void **cb_buf = lock_cb_buf();



  depth = backtrace(cb_buf, MAX_DEPTH);

  symbols = backtrace_symbols(cb_buf, (int)depth);
@@ -183,7 +183,7 @@ crash_handler(int sig, siginfo_t *si, void *ctx_) 
  int n_fds, i;

  const int *fds = NULL;



  void *cb_buf = lock_cb_buf();

  void **cb_buf = lock_cb_buf();



  (void) si;
@@ -214,7 +214,7 @@ dump_stack_symbols_to_error_fds(void) 
  const int *fds = NULL;

  size_t depth;



  void *cb_buf = lock_cb_buf();

  void **cb_buf = lock_cb_buf();



  depth = backtrace(cb_buf, MAX_DEPTH);
@@ -256,7 +256,7 @@ install_bt_handler(void) 
     * libc has pre-loaded the symbols we need to dump things, so that later

     * reads won't be denied by the sandbox code */

    char **symbols;

    void *cb_buf = lock_cb_buf();

    void **cb_buf = lock_cb_buf();

    size_t depth = backtrace(cb_buf, MAX_DEPTH);

    symbols = backtrace_symbols(cb_buf, (int) depth);

    if (symbols)

src/test/test_rebind.py

+9 −7
Original line number Diff line number Diff line
@@ -32,15 +32,17 @@ def wait_for_log(s): 
    cutoff = time.time() + LOG_TIMEOUT

    while time.time() < cutoff:

        l = tor_process.stdout.readline()

        l = l.decode('utf8')

        l = l.decode('utf8', 'backslashreplace')

        if s in l:

            logging.info('Tor logged: "{}"'.format(l.strip()))

            return

        logging.info('Tor logged: "{}", waiting for "{}"'.format(l.strip(), s))

        # readline() returns a blank string when there is no output

        # avoid busy-waiting

        if len(s) == 0:

        if len(l) == 0:

            logging.debug('Tor has not logged anything, waiting for "{}"'.format(s))

            time.sleep(LOG_WAIT)

        else:

            logging.info('Tor logged: "{}", waiting for "{}"'.format(l.strip(), s))

    fail('Could not find "{}" in logs after {} seconds'.format(s, LOG_TIMEOUT))



def pick_random_port():
@@ -120,18 +122,18 @@ if control_socket.connect_ex(('127.0.0.1', control_port)): 
    tor_process.terminate()

    fail('Cannot connect to ControlPort')



control_socket.sendall('AUTHENTICATE \r\n'.encode('utf8'))

control_socket.sendall('SETCONF SOCKSPort=0.0.0.0:{}\r\n'.format(socks_port).encode('utf8'))

control_socket.sendall('AUTHENTICATE \r\n'.encode('ascii'))

control_socket.sendall('SETCONF SOCKSPort=0.0.0.0:{}\r\n'.format(socks_port).encode('ascii'))

wait_for_log('Opened Socks listener')



try_connecting_to_socksport()



control_socket.sendall('SETCONF SOCKSPort=127.0.0.1:{}\r\n'.format(socks_port).encode('utf8'))

control_socket.sendall('SETCONF SOCKSPort=127.0.0.1:{}\r\n'.format(socks_port).encode('ascii'))

wait_for_log('Opened Socks listener')



try_connecting_to_socksport()



control_socket.sendall('SIGNAL HALT\r\n'.encode('utf8'))

control_socket.sendall('SIGNAL HALT\r\n'.encode('ascii'))



wait_for_log('exiting cleanly')

logging.info('OK')