fixup! Rework origin circuit tracking to use pubsub

tlyu · May 28, 2019 · 282dedd · 282dedd
1 parent 9e633cf
commit 282dedd
Showing 1 changed file with 6 additions and 9 deletions.
diff --git a/src/core/or/ocirc_event.c b/src/core/or/ocirc_event.c
@@ -39,36 +39,33 @@ ocirc_event_free(msg_aux_data_t u)
 static char *
 ocirc_state_fmt(msg_aux_data_t u)
 {
-  ocirc_state_msg_t msg;
+  ocirc_state_msg_t *msg = (ocirc_state_msg_t *)u.ptr;
   char *s = NULL;
 
-  msg = *(ocirc_state_msg_t *)u.ptr;
   tor_asprintf(&s, "<gid=%"PRIu32" state=%d onehop=%d>",
-               msg.gid, msg.state, msg.onehop);
+               msg->gid, msg->state, msg->onehop);
   return s;
 }
 
 static char *
 ocirc_chan_fmt(msg_aux_data_t u)
 {
-  ocirc_chan_msg_t msg;
+  ocirc_chan_msg_t *msg = (ocirc_chan_msg_t *)u.ptr;
   char *s = NULL;
 
-  msg = *(ocirc_chan_msg_t *)u.ptr;
   tor_asprintf(&s, "<gid=%"PRIu32" chan=%"PRIu64" onehop=%d>",
-               msg.gid, msg.chan, msg.onehop);
+               msg->gid, msg->chan, msg->onehop);
   return s;
 }
 
 static char *
 ocirc_cevent_fmt(msg_aux_data_t u)
 {
-  ocirc_cevent_msg_t msg;
+  ocirc_cevent_msg_t *msg = (ocirc_cevent_msg_t *)u.ptr;
   char *s = NULL;
 
-  msg = *(ocirc_cevent_msg_t *)u.ptr;
   tor_asprintf(&s, "<gid=%"PRIu32" evtype=%d reason=%d onehop=%d>",
-               msg.gid, msg.evtype, msg.reason, msg.onehop);
+               msg->gid, msg->evtype, msg->reason, msg->onehop);
   return s;
 }