[tor-commits] [tor/master] Merge branch 'tor-github/pr/1273'

[asn at torproject.org]

commit a1192b6b4afd194043e2f80751ada9f6b30662cf
Merge: bdd17da9f fb0e8966f
Author: George Kadianakis <desnacked at riseup.net>
Date:   Mon Sep 16 15:20:25 2019 +0300

    Merge branch 'tor-github/pr/1273'

 changes/bug31552                    |  5 +++
 src/feature/dirauth/keypin.h        | 18 ++++++++-
 src/feature/dirauth/process_descs.h | 81 +++++++++++++++++++++++++++++++++++--
 src/feature/dirauth/reachability.h  | 31 ++++++++++++--
 4 files changed, 125 insertions(+), 10 deletions(-)

diff --cc src/feature/dirauth/process_descs.h
index 1d4085b09,a8a1dcca1..184caa18b
--- a/src/feature/dirauth/process_descs.h
+++ b/src/feature/dirauth/process_descs.h
@@@ -33,11 -38,75 +38,79 @@@ uint32_t dirserv_router_get_status(cons
                                     int severity);
  void dirserv_set_node_flags_from_authoritative_status(node_t *node,
                                                        uint32_t authstatus);
- 
- int dirserv_would_reject_router(const routerstatus_t *rs);
+ #else
+ static inline int
+ dirserv_load_fingerprint_file(void)
+ {
+   return 0;
+ }
+ static inline enum was_router_added_t
+ dirserv_add_multiple_descriptors(const char *desc, size_t desclen,
+                                  uint8_t purpose,
+                                  const char *source,
+                                  const char **msg)
+ {
+   (void)desc;
+   (void)desclen;
+   (void)purpose;
+   (void)source;
+   (void)msg;
+   return (enum was_router_added_t)0;
+ }
+ static inline enum was_router_added_t
+ dirserv_add_descriptor(routerinfo_t *ri,
+                        const char **msg,
+                        const char *source)
+ {
+   (void)ri;
+   (void)msg;
+   (void)source;
+   return (enum was_router_added_t)0;
+ }
+ static inline int
+ dirserv_would_reject_router(const routerstatus_t *rs)
+ {
+   (void)rs;
+   return 0;
+ }
+ static inline int
+ authdir_wants_to_reject_router(routerinfo_t *ri, const char **msg,
+                                int complain,
+                                int *valid_out)
+ {
+   (void)ri;
+   (void)msg;
+   (void)complain;
+   (void)valid_out;
+   return 0;
+ }
+ static inline int
+ dirserv_add_own_fingerprint(crypto_pk_t *pk)
+ {
+   (void)pk;
+   return 0;
+ }
+ static inline uint32_t
+ dirserv_router_get_status(const routerinfo_t *router,
+                           const char **msg,
+                           int severity)
+ {
+   (void)router;
+   (void)msg;
+   (void)severity;
+   return 0;
+ }
+ static inline void
+ dirserv_set_node_flags_from_authoritative_status(node_t *node,
+                                                  uint32_t authstatus)
+ {
+   (void)node;
+   (void)authstatus;
+ }
+ #endif
  
 +#ifdef TOR_UNIT_TESTS
 +STATIC int dirserv_router_has_valid_address(routerinfo_t *ri);
 +#endif /* defined(TOR_UNIT_TESTS) */
 +
  #endif /* !defined(TOR_RECV_UPLOADS_H) */