Merge branch 'tor-github/pr/1040'

diff --cc src/core/or/circuitlist.c
Simple merge

diff --cc src/core/or/ocirc_event.h
index 59ec9e27cbee8d9f56c53d856e68c187ccb06a9b,ad6d69ffbea5e48c032e8e1673885c6ad9842906..8e9494874fb8b6ccdad136f427fa1d99379030f3
--- 1/src/core/or/ocirc_event.h
--- 2/src/core/or/ocirc_event.h
+++ b/src/core/or/ocirc_event.h
@@@ -56,34 -61,12 +61,12 @@@ typedef struct ocirc_cevent_msg_t 
    bool onehop;                  /**< one-hop circuit? */
  } ocirc_cevent_msg_t;
  
- /** Discriminant values for origin circuit event message */
- typedef enum ocirc_msgtype_t {
-   OCIRC_MSGTYPE_STATE,
-   OCIRC_MSGTYPE_CHAN,
-   OCIRC_MSGTYPE_CEVENT,
- } ocirc_msgtype_t;
- 
- /** Discriminated union for the actual message */
- typedef struct ocirc_event_msg_t {
-   int type;
-   union {
-     ocirc_state_msg_t state;
-     ocirc_chan_msg_t chan;
-     ocirc_cevent_msg_t cevent;
-   } u;
- } ocirc_event_msg_t;
- 
- /**
-  * Receiver function pointer for origin circuit subscribers
-  *
-  * This function gets called synchronously by the publisher.
-  **/
- typedef void (*ocirc_event_rcvr_t)(const ocirc_event_msg_t *);
- 
- void ocirc_event_subscribe(ocirc_event_rcvr_t fn);
+ DECLARE_MESSAGE(ocirc_cevent, ocirc_cevent, ocirc_cevent_msg_t *);
  
  #ifdef OCIRC_EVENT_PRIVATE
- void ocirc_event_publish(const ocirc_event_msg_t *msg);
+ void ocirc_state_publish(ocirc_state_msg_t *msg);
+ void ocirc_chan_publish(ocirc_chan_msg_t *msg);
+ void ocirc_cevent_publish(ocirc_cevent_msg_t *msg);
  #endif
  
 -#endif  /* defined(TOR_OCIRC_EVENT_STATE_H) */
 +#endif /* !defined(TOR_OCIRC_EVENT_H) */

diff --cc src/core/or/orconn_event.h
index d6635793db61a4bcdb0884696e0ce80bb340c157,a3b37d2c3d9d258e3ffd1863e681d11140c462b2..fb67a7d18365dc6318f544971e9543b4e5b3c20f
--- 1/src/core/or/orconn_event.h
--- 2/src/core/or/orconn_event.h
+++ b/src/core/or/orconn_event.h
@@@ -95,26 -93,11 +93,11 @@@ typedef struct orconn_status_msg_t 
    int reason;                   /**< reason */
  } orconn_status_msg_t;
  
- /** Discriminated union for the actual message */
- typedef struct orconn_event_msg_t {
-   int type;
-   union {
-     orconn_state_msg_t state;
-     orconn_status_msg_t status;
-   } u;
- } orconn_event_msg_t;
- 
- /**
-  * Receiver function pointer for OR subscribers
-  *
-  * This function gets called synchronously by the publisher.
-  **/
- typedef void (*orconn_event_rcvr_t)(const orconn_event_msg_t *);
- 
- void orconn_event_subscribe(orconn_event_rcvr_t);
+ DECLARE_MESSAGE(orconn_status, orconn_status, orconn_status_msg_t *);
  
  #ifdef ORCONN_EVENT_PRIVATE
- void orconn_event_publish(const orconn_event_msg_t *);
+ void orconn_state_publish(orconn_state_msg_t *);
+ void orconn_status_publish(orconn_status_msg_t *);
  #endif
  
 -#endif  /* defined(TOR_ORCONN_EVENT_H) */
 +#endif /* !defined(TOR_ORCONN_EVENT_H) */

diff --cc src/feature/control/btrack_circuit.h
index 9e06fefb076f3b66c7e7c24d63b749db6c2a02dd,b2ae6484f0136d26bffbb0289c80171baa9eb82c..b326c22ccf1d41494bd1f2ba8681012635808a17
--- 1/src/feature/control/btrack_circuit.h
--- 2/src/feature/control/btrack_circuit.h
+++ b/src/feature/control/btrack_circuit.h
@@@ -9,7 -9,10 +9,10 @@@
  #ifndef TOR_BTRACK_CIRCUIT_H
  #define TOR_BTRACK_CIRCUIT_H
  
+ #include "lib/pubsub/pubsub.h"
+ 
  int btrack_circ_init(void);
  void btrack_circ_fini(void);
+ int btrack_circ_add_pubsub(pubsub_connector_t *);
  
 -#endif  /* defined(TOR_BTRACK_CIRCUIT_H) */
 +#endif /* !defined(TOR_BTRACK_CIRCUIT_H) */

diff --cc src/feature/control/btrack_orconn.h
index f8f5c1096c7d1ab632d4a4d20a128ce810701679,fed9a58eb09988fd6992d2b2b421918794c8ef45..07b1b755f31e8b6ef845db6e60b9dc14840f02f5
--- 1/src/feature/control/btrack_orconn.h
--- 2/src/feature/control/btrack_orconn.h
+++ b/src/feature/control/btrack_orconn.h
@@@ -30,9 -32,10 +32,10 @@@ typedef struct bt_orconn_t 
    bool is_onehop;           /**< Is this for a one-hop circuit? */
  } bt_orconn_t;
  
 -#endif  /* defined(BTRACK_ORCONN_PRIVATE) */
 +#endif /* defined(BTRACK_ORCONN_PRIVATE) */
  
  int btrack_orconn_init(void);
+ int btrack_orconn_add_pubsub(pubsub_connector_t *);
  void btrack_orconn_fini(void);
  
 -#endif  /* defined(TOR_BTRACK_ORCONN_H) */
 +#endif /* !defined(TOR_BTRACK_ORCONN_H) */