timy/EduNetworkBuilder
timy/EduNetworkBuilder
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

wap issues

Browse Source
This commit is contained in:
Tim Young 2015-09-01 18:19:31 -05:00
parent fe37d98e9b
commit df31ce9930
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
EduNetworkBuilder/NetworkCard.cs
View File

@ -380,7 +380,7 @@ namespace EduNetworkBuilder
if (NB.GetComponentType(tPacket.WhereAmI) != GeneralComponentType.device) return false; //we cannot do this. if (NB.GetComponentType(tPacket.WhereAmI) != GeneralComponentType.device) return false; //we cannot do this.
NetworkDevice WhereFrom = (NetworkDevice)tPacket.WhereAmI; NetworkDevice WhereFrom = (NetworkDevice)tPacket.WhereAmI;
NicType what = GetNicType; NicType what = GetNicType;
if (!tPacket.isFresh && WhereFrom.IsWirelessForwarder() && what == NicType.wlan) if (!tPacket.isFresh && WhereFrom.IsWirelessForwarder() && (what == NicType.wlan || (WhereFrom.GetNetType() == NetworkComponentType.wap && what == NicType.eth)))
what = NicType.wport; what = NicType.wport;
switch (what) switch (what)
@ -557,7 +557,7 @@ namespace EduNetworkBuilder
//Need to find the managament interface MAC //Need to find the managament interface MAC
nPacket.sourceMAC = WhereFrom.HubManagementMAC(); nPacket.sourceMAC = WhereFrom.HubManagementMAC();
} }
if(nPacket.sourceIP == null || nPacket.sourceIP.GetIPString == NB.ZeroIPString) if(nPacket.sourceIP == null || nPacket.sourceIP.GetIPString == NB.ZeroIPString && (nPacket.MyType != PacketType.dhcp_request && !tPacket.isFresh))
{ {
//set it to be the ip of management interface //set it to be the ip of management interface
nPacket.sourceIP = WhereFrom.HubManagementIP(); nPacket.sourceIP = WhereFrom.HubManagementIP();
@ -600,7 +600,8 @@ namespace EduNetworkBuilder
nd = mynet.GetDeviceFromID(myID); nd = mynet.GetDeviceFromID(myID);
if (tPacket == null) return; if (tPacket == null) return;
tPacket.InboundNic = this; //track which nic we came in on. tPacket.InboundNic = this; //track which nic we came in on.
if (myNicType == NicType.port || myNicType == NicType.wport || (nd.IsWirelessForwarder() && myNicType == NicType.wlan)) if (myNicType == NicType.port || myNicType == NicType.wport || (nd.IsWirelessForwarder() && (myNicType == NicType.wlan ||
(myNicType == NicType.eth && nd.GetNetType() == NetworkComponentType.wap ))))
{ {
//Try tracking the arp if we can //Try tracking the arp if we can
if (tPacket.TsourceIP == null) tPacket.TsourceIP = tPacket.sourceIP; if (tPacket.TsourceIP == null) tPacket.TsourceIP = tPacket.sourceIP;