tor

commit 561f18e724c15c0ad22d2915786fdb8e6ddd9c30
parent 384a450a472818ff13b18b971c92f7a52ca71ac9
Author: teor <teor2345@gmail.com>
Date:   Sat, 23 Dec 2017 00:23:12 +1100

Add a nickname to each fallback in a C comment

This makes it easier for operators to find their relays, and allows stem to
use nicknames to identify fallbacks.

Implements ticket 24600.

Diffstat:
A
changes/ticket24600
 | 
5
+++++
M
scripts/maint/updateFallbackDirs.py
 | 
7
+++++++

2 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/changes/ticket24600 b/changes/ticket24600
@@ -0,0 +1,5 @@
+  o Minor features (fallback directory mirrors):
+    - Add a nickname to each fallback in a C comment. This makes it easier for
+      operators to find their relays, and allows stem to use nicknames to
+      identify fallbacks.
+      Implements ticket 24600.
diff --git a/scripts/maint/updateFallbackDirs.py b/scripts/maint/updateFallbackDirs.py
@@ -1331,6 +1331,7 @@ class Candidate(object):
   def fallbackdir_info(self, dl_speed_ok):
     # "address:dirport orport=port id=fingerprint"
     # "[ipv6=addr:orport]"
+    # /* nickname=name */
     # ,
     #
     # Do we want a C string, or a commented-out string?
@@ -1355,6 +1356,12 @@ class Candidate(object):
     if self.has_ipv6():
       s += '" ipv6=%s:%d"'%(cleanse_c_string(self.ipv6addr), self.ipv6orport)
       s += '\n'
+    if not comment_string:
+      s += '/* '
+    s += 'nickname=%s'%(cleanse_c_string(self._data['nickname']))
+    if not comment_string:
+      s += ' */'
+    s += '\n'
     s += ','
     if comment_string:
       s += '\n'