浏览代码

Ensure that v2 onion address flag gets cleared on each call

Bob Mottram 7 年前
父节点
当前提交
5b782e51fd
共有 1 个文件被更改,包括 4 次插入1 次删除
  1. 4
    1
      src/freedombone-utils-onion

+ 4
- 1
src/freedombone-utils-onion 查看文件

116
 
116
 
117
     if [ -f ${HIDDEN_SERVICE_PATH}${onion_service_name}/hostname ]; then
117
     if [ -f ${HIDDEN_SERVICE_PATH}${onion_service_name}/hostname ]; then
118
         echo $(cat ${HIDDEN_SERVICE_PATH}${onion_service_name}/hostname)
118
         echo $(cat ${HIDDEN_SERVICE_PATH}${onion_service_name}/hostname)
119
+        USE_V2_ONION_ADDRESS=
119
         return
120
         return
120
     fi
121
     fi
121
 
122
 
122
     if [ ! -d /var/lib/tor ]; then
123
     if [ ! -d /var/lib/tor ]; then
123
         echo $"No Tor installation found. ${onion_service_name} onion site cannot be configured."
124
         echo $"No Tor installation found. ${onion_service_name} onion site cannot be configured."
125
+        USE_V2_ONION_ADDRESS=
124
         exit 877367
126
         exit 877367
125
     fi
127
     fi
126
     if ! grep -q "hidden_service_${onion_service_name}" /etc/tor/torrc; then
128
     if ! grep -q "hidden_service_${onion_service_name}" /etc/tor/torrc; then
129
             echo 'HiddenServiceVersion 3' >> /etc/tor/torrc
131
             echo 'HiddenServiceVersion 3' >> /etc/tor/torrc
130
         else
132
         else
131
             echo 'HiddenServiceVersion 2' >> /etc/tor/torrc
133
             echo 'HiddenServiceVersion 2' >> /etc/tor/torrc
132
-            USE_V2_ONION_ADDRESS=
133
         fi
134
         fi
134
         echo "HiddenServicePort ${onion_service_port_from} 127.0.0.1:${onion_service_port_to}" >> /etc/tor/torrc
135
         echo "HiddenServicePort ${onion_service_port_from} 127.0.0.1:${onion_service_port_to}" >> /etc/tor/torrc
135
         if [ ${#onion_stealth_name} -gt 0 ]; then
136
         if [ ${#onion_stealth_name} -gt 0 ]; then
137
         fi
138
         fi
138
     fi
139
     fi
139
 
140
 
141
+    USE_V2_ONION_ADDRESS=
142
+
140
     onion_update
143
     onion_update
141
 
144
 
142
     function_check wait_for_onion_service
145
     function_check wait_for_onion_service