Skip to content

protos: force vlanId to be numeric #633

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
spiccinini merged 1 commit into from
Nov 10, 2019
Merged

protos: force vlanId to be numeric #633

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/lime-proto-bmx6/src/bmx6.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ function bmx6.setup_interface(ifname, args)
( ifname:match("^wlan%d+.ap") or ifname:match("^eth%d+") )
then return end

vlanId = args[2] or 13
vlanId = tonumber(args[2]) or 13
vlanProto = args[3] or "8021ad"
nameSuffix = args[4] or "_bmx6"

Expand Down
2 changes: 1 addition & 1 deletion packages/lime-proto-bmx7/files/usr/lib/lua/lime/proto/bmx7.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ function bmx7.setup_interface(ifname, args)
( ifname:match("^wlan%d+.ap") or ifname:match("^eth%d+") )
then return end

vlanId = args[2] or 18
vlanId = tonumber(args[2]) or 18
vlanProto = args[3] or "8021ad"
nameSuffix = args[4] or "_bmx7"

Expand Down
2 changes: 1 addition & 1 deletion packages/lime-proto-olsr/src/olsr.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ function olsr.setup_interface(ifname, args)
if ifname:match("^wlan%d+.ap") then return end
end

local vlanId = args[2] or 14
local vlanId = tonumber(args[2]) or 14
local vlanProto = args[3] or "8021ad"
local nameSuffix = args[4] or "_olsr"
local ipPrefixTemplate = args[5] or "169.254.%M5.%M6/16"
Expand Down
2 changes: 1 addition & 1 deletion packages/lime-proto-olsr2/src/olsr2.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ function olsr2.setup_interface(ifname, args)
if not args["specific"] then
if ifname:match("^wlan%d+.ap") then return end
end
local vlanId = args[2] or 16
local vlanId = tonumber(args[2]) or 16
local vlanProto = args[3] or "8021ad"
local nameSuffix = args[4] or "_olsr"
local owrtInterfaceName, linux802adIfName, owrtDeviceName = network.createVlanIface(ifname, vlanId, nameSuffix, vlanProto)
Expand Down
2 changes: 1 addition & 1 deletion packages/lime-proto-olsr6/src/olsr6.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ function olsr.setup_interface(ifname, args)
if ifname:match("^wlan%d+.ap") then return end
end

vlanId = args[2] or 15
vlanId = tonumber(args[2]) or 15
vlanProto = args[3] or "8021ad"
nameSuffix = args[4] or "_olsr6"
local ipPrefixTemplate = args[5] or "fc00::%M1%M2:%M3%M4:%M5%M6/64"
Expand Down