midou/citra-shitamoto-network
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix Subvs suggestions

Browse Source
This commit is contained in:
B3n30 2018-04-05 14:43:21 +02:00
parent 29d6e05044
commit 2d72b2be8b
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/hle/service/nwm/nwm_uds.cpp
View File

@ -240,9 +240,11 @@ static void HandleEAPoLPacket(const Network::WifiPacket& packet) {
network_info.max_nodes, network_info.total_nodes); network_info.max_nodes, network_info.total_nodes);
// TODO(Subv): Encrypt the packet. // TODO(Subv): Encrypt the packet.
//TODO(B3N30): send the eapol packet just to the new client and implement a proper
// broadcast packet for all other clients
// On a 3ds the eapol packet is only sent to packet.transmitter_address // On a 3ds the eapol packet is only sent to packet.transmitter_address
// while a packet containing the node information is broadcasted // while a packet containing the node information is broadcasted
// For now we will bradcast the eapol packet instead // For now we will broadcast the eapol packet instead
eapol_logoff.destination_address = Network::BroadcastMac; eapol_logoff.destination_address = Network::BroadcastMac;
eapol_logoff.type = WifiPacket::PacketType::Data; eapol_logoff.type = WifiPacket::PacketType::Data;
@ -281,7 +283,7 @@ static void HandleEAPoLPacket(const Network::WifiPacket& packet) {
} else if (connection_status.status == static_cast<u32>(NetworkStatus::ConnectedAsClient)) { } else if (connection_status.status == static_cast<u32>(NetworkStatus::ConnectedAsClient)) {
// On a 3ds this packet wouldn't be addressed to already connected clients // On a 3ds this packet wouldn't be addressed to already connected clients
// We use this information because in the current implementation the host // We use this information because in the current implementation the host
// isn't broadcsting the node information // isn't broadcasting the node information
auto logoff = ParseEAPoLLogoffFrame(packet.data); auto logoff = ParseEAPoLLogoffFrame(packet.data);
network_info.total_nodes = logoff.connected_nodes; network_info.total_nodes = logoff.connected_nodes;
@ -290,7 +292,7 @@ static void HandleEAPoLPacket(const Network::WifiPacket& packet) {
node_info.clear(); node_info.clear();
node_info.reserve(network_info.max_nodes); node_info.reserve(network_info.max_nodes);
for (size_t index = 0; index < logoff.connected_nodes; ++index) { for (size_t index = 0; index < logoff.connected_nodes; ++index) {
if (!(connection_status.node_bitmask & 1 << index)) { if ((connection_status.node_bitmask & (1 << index)) == 0) {
connection_status.changed_nodes |= 1 << index; connection_status.changed_nodes |= 1 << index;
} }
connection_status.nodes[index] = logoff.nodes[index].network_node_id; connection_status.nodes[index] = logoff.nodes[index].network_node_id;