Fix bug #32

packages/lime-proto-batadv/src/batadv.lua

@@ -27,22 +27,18 @@ function batadv.setup_interface(ifname, args)
 
 	uci:set("network", owrtDeviceName, "mtu", mtu)
 
-	-- BEGIN
-	-- Workaround to http://www.libre-mesh.org/issues/32
-	-- We create a new macaddress for ethernet vlan interface
-	-- We change the 7nt bit to 1 to give it locally administered meaning
-	-- Then use it as the new mac address prefix "02"
+	-- BEGIN [Fix issue 32]
 	local vlanMacAddr = nil
-	if ifname:match("^eth") then
+	if ifname:match("^eth%d+") then
 		vlanMacAddr = network.get_mac(ifname)
-	elseif ifname:match("^wlan%d+"..wireless.ifnameModeSeparator.."ap") then
+	elseif ifname:match("^wlan%d+") then
 		vlanMacAddr = wireless.get_phy_mac("phy"..ifname:match("%d+"))
 	end
 	if vlanMacAddr then
-		vlanMacAddr[1] = "02"
+		vlanMacAddr[1] = utils.pseudoEUI8(ifname..vlanId..nameSuffix..vlanProto) 
 		uci:set("network", owrtDeviceName, "macaddr", table.concat(vlanMacAddr, ":"))
 	end
-	--- END
+	--- END [Fix issue 32]
 
 	uci:set("network", owrtInterfaceName, "proto", "batadv")
 	uci:set("network", owrtInterfaceName, "mesh", "bat0")

packages/lime-system/files/usr/lib/lua/lime/utils.lua

@@ -3,6 +3,7 @@
 utils = {}
 
 local config = require("lime.config")
+local bitop = require("bit")
 
 function utils.split(string, sep)
     local ret = {}
@@ -18,6 +19,12 @@ function utils.stringEnds(string, _end)
    return ( _end == '' or string.sub( string, -string.len(_end) ) == _end)
 end
 
+function utils.pseudoEUI8(seed)
+	local sum = math.random(2,257)
+	if type(seed) == "string" then for c in seed:gmatch(".") do sum = sum + c:byte() end
+	elseif type(seed) == "number" then sum = sum + seed end
+	return utils.hex(bitop.bor( bitop.band( sum, 254 ), 2 ))
+end
 
 function utils.hex(x)
     return string.format("%02x", x)