Browse Source

Obtain tox port for firewall

Bob Mottram 8 years ago
parent
commit
2b586ff4a2
No account linked to committer's email
1 changed files with 10 additions and 9 deletions
  1. 10
    9
      src/freedombone-app-tox

+ 10
- 9
src/freedombone-app-tox View File

@@ -201,6 +201,16 @@ function configure_firewall_for_tox {
201 201
 	if [[ $ONION_ONLY != "no" ]]; then
202 202
 		return
203 203
 	fi
204
+
205
+	TOX_PORT_MAIN=$(cat /usr/share/${PROJECT_NAME}/apps/${PROJECT_NAME}-app-tox | grep "TOX_PORT=" | head -n 1 | awk -F '=' '{print $2}')
206
+	if [ ${#TOX_PORT_MAIN} -gt 2 ]; then
207
+		TOX_PORT=$TOX_PORT_MAIN
208
+	fi
209
+	if [ ! $TOX_PORT ]; then
210
+		echo $'No Tox port was specified'
211
+		exit 32856
212
+	fi
213
+
204 214
 	iptables -A INPUT -p tcp --dport $TOX_PORT -j ACCEPT
205 215
 	function_check save_firewall_settings
206 216
 	save_firewall_settings
@@ -331,15 +341,6 @@ function mesh_tox_node {
331 341
 		exit 76325
332 342
 	fi
333 343
 
334
-	TOX_PORT_MAIN=$(cat /usr/share/${PROJECT_NAME}/apps/${PROJECT_NAME}-app-tox | grep "TOX_PORT=" | head -n 1 | awk -F '=' '{print $2}')
335
-	if [ ${#TOX_PORT_MAIN} -gt 2 ]; then
336
-		TOX_PORT=$TOX_PORT_MAIN
337
-	fi
338
-	if [ ! $TOX_PORT ]; then
339
-		echo $'No Tox port was specified'
340
-		exit 32856
341
-	fi
342
-
343 344
 	TOXCORE_REPO_MAIN=$(cat /usr/share/${PROJECT_NAME}/apps/${PROJECT_NAME}-app-tox | grep "TOXCORE_REPO=" | head -n 1 | awk -F '"' '{print $2}')
344 345
 	if [ ${#TOXCORE_REPO_MAIN} -gt 10 ]; then
345 346
 		TOXCORE_REPO=$TOXCORE_REPO_MAIN