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

Device Emulation (contd.): Optimize getDeviceMac() and getNeighborMac() to return 0 if no devices are configured

Browse Source
This commit is contained in:
Srivats P 2016-01-28 21:21:24 +05:30
parent f6c852495d
commit 3040c72181
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/devicemanager.cpp
View File

@ -321,6 +321,10 @@ Device* DeviceManager::originDevice(PacketBuffer *pktBuf)
quint16 vlan; quint16 vlan;
int idx = 0; int idx = 0;
// Do we have any devices at all?
if (!deviceCount())
return NULL;
// pktBuf will not have the correct dstMac populated, so use bcastMac // pktBuf will not have the correct dstMac populated, so use bcastMac
// and search for device by IP // and search for device by IP

14
server/myservice.cpp
View File

@ -933,11 +933,18 @@ _invalid_port:
quint64 getDeviceMacAddress(int portId, int streamId, int frameIndex) quint64 getDeviceMacAddress(int portId, int streamId, int frameIndex)
{ {
MyService *service = drone->rpcService(); MyService *service = drone->rpcService();
DeviceManager *devMgr = NULL;
quint64 mac; quint64 mac;
if (!service) if (!service)
return 0; return 0;
if ((portId >= 0) && (portId < service->portInfo.size()))
devMgr = service->portInfo[portId]->deviceManager();
if (!devMgr || !devMgr->deviceCount())
return 0;
service->portLock[portId]->lockForWrite(); service->portLock[portId]->lockForWrite();
mac = service->portInfo[portId]->deviceMacAddress(streamId, frameIndex); mac = service->portInfo[portId]->deviceMacAddress(streamId, frameIndex);
service->portLock[portId]->unlock(); service->portLock[portId]->unlock();
@ -948,11 +955,18 @@ quint64 getDeviceMacAddress(int portId, int streamId, int frameIndex)
quint64 getNeighborMacAddress(int portId, int streamId, int frameIndex) quint64 getNeighborMacAddress(int portId, int streamId, int frameIndex)
{ {
MyService *service = drone->rpcService(); MyService *service = drone->rpcService();
DeviceManager *devMgr = NULL;
quint64 mac; quint64 mac;
if (!service) if (!service)
return 0; return 0;
if ((portId >= 0) && (portId < service->portInfo.size()))
devMgr = service->portInfo[portId]->deviceManager();
if (!devMgr || !devMgr->deviceCount())
return 0;
service->portLock[portId]->lockForWrite(); service->portLock[portId]->lockForWrite();
mac = service->portInfo[portId]->neighborMacAddress(streamId, frameIndex); mac = service->portInfo[portId]->neighborMacAddress(streamId, frameIndex);
service->portLock[portId]->unlock(); service->portLock[portId]->unlock();