reverting some changes introduced by patch to sudomesh/bugs#23 to tem…

…porarily address sudomesh/bugs#27
sudomesh · Apr 16, 2018 · c5150c7 · c5150c7
1 parent af21374
commit c5150c7
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 1 deletion.
diff --git a/configs/ar71xx/home_nodes/mynet_n/n600/templates/files/etc/config/network b/configs/ar71xx/home_nodes/mynet_n/n600/templates/files/etc/config/network
@@ -70,24 +70,32 @@ config interface 'ext1mesh'
   option proto 'static'
   option ipaddr '<%= adhoc_addr_ipv4 %>'
   option netmask '<%= adhoc_subnet_ipv4_bitmask %>'
+  list dns '<%= exit_node_mesh_ipv4_addr_1 %>'
+  list dns '<%= exit_node_mesh_ipv4_addr_2 %>'
 
 config interface 'ext2mesh'
   option ifname 'eth0.2'
   option proto 'static'
   option ipaddr '<%= adhoc_addr_ipv4 %>'
   option netmask '<%= adhoc_subnet_ipv4_bitmask %>'
+  list dns '<%= exit_node_mesh_ipv4_addr_1 %>'
+  list dns '<%= exit_node_mesh_ipv4_addr_2 %>'
 
 config interface 'mesh2'
   option ifname 'mesh2'
   option proto 'static'
   option ipaddr '<%= adhoc_addr_ipv4 %>'
   option netmask '<%= adhoc_subnet_ipv4_mask %>'
+  list dns '<%= exit_node_mesh_ipv4_addr_1 %>'
+  list dns '<%= exit_node_mesh_ipv4_addr_2 %>'
 
 config interface 'mesh5'
   option ifname 'mesh5'
   option proto 'static'
   option ipaddr '<%= adhoc_addr_ipv4 %>'
   option netmask '<%= adhoc_subnet_ipv4_mask %>'
+  list dns '<%= exit_node_mesh_ipv4_addr_1 %>'
+  list dns '<%= exit_node_mesh_ipv4_addr_2 %>'
 
 # This will be our "peoplesopen.net" bridge
 config interface 'open'
@@ -96,6 +104,8 @@ config interface 'open'
   option proto 'static'
   option ipaddr '<%= open_addr_ipv4 %>'
   option netmask '<%= open_subnet_ipv4_mask %>'
+  list dns '<%= exit_node_mesh_ipv4_addr_1 %>'
+  list dns '<%= exit_node_mesh_ipv4_addr_2 %>'
 
 config interface 'priv'
   option type 'bridge'

diff --git a/configs/ar71xx/home_nodes/tplink_n/n600/templates/files/etc/config/network b/configs/ar71xx/home_nodes/tplink_n/n600/templates/files/etc/config/network
@@ -71,24 +71,32 @@ config interface 'ext1mesh'
   option proto 'static'
   option ipaddr '<%= adhoc_addr_ipv4 %>'
   option netmask '<%= adhoc_subnet_ipv4_bitmask %>'
+  list dns '<%= exit_node_mesh_ipv4_addr_1 %>'
+  list dns '<%= exit_node_mesh_ipv4_addr_2 %>'
 
 config interface 'ext2mesh'
   option ifname 'eth0.2'
   option proto 'static'
   option ipaddr '<%= adhoc_addr_ipv4 %>'
   option netmask '<%= adhoc_subnet_ipv4_bitmask %>'
+  list dns '<%= exit_node_mesh_ipv4_addr_1 %>'
+  list dns '<%= exit_node_mesh_ipv4_addr_2 %>'
 
 config interface 'mesh2'
   option ifname 'mesh2'
   option proto 'static'
   option ipaddr '<%= adhoc_addr_ipv4 %>'
   option netmask '<%= adhoc_subnet_ipv4_mask %>'
+  list dns '<%= exit_node_mesh_ipv4_addr_1 %>'
+  list dns '<%= exit_node_mesh_ipv4_addr_2 %>'
 
 config interface 'mesh5'
   option ifname 'mesh5'
   option proto 'static'
   option ipaddr '<%= adhoc_addr_ipv4 %>'
   option netmask '<%= adhoc_subnet_ipv4_mask %>'
+  list dns '<%= exit_node_mesh_ipv4_addr_1 %>'
+  list dns '<%= exit_node_mesh_ipv4_addr_2 %>'
 
 # This will be our "peoplesopen.net" bridge
 config interface 'open'
@@ -97,6 +105,8 @@ config interface 'open'
   option proto 'static'
   option ipaddr '<%= open_addr_ipv4 %>'
   option netmask '<%= open_subnet_ipv4_mask %>'
+  list dns '<%= exit_node_mesh_ipv4_addr_1 %>'
+  list dns '<%= exit_node_mesh_ipv4_addr_2 %>'
 
 config interface 'priv'
   option type 'bridge'

diff --git a/configs/ar71xx/home_nodes/tplink_n/n750/templates/files/etc/config/network b/configs/ar71xx/home_nodes/tplink_n/n750/templates/files/etc/config/network
@@ -73,24 +73,32 @@ config interface 'ext1mesh'
   option proto 'static'
   option ipaddr '<%= adhoc_addr_ipv4 %>'
   option netmask '<%= adhoc_subnet_ipv4_bitmask %>'
+  list dns '<%= exit_node_mesh_ipv4_addr_1 %>'
+  list dns '<%= exit_node_mesh_ipv4_addr_2 %>'
 
 config interface 'ext2mesh'
   option ifname 'eth0.3'
   option proto 'static'
   option ipaddr '<%= adhoc_addr_ipv4 %>'
   option netmask '<%= adhoc_subnet_ipv4_bitmask %>'
+  list dns '<%= exit_node_mesh_ipv4_addr_1 %>'
+  list dns '<%= exit_node_mesh_ipv4_addr_2 %>'
 
 config interface 'mesh2'
   option ifname 'mesh2'
   option proto 'static'
   option ipaddr '<%= adhoc_addr_ipv4 %>'
   option netmask '<%= adhoc_subnet_ipv4_mask %>'
+  list dns '<%= exit_node_mesh_ipv4_addr_1 %>'
+  list dns '<%= exit_node_mesh_ipv4_addr_2 %>'
 
 config interface 'mesh5'
   option ifname 'mesh5'
   option proto 'static'
   option ipaddr '<%= adhoc_addr_ipv4 %>'
   option netmask '<%= adhoc_subnet_ipv4_mask %>'
+  list dns '<%= exit_node_mesh_ipv4_addr_1 %>'
+  list dns '<%= exit_node_mesh_ipv4_addr_2 %>'
 
 # This will be our "peoplesopen.net" bridge
 config interface 'open'
@@ -99,6 +107,8 @@ config interface 'open'
   option proto 'static'
   option ipaddr '<%= open_addr_ipv4 %>'
   option netmask '<%= open_subnet_ipv4_mask %>'
+  list dns '<%= exit_node_mesh_ipv4_addr_1 %>'
+  list dns '<%= exit_node_mesh_ipv4_addr_2 %>'
 
 config interface 'priv'
   option type 'bridge'

diff --git a/configs/config.js b/configs/config.js
@@ -65,7 +65,8 @@ module.exports = function(u, hwInfo, callback) {
         }),
 
         relay_node_inet_ipv4_addr: '45.34.140.42',
-        exit_node_mesh_ipv4_addr: '100.64.0.42',
+        exit_node_mesh_ipv4_addr_1: '100.64.0.42',
+        exit_node_mesh_ipv4_addr_2: '100.64.0.43',
         log_ip: '100.64.0.10',
 
         operator: {

diff --git a/configs/templates/files/etc/config/network b/configs/templates/files/etc/config/network
@@ -22,12 +22,16 @@ config interface 'adhoc'
        option proto 'static'
        option ipaddr '<%= adhoc_addr_ipv4 %>'
        option netmask '<%= adhoc_subnet_ipv4_mask %>'
+       list dns '<%= exit_node_mesh_ipv4_addr_1 %>'
+       list dns '<%= exit_node_mesh_ipv4_addr_2 %>'
 
 config interface 'open'
        option ifname 'open0'
        option proto 'static'
        option ipaddr '<%= open_addr_ipv4 %>'
        option netmask '<%= open_subnet_ipv4_mask %>'
+       list dns '<%= exit_node_mesh_ipv4_addr_1 %>'
+       list dns '<%= exit_node_mesh_ipv4_addr_2 %>'
 
 config interface 'priv'
        option ifname 'priv0'

diff --git a/configs/templates/files/etc/resolv.conf.dnsmasq b/configs/templates/files/etc/resolv.conf.dnsmasq
@@ -1,5 +1,7 @@
 # These are the upstream DNS servers used by dnsmasq
 
+nameserver <%= exit_node_mesh_ipv4_addr_2 %> # sudomesh exit server
+nameserver <%= exit_node_mesh_ipv4_addr_1 %> # sudomesh exit server
 nameserver 209.244.0.3 # Level3 primary DNS
 nameserver 209.244.0.4 # Level3 secondary DNS
 nameserver 84.200.69.80 # dns.watch primary DNS