Merge branch 'bsd_queue' of ssh://git-rw.torproject.org/nickm/tor

diff --cc src/ext/README
Simple merge

diff --cc src/or/channel.c
index 5552d39f5b61c36e8b1d66049fd2ef2a3e2a2c1d,7f3c6f58681e8234268c6e400c1c566b5f2740d2..cd5972f1eccb93ee6ba448d94cc786162569111e
--- 1/src/or/channel.c
--- 2/src/or/channel.c
+++ b/src/or/channel.c
@@@ -82,7 -81,37 +83,37 @@@ static uint64_t n_channels_allocated = 
   * If more than one channel exists, follow the next_with_same_id pointer
   * as a linked list.
   */
- static digestmap_t *channel_identity_map = NULL;
+ HT_HEAD(channel_idmap, channel_idmap_entry_s) channel_identity_map =
+   HT_INITIALIZER();
+ 
+ typedef struct channel_idmap_entry_s {
+   HT_ENTRY(channel_idmap_entry_s) node;
+   uint8_t digest[DIGEST_LEN];
+   LIST_HEAD(channel_list_s, channel_s) channel_list;
+ } channel_idmap_entry_t;
+ 
+ static INLINE unsigned
+ channel_idmap_hash(const channel_idmap_entry_t *ent)
+ {
+   const unsigned *a = (const unsigned *)ent->digest;
+ #if SIZEOF_INT == 4
+   return a[0] ^ a[1] ^ a[2] ^ a[3] ^ a[4];
+ #elif SIZEOF_INT == 8
+   return a[0] ^ a[1];
+ #endif
+ }
+ 
+ static INLINE int
+ channel_idmap_eq(const channel_idmap_entry_t *a,
+                   const channel_idmap_entry_t *b)
+ {
+   return tor_memeq(a->digest, b->digest, DIGEST_LEN);
+ }
+ 
+ HT_PROTOTYPE(channel_idmap, channel_idmap_entry_s, node, channel_idmap_hash,
+              channel_idmap_eq);
+ HT_GENERATE(channel_idmap, channel_idmap_entry_s, node, channel_idmap_hash,
 -            channel_idmap_eq, 0.5, tor_malloc, tor_realloc, _tor_free);
++            channel_idmap_eq, 0.5, tor_malloc, tor_realloc, tor_free_);
  
  static cell_queue_entry_t * cell_queue_entry_dup(cell_queue_entry_t *q);
  static void cell_queue_entry_free(cell_queue_entry_t *q, int handed_off);
@@@ -881,52 -832,25 +852,43 @@@ channel_listener_free(channel_listener_
  static void
  channel_force_free(channel_t *chan)
  {
+   cell_queue_entry_t *cell, *cell_tmp;
    tor_assert(chan);
  
 +  log_debug(LD_CHANNEL,
 +            "Force-freeing channel " U64_FORMAT " at %p",
 +            U64_PRINTF_ARG(chan->global_identifier), chan);
 +
 +  /*
 +   * Get rid of cmux policy before we do anything, so cmux policies don't
 +   * see channels in weird half-freed states.
 +   */
 +  if (chan->cmux) {
 +    circuitmux_set_policy(chan->cmux, NULL);
 +  }
 +
    /* Call a free method if there is one */
    if (chan->free) chan->free(chan);
  
    channel_clear_remote_end(chan);
  
 +  /* Get rid of cmux */
 +  if (chan->cmux) {
 +    circuitmux_free(chan->cmux);
 +    chan->cmux = NULL;
 +  }
 +
    /* We might still have a cell queue; kill it */
-   if (chan->incoming_queue) {
-     SMARTLIST_FOREACH_BEGIN(chan->incoming_queue,
-                             cell_queue_entry_t *, q) {
-       cell_queue_entry_free(q, 0);
-     } SMARTLIST_FOREACH_END(q);
- 
-     smartlist_free(chan->incoming_queue);
-     chan->incoming_queue = NULL;
+   SIMPLEQ_FOREACH_SAFE(cell, &chan->incoming_queue, next, cell_tmp) {
+       cell_queue_entry_free(cell, 0);
    }
+   SIMPLEQ_INIT(&chan->incoming_queue);
  
    /* Outgoing cell queue is similar, but we can have to free packed cells */
-   if (chan->outgoing_queue) {
-     SMARTLIST_FOREACH_BEGIN(chan->outgoing_queue,
-                             cell_queue_entry_t *, q) {
-       cell_queue_entry_free(q, 0);
-     } SMARTLIST_FOREACH_END(q);
- 
-     smartlist_free(chan->outgoing_queue);
-     chan->outgoing_queue = NULL;
+   SIMPLEQ_FOREACH_SAFE(cell, &chan->outgoing_queue, next, cell_tmp) {
+     cell_queue_entry_free(cell, 0);
    }
+   SIMPLEQ_INIT(&chan->outgoing_queue);
  
    tor_free(chan);
  }

diff --cc src/or/channel.h
index d90335c194279984209de0a792b47134d0bc83ea,1e7279a54a3b83b01b7abdad707e002a42d32218..d2106551aac671a095fd37f8673b846948a6ae77
--- 1/src/or/channel.h
--- 2/src/or/channel.h
+++ b/src/or/channel.h
@@@ -6,10 -6,11 +6,11 @@@
   * \brief Header file for channel.c
   **/
  
 -#ifndef _TOR_CHANNEL_H
 -#define _TOR_CHANNEL_H
 +#ifndef TOR_CHANNEL_H
 +#define TOR_CHANNEL_H
  
  #include "or.h"
+ #include "tor_queue.h"
  #include "circuitmux.h"
  
  /* Channel handler function pointer typedefs */