Merge remote-tracking branch 'tor-github/pr/1696/head' into maint-0.4.2

diff --cc src/feature/control/control.c
Simple merge

diff --cc src/feature/control/control_events.c
Simple merge

diff --cc src/test/test_controller_events.c
index 9fb2bc72561fe64a7c59833f5933b7f475471d11,5b108ab3171f2bdadc5cabcb9c1e194e84007e0b..0d276ef8a691651ab4f170029459ea53e3b702bd
--- 1/src/test/test_controller_events.c
--- 2/src/test/test_controller_events.c
+++ b/src/test/test_controller_events.c
@@@ -17,7 -16,7 +17,8 @@@
  #include "core/mainloop/connection.h"
  #include "feature/control/control_events.h"
  #include "test/test.h"
 +#include "test/test_helpers.h"
+ #include "test/log_test_helpers.h"
  
  #include "core/or/or_circuit_st.h"
  #include "core/or/origin_circuit_st.h"
@@@ -395,13 -394,51 +396,50 @@@ test_cntev_dirboot_defer_orconn(void *a
    UNMOCK(queue_control_event_string);
  }
  
+ static void
+ test_cntev_signal(void *arg)
+ {
+   (void)arg;
+   int rv;
+ 
+   MOCK(queue_control_event_string, mock_queue_control_event_string);
+ 
+   /* Nothing is listening for signals, so no event should be queued. */
+   rv = control_event_signal(SIGHUP);
+   tt_int_op(0, OP_EQ, rv);
+   tt_ptr_op(saved_event_str, OP_EQ, NULL);
+ 
+   /* Now try with signals included in the event mask. */
+   control_testing_set_global_event_mask(EVENT_MASK_(EVENT_GOT_SIGNAL));
+   rv = control_event_signal(SIGHUP);
+   tt_int_op(0, OP_EQ, rv);
+   tt_str_op(saved_event_str, OP_EQ, "650 SIGNAL RELOAD\r\n");
+ 
+   rv = control_event_signal(SIGACTIVE);
+   tt_int_op(0, OP_EQ, rv);
+   tt_str_op(saved_event_str, OP_EQ, "650 SIGNAL ACTIVE\r\n");
+ 
+   /* Try a signal that doesn't exist. */
+   setup_full_capture_of_logs(LOG_WARN);
+   tor_free(saved_event_str);
+   rv = control_event_signal(99999);
+   tt_int_op(-1, OP_EQ, rv);
+   tt_ptr_op(saved_event_str, OP_EQ, NULL);
+   expect_single_log_msg_containing("Unrecognized signal 99999");
+ 
+  done:
+   tor_free(saved_event_str);
+  teardown_capture_of_logs();
+   UNMOCK(queue_control_event_string);
+ }
+ 
  static void
 -setup_orconn_state(orconn_event_msg_t *msg, uint64_t gid, uint64_t chan,
 +setup_orconn_state(orconn_state_msg_t *msg, uint64_t gid, uint64_t chan,
                     int proxy_type)
  {
 -  msg->type = ORCONN_MSGTYPE_STATE;
 -  msg->u.state.gid = gid;
 -  msg->u.state.chan = chan;
 -  msg->u.state.proxy_type = proxy_type;
 +  msg->gid = gid;
 +  msg->chan = chan;
 +  msg->proxy_type = proxy_type;
  }
  
  static void
@@@ -548,10 -577,11 +586,11 @@@ struct testcase_t controller_event_test
    TEST(append_cell_stats, TT_FORK),
    TEST(format_cell_stats, TT_FORK),
    TEST(event_mask, TT_FORK),
 -  TEST(dirboot_defer_desc, TT_FORK),
 -  TEST(dirboot_defer_orconn, TT_FORK),
 -  TEST(signal, TT_FORK),
 -  TEST(orconn_state, TT_FORK),
 -  TEST(orconn_state_pt, TT_FORK),
 -  TEST(orconn_state_proxy, TT_FORK),
 +  T_PUBSUB(dirboot_defer_desc, TT_FORK),
 +  T_PUBSUB(dirboot_defer_orconn, TT_FORK),
++  T_PUBSUB(signal, TT_FORK),
 +  T_PUBSUB(orconn_state, TT_FORK),
 +  T_PUBSUB(orconn_state_pt, TT_FORK),
 +  T_PUBSUB(orconn_state_proxy, TT_FORK),
    END_OF_TESTCASES
  };