bytemark/netlinkrb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Note about vlan problem on 10.04

Browse Source
This commit is contained in:
Brian Candler
2011-05-08 11:22:30 +01:00
parent 0df9fc6b32
commit 57b011b4cf
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/linux/constants.rb
View File

@@ -43,7 +43,7 @@ module Linux
NLM_F_CREATE = 0x400 NLM_F_CREATE = 0x400
NLM_F_APPEND = 0x800 NLM_F_APPEND = 0x800
NLMSG_ALIGNTO = 4 NLMSG_ALIGNTO = 4 # same on i686 and x86_64
NLMSG_NOOP = 0x1 NLMSG_NOOP = 0x1
NLMSG_ERROR = 0x2 NLMSG_ERROR = 0x2
@@ -63,7 +63,7 @@ module Linux
NLA_F_NET_BYTEORDER = (1 << 14) NLA_F_NET_BYTEORDER = (1 << 14)
NLA_TYPE_MASK = ~(NLA_F_NESTED | NLA_F_NET_BYTEORDER) NLA_TYPE_MASK = ~(NLA_F_NESTED | NLA_F_NET_BYTEORDER)
NLA_ALIGNTO = 4 NLA_ALIGNTO = 4 # same on i686 and x86_64
# from linux/rtnetlink.h. # from linux/rtnetlink.h.
RTM_NEWLINK = 16 RTM_NEWLINK = 16

4
test/t_route.rb
View File

@@ -72,6 +72,10 @@ class TestAddr < Test::Unit::TestCase
@ip.vlan.list(:link=>"lo").map { |x| x.linkinfo.data.id } @ip.vlan.list(:link=>"lo").map { |x| x.linkinfo.data.id }
end end
# FIXME: On 10.04.2 LTS (32 and 64 bit) this gives Errno::EOPNOTSUPP; but
# ip link add link lo type vlan id 1234
# ip link delete vlan0
# both work fine.
test "Add and remove vlan" do test "Add and remove vlan" do
begin begin
@ip.vlan.delete(:link=>"lo", :vlan_id=>1234) @ip.vlan.delete(:link=>"lo", :vlan_id=>1234)