commit b3492d53c3f643a1e6b2e62bb8b2ad5bfa77213e Merge: d20cfc00c 090036799 Author: David Goulet dgoulet@torproject.org Date: Fri May 3 10:56:12 2019 -0400
Merge branch 'tor-github/pr/984'
Signed-off-by: David Goulet dgoulet@torproject.org
changes/ticket30007 | 3 + scripts/coccinelle/ctrl-reply-cleanup.cocci | 43 +++++ scripts/coccinelle/ctrl-reply.cocci | 87 +++++++++ scripts/coccinelle/tor-coccinelle.h | 3 + scripts/maint/practracker/exceptions.txt | 2 +- src/core/include.am | 2 + src/feature/control/control.c | 10 +- src/feature/control/control_auth.c | 48 +++-- src/feature/control/control_cmd.c | 265 +++++++++++++------------- src/feature/control/control_events.c | 1 + src/feature/control/control_fmt.c | 144 +-------------- src/feature/control/control_fmt.h | 9 - src/feature/control/control_getinfo.c | 26 +-- src/feature/control/control_proto.c | 276 ++++++++++++++++++++++++++++ src/feature/control/control_proto.h | 48 +++++ src/test/test_util.c | 2 +- 16 files changed, 630 insertions(+), 339 deletions(-)
diff --cc src/core/include.am index c228735f1,2533a4990..9493f7955 --- a/src/core/include.am +++ b/src/core/include.am @@@ -81,8 -79,10 +81,9 @@@ LIBTOR_APP_A_SOURCES = src/feature/control/control_events.c \ src/feature/control/control_fmt.c \ src/feature/control/control_getinfo.c \ + src/feature/control/control_proto.c \ src/feature/control/fmt_serverstatus.c \ src/feature/control/getinfo_geoip.c \ - src/feature/dirauth/keypin.c \ src/feature/dircache/conscache.c \ src/feature/dircache/consdiffmgr.c \ src/feature/dircache/dircache.c \