Developing lightweight computation at the DSG edge

Commit 712929dc authored by Simó Albert i Beltran's avatar Simó Albert i Beltran
Browse files

Import "Fix bmx_ipv4_prefix24 to be a true /24 prefix", references #217.

parents 4d178444 6e2dda96
......@@ -49,7 +49,7 @@ config 'qmp' 'networks'
option 'bmx6_mesh_prefix48' 'fd02:0:0'
option 'bmx6_ripe_prefix48' '2012:0:0' # suffix is autoconfigured based on community_node_id
option 'bmx6_ipv4_prefix24' '10.202'
option 'bmx6_ipv4_prefix24' '10.202.0'
# option 'bmx6_ipv4_address' '10.202.9.01/24' # if commented out then option is autoconfigured based on
# community_node_id and bmx6_ipv4_prefix
option 'bmx6_tablePrefTuns' '7000'
......
......@@ -874,7 +874,7 @@ qmp_configure_bmx6() {
uci set $conf.general.tun4Address="$bmx6_ipv4_address/$bmx6_ipv4_netmask"
elif qmp_uci_test qmp.networks.bmx6_ipv4_prefix24 ; then
local ipv4_suffix24="$(( 0x$community_node_id / 0x100 )).$(( 0x$community_node_id % 0x100 ))"
local ipv4_suffix24="$(( 0x$community_node_id % 0x100 ))"
uci set $conf.general.tun4Address="$(uci get qmp.networks.bmx6_ipv4_prefix24).$ipv4_suffix24/32"
fi
......
#!/bin/sh
#
# Copyright (C) 2011 Fundacio Privada per a la Xarxa Oberta, Lliure i Neutral guifi.net
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along
# with this program; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
# The full GNU General Public License is included in this distribution in
# the file called "COPYING".
#
# Check if IP prefix is set to /16 (e.g. 10.202) and change it to /24
local ipv4_prefix24="$(uci get qmp.networks.bmx6_ipv4_prefix24)"
if [ ! $(echo $ipv4_prefix24 | cut -f3 -d .) ] ; then
uci set qmp.networks.bmx6_ipv4_prefix24="$ipv4_prefix24.0"
uci commit
fi
......@@ -148,7 +148,7 @@ function netmode.write(self, section, value)
uciout:set("qmp","networks","publish_lan","0")
uciout:set("qmp","networks","lan_address","172.30.22.1")
uciout:set("qmp","networks","lan_netmask","255.255.0.0")
uciout:set("qmp","networks","bmx6_ipv4_prefix24","10.202")
uciout:set("qmp","networks","bmx6_ipv4_prefix24","10.202.0")
uciout:set("qmp","networks","bmx6_ipv4_address","")
uciout:set("qmp","networks","olsr6_ipv4_address","")
uciout:set("qmp","networks","olsr6_ipv4_prefix24","10.201")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment