Commit 2cee38f7 authored by Nick Mathewson's avatar Nick Mathewson 🥔
Browse files

Merge branch 'prop271_030_v1_squashed'

parents b310929e 20292ec4

src/common/address.c

+8 −0
Original line number Diff line number Diff line
@@ -2122,3 +2122,11 @@ tor_addr_port_new(const tor_addr_t *addr, uint16_t port) 
  return ap;

}



/** Return true iff <a>a</b> and <b>b</b> are the same address and port */

int

tor_addr_port_eq(const tor_addr_port_t *a,

                 const tor_addr_port_t *b)

{

  return tor_addr_eq(&a->addr, &b->addr) && a->port == b->port;

}

src/common/address.h

+2 −0
Original line number Diff line number Diff line
@@ -342,6 +342,8 @@ get_interface_address_list(int severity, int include_internal) 
}



tor_addr_port_t *tor_addr_port_new(const tor_addr_t *addr, uint16_t port);

int tor_addr_port_eq(const tor_addr_port_t *a,

                     const tor_addr_port_t *b);



#ifdef ADDRESS_PRIVATE

MOCK_DECL(smartlist_t *,get_interface_addresses_raw,(int severity,

src/common/container.c

+18 −0
Original line number Diff line number Diff line
@@ -132,6 +132,24 @@ smartlist_remove(smartlist_t *sl, const void *element) 
    }

}



/** As <b>smartlist_remove</b>, but do not change the order of

 * any elements not removed */

void

smartlist_remove_keeporder(smartlist_t *sl, const void *element)

{

  int i, j, num_used_orig = sl->num_used;

  if (element == NULL)

    return;



  for (i=j=0; j < num_used_orig; ++j) {

    if (sl->list[j] == element) {

      --sl->num_used;

    } else {

      sl->list[i++] = sl->list[j];

    }

  }

}



/** If <b>sl</b> is nonempty, remove and return the final element.  Otherwise,

 * return NULL. */

void *

src/common/container.h

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ void smartlist_clear(smartlist_t *sl); 
void smartlist_add(smartlist_t *sl, void *element);

void smartlist_add_all(smartlist_t *sl, const smartlist_t *s2);

void smartlist_remove(smartlist_t *sl, const void *element);

void smartlist_remove_keeporder(smartlist_t *sl, const void *element);

void *smartlist_pop_last(smartlist_t *sl);

void smartlist_reverse(smartlist_t *sl);

void smartlist_string_remove(smartlist_t *sl, const char *element);

src/common/log.c

+1 −1
Original line number Diff line number Diff line
@@ -1177,7 +1177,7 @@ static const char *domain_list[] = { 
  "GENERAL", "CRYPTO", "NET", "CONFIG", "FS", "PROTOCOL", "MM",

  "HTTP", "APP", "CONTROL", "CIRC", "REND", "BUG", "DIR", "DIRSERV",

  "OR", "EDGE", "ACCT", "HIST", "HANDSHAKE", "HEARTBEAT", "CHANNEL",

  "SCHED", NULL

  "SCHED", "GUARD", NULL

};



/** Return a bitmask for the log domain for which <b>domain</b> is the name,