matthew/ostinato
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Device Emulation (contd.): Use portId as part of the default IP address assigned to a deviceGroup

Browse Source
This commit is contained in:
Srivats P 2016-03-19 18:17:50 +05:30
parent f33bd38e7b
commit 803242db38
2 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
client/devicegroupdialog.cpp
View File

@ -221,6 +221,10 @@ void DeviceGroupDialog::loadDeviceGroup()
{ {
const OstProto::DeviceGroup *devGrp = port_->deviceGroupByIndex(index_); const OstProto::DeviceGroup *devGrp = port_->deviceGroupByIndex(index_);
int tagCount = 0; int tagCount = 0;
// use 1-indexed id so that it matches the port id used in the
// RFC 4814 compliant mac addresses assigned by default to deviceGroups
// XXX: use deviceGroupId also as part of the id?
quint32 id = (port_->id()+1) & 0xff;
Q_ASSERT(devGrp); Q_ASSERT(devGrp);
@ -255,22 +259,26 @@ void DeviceGroupDialog::loadDeviceGroup()
macStep->setValue(mac.step()); macStep->setValue(mac.step());
OstEmul::Ip4Emulation ip4 = devGrp->GetExtension(OstEmul::ip4); OstEmul::Ip4Emulation ip4 = devGrp->GetExtension(OstEmul::ip4);
ip4Address->setValue(ip4.address()); // If address is not set, assign one from RFC 2544 space - 192.18.0.0/15
// Use port Id as the 3rd octet of the address
ip4Address->setValue(ip4.has_address() ?
ip4.address() : 0xc6120002 | (id << 8));
ip4PrefixLength->setValue(ip4.prefix_length()); ip4PrefixLength->setValue(ip4.prefix_length());
ip4Step->setValue(ip4.step()); ip4Step->setValue(ip4.has_step()? ip4.step() : 1);
ip4Gateway->setValue(ip4.default_gateway()); ip4Gateway->setValue(ip4.has_default_gateway() ?
ip4.default_gateway() : 0xc6120001 | (id << 8));
OstEmul::Ip6Emulation ip6 = devGrp->GetExtension(OstEmul::ip6); OstEmul::Ip6Emulation ip6 = devGrp->GetExtension(OstEmul::ip6);
// ip6 fields don't have default values defined in the .proto // If address is not set, assign one from RFC 5180 space 2001:0200::/64
// because protobuf doesn't allow different default values for // Use port Id as the 3rd hextet of the address
// embedded message fields, so assign them here
// Use address 2001:0200::/64 from the RFC 5180 range
ip6Address->setValue(ip6.has_address() ? ip6Address->setValue(ip6.has_address() ?
UINT128(ip6.address()) : UInt128(0x20010200ULL << 32, 2)); UINT128(ip6.address()) :
UInt128((0x200102000000ULL | id) << 16, 2));
ip6PrefixLength->setValue(ip6.prefix_length()); ip6PrefixLength->setValue(ip6.prefix_length());
ip6Step->setValue(ip6.has_step() ? UINT128(ip6.step()) : UInt128(0, 1)); ip6Step->setValue(ip6.has_step() ? UINT128(ip6.step()) : UInt128(0, 1));
ip6Gateway->setValue(ip6.has_default_gateway() ? ip6Gateway->setValue(ip6.has_default_gateway() ?
UINT128(ip6.default_gateway()) : UInt128(0x20010200ULL << 32, 1)); UINT128(ip6.default_gateway()) :
UInt128((0x200102000000ULL | id) << 16, 1));
int stk = kIpNone; int stk = kIpNone;
if (devGrp->HasExtension(OstEmul::ip4)) if (devGrp->HasExtension(OstEmul::ip4))

7
common/emulproto.proto
View File

@ -51,10 +51,9 @@ message MacEmulation {
} }
message Ip4Emulation { message Ip4Emulation {
// Use RFC 2544 reserved address for default - 198.18.0.2/24 optional uint32 address = 1;
optional uint32 address = 1 [default = 0xc6120002];
optional uint32 prefix_length = 2 [default = 24]; optional uint32 prefix_length = 2 [default = 24];
optional uint32 default_gateway = 3 [default = 0xc6120001]; optional uint32 default_gateway = 3;
optional uint32 step = 10 [default = 1]; optional uint32 step = 10 [default = 1];
// FIXME: step for gateway? // FIXME: step for gateway?
@ -66,8 +65,6 @@ message Ip6Address {
} }
message Ip6Emulation { message Ip6Emulation {
// no defaults since we can't set different default values
// for an embedded message field
optional Ip6Address address = 1; optional Ip6Address address = 1;
optional uint32 prefix_length = 2 [default = 64]; optional uint32 prefix_length = 2 [default = 64];
optional Ip6Address default_gateway = 3; optional Ip6Address default_gateway = 3;