Prop259

.travis.yml

@@ -0,0 +1,12 @@
+language: c
+branches:
+    only:
+        - prop259
+compiler:
+  - clang
+  - gcc
+install: ./autogen.sh
+script:
+    - ./configure --enable-prop259 --enable-coverage --disable-asciidoc --enable-gcc-warnings
+    - make && make check
+    - make check-spaces

README → README.md

@@ -1,3 +1,5 @@
+[![Build Status](https://travis-ci.org/twstrike/tor_for_patching.svg?branch=master)](https://travis-ci.org/twstrike/tor_for_patching)
+
 Tor protects your privacy on the internet by hiding the connection
 between your Internet address and the services you use. We believe Tor
 is reasonably secure, but please ensure you read the instructions and

configure.ac

@@ -106,6 +106,13 @@ AC_ARG_ENABLE(systemd,
       esac], [systemd=auto])
 
 
+AC_ARG_ENABLE(prop259,
+      AS_HELP_STRING(--enable-prop259, [enable proposal 259]),
+      [case "${enableval}" in
+        "yes") prop259=true ;;
+        "no")  prop259=false ;;
+        * ) AC_MSG_ERROR(bad value for --enable-prop259) ;;
+      esac], [prop259=auto])
 
 # systemd support
 if test "x$enable_systemd" = "xno"; then
@@ -1101,6 +1108,10 @@ if test "x$transparent" = "xtrue"; then
    fi
 fi
 
+if test "x$prop259" = "xtrue"; then
+    AC_DEFINE(USE_PROP_259, 1, "Define to enable prop259 support")
+fi
+
 AC_CHECK_MEMBERS([struct timeval.tv_sec], , ,
 [#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>

src/or/circuitbuild.c

@@ -46,6 +46,7 @@
 #include "routerparse.h"
 #include "routerset.h"
 #include "crypto.h"
+#include "prop259.h"
 
 #ifndef MIN
 #define MIN(a,b) ((a)<(b)?(a):(b))
@@ -2420,7 +2421,8 @@ build_state_get_exit_nickname(cpath_build_state_t *state)
 }
 
 /** Return true iff the given address can be used to extend to. */
-int extend_info_addr_is_allowed(const tor_addr_t *addr)
+int
+extend_info_addr_is_allowed(const tor_addr_t *addr)
 {
   tor_assert(addr);
 
@@ -2434,3 +2436,4 @@ int extend_info_addr_is_allowed(const tor_addr_t *addr)
  disallow:
   return 0;
 }
+

src/or/circuituse.c

@@ -31,6 +31,7 @@
 #include "rephist.h"
 #include "router.h"
 #include "routerlist.h"
+#include "prop259.h"
 
 static void circuit_expire_old_circuits_clientside(void);
 static void circuit_increment_failure_count(void);

src/or/config.c

@@ -49,6 +49,7 @@
 #include "transports.h"
 #include "ext_orport.h"
 #include "torgzip.h"
+#include "prop259.h"
 #ifdef _WIN32
 #include <shlobj.h>
 #endif
@@ -1759,6 +1760,7 @@ options_act(const or_options_t *old_options)
                "Changed to using entry guards or bridges, or changed "
                "preferred or excluded node lists. "
                "Abandoning previous circuits.");
+      guard_selection_fill_in_from_entrynodes(options);
       circuit_mark_all_unused_circs();
       circuit_mark_all_dirty_circs_as_unusable();
       revise_trackexithosts = 1;

src/or/directory.c

@@ -405,14 +405,17 @@ directory_pick_generic_dirserver(dirinfo_type_t type, int pds_flags,
 
   if (should_use_directory_guards(options)) {
     const node_t *node = choose_random_dirguard(type);
-    if (node)
+    if (node) {
+      log_warn(LD_DIR,
+        "We got a guard for dir and will use it to connect dirserver.");
       rs = node->rs;
+    }
   } else {
     /* anybody with a non-zero dirport will do */
     rs = router_pick_directory_server(type, pds_flags);
   }
   if (!rs) {
-    log_info(LD_DIR, "No router found for %s; falling back to "
+    log_warn(LD_DIR, "No router found for %s; falling back to "
              "dirserver list.", dir_conn_purpose_to_string(dir_purpose));
     rs = router_pick_fallback_dirserver(type, pds_flags);
   }