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

HostDev: Create Host Device even if no IP is configured

Browse Source
This commit is contained in:
Srivats P 2019-01-14 18:26:24 +05:30
parent bac7fba1de
commit 86150a7e46
2 changed files with 20 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
server/devicemanager.cpp
View File

@ -59,6 +59,9 @@ void DeviceManager::createHostDevices(void)
if (!ifInfo) if (!ifInfo)
return; return;
Device *device = HostDevice::create(port_->name(), this);
device->setMac(ifInfo->mac);
int count = ifInfo->ip4.size(); int count = ifInfo->ip4.size();
for (int i = 0; i < count; i++) { for (int i = 0; i < count; i++) {
// XXX: Since we can't support multiple IPs with same mac, // XXX: Since we can't support multiple IPs with same mac,
@ -66,22 +69,10 @@ void DeviceManager::createHostDevices(void)
if (((ifInfo->ip4.at(i).address & 0xffff0000) == 0xa9fe0000) if (((ifInfo->ip4.at(i).address & 0xffff0000) == 0xa9fe0000)
&& (count > 1)) && (count > 1))
continue; continue;
Device *device = HostDevice::create(port_->name(), this);
device->setMac(ifInfo->mac);
device->setIp4(ifInfo->ip4.at(i).address, device->setIp4(ifInfo->ip4.at(i).address,
ifInfo->ip4.at(i).prefixLength, ifInfo->ip4.at(i).prefixLength,
ifInfo->ip4.at(i).gateway); ifInfo->ip4.at(i).gateway);
if (deviceList_.contains(device->key())) {
qWarning("%s: error adding host device %s (EEXIST)",
__FUNCTION__, qPrintable(device->config()));
delete device;
continue;
}
hostDeviceList_.append(device);
insertDevice(device->key(), device);
qDebug("host(add): %s", qPrintable(device->config()));
break; // TODO: support multiple IPs with same mac break; // TODO: support multiple IPs with same mac
} }
@ -92,28 +83,22 @@ void DeviceManager::createHostDevices(void)
if (((ifInfo->ip6.at(i).address.hi64() >> 48) == 0xfe80) if (((ifInfo->ip6.at(i).address.hi64() >> 48) == 0xfe80)
&& (count > 1)) && (count > 1))
continue; continue;
NullDevice dk(this);
dk.setMac(ifInfo->mac);
Device *device = deviceList_.value(dk.key());
if (!device) {
device = HostDevice::create(port_->name(), this);
device->setMac(ifInfo->mac);
device->setIp6(ifInfo->ip6.at(i).address, device->setIp6(ifInfo->ip6.at(i).address,
ifInfo->ip6.at(i).prefixLength, ifInfo->ip6.at(i).prefixLength,
ifInfo->ip6.at(i).gateway); ifInfo->ip6.at(i).gateway);
hostDeviceList_.append(device);
insertDevice(device->key(), device);
qDebug("host(add): %s", qPrintable(device->config()));
}
else {
device->setIp6(ifInfo->ip6.at(i).address,
ifInfo->ip6.at(i).prefixLength,
ifInfo->ip6.at(i).gateway);
qDebug("host(update): %s", qPrintable(device->config()));
}
break; // TODO: support multiple IPs with same mac break; // TODO: support multiple IPs with same mac
} }
if (deviceList_.contains(device->key())) {
qWarning("%s: error adding host device %s (EEXIST)",
__FUNCTION__, qPrintable(device->config()));
delete device;
return;
}
hostDeviceList_.append(device);
insertDevice(device->key(), device);
qDebug("host(add): %s", qPrintable(device->config()));
} }
DeviceManager::~DeviceManager() DeviceManager::~DeviceManager()

6
server/winpcapport.cpp
View File

@ -316,8 +316,10 @@ void WinPcapPort::fetchHostNetworkInfo()
while (1) { while (1) {
adapterList_ = (IP_ADAPTER_ADDRESSES *) malloc(bufLen); adapterList_ = (IP_ADAPTER_ADDRESSES *) malloc(bufLen);
ret = GetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_GATEWAYS, 0, ret = GetAdaptersAddresses(AF_UNSPEC,
adapterList_, &bufLen); GAA_FLAG_INCLUDE_ALL_INTERFACES
| GAA_FLAG_INCLUDE_GATEWAYS,
0, adapterList_, &bufLen);
if (ret == ERROR_BUFFER_OVERFLOW) { if (ret == ERROR_BUFFER_OVERFLOW) {
free(adapterList_); free(adapterList_);
continue; continue;