diff --git a/Source/Core/Common/CMakeLists.txt b/Source/Core/Common/CMakeLists.txt
index 02d46e1987..13391e03d4 100644
--- a/Source/Core/Common/CMakeLists.txt
+++ b/Source/Core/Common/CMakeLists.txt
@@ -13,6 +13,7 @@ set(SRCS BreakPoints.cpp
Misc.cpp
MsgHandler.cpp
NandPaths.cpp
+ Network.cpp
SettingsHandler.cpp
SDCardUtil.cpp
StringUtil.cpp
diff --git a/Source/Core/Common/Common.vcxproj b/Source/Core/Common/Common.vcxproj
index 2aa69ba1b7..213e3c0765 100644
--- a/Source/Core/Common/Common.vcxproj
+++ b/Source/Core/Common/Common.vcxproj
@@ -75,6 +75,7 @@
+
@@ -109,6 +110,7 @@
+
diff --git a/Source/Core/Common/Common.vcxproj.filters b/Source/Core/Common/Common.vcxproj.filters
index d932b32be5..e50e5ebfb8 100644
--- a/Source/Core/Common/Common.vcxproj.filters
+++ b/Source/Core/Common/Common.vcxproj.filters
@@ -36,6 +36,7 @@
+
@@ -77,6 +78,7 @@
+
diff --git a/Source/Core/Common/Network.cpp b/Source/Core/Common/Network.cpp
new file mode 100644
index 0000000000..6af6da7ffa
--- /dev/null
+++ b/Source/Core/Common/Network.cpp
@@ -0,0 +1,70 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
+
+#include
+#include
+
+#include "Common/Network.h"
+#include "Common/StringUtil.h"
+
+void GenerateMacAddress(const MACConsumer type, u8* mac)
+{
+ memset(mac, 0, MAC_ADDRESS_SIZE);
+
+ u8 const oui_bba[] = { 0x00, 0x09, 0xbf };
+ u8 const oui_ios[] = { 0x00, 0x17, 0xab };
+
+ switch (type)
+ {
+ case BBA:
+ memcpy(mac, oui_bba, 3);
+ break;
+ case IOS:
+ memcpy(mac, oui_ios, 3);
+ break;
+ }
+
+ srand((unsigned int)time(nullptr));
+
+ u8 id[3] =
+ {
+ (u8)rand(),
+ (u8)rand(),
+ (u8)rand()
+ };
+
+ memcpy(&mac[3], id, 3);
+}
+
+std::string MacAddressToString(const u8* mac)
+{
+ return StringFromFormat("%02x:%02x:%02x:%02x:%02x:%02x",
+ mac[0], mac[1], mac[2],
+ mac[3], mac[4], mac[5]);
+}
+
+bool StringToMacAddress(const std::string& mac_string, u8* mac)
+{
+ bool success = false;
+ if (!mac_string.empty())
+ {
+ int x = 0;
+ memset(mac, 0, MAC_ADDRESS_SIZE);
+
+ for (size_t i = 0; i < mac_string.size() && x < (MAC_ADDRESS_SIZE*2); ++i)
+ {
+ char c = tolower(mac_string.at(i));
+ if (c >= '0' && c <= '9')
+ {
+ mac[x / 2] |= (c - '0') << ((x & 1) ? 0 : 4); ++x;
+ }
+ else if (c >= 'a' && c <= 'f')
+ {
+ mac[x / 2] |= (c - 'a' + 10) << ((x & 1) ? 0 : 4); ++x;
+ }
+ }
+ success = x / 2 == MAC_ADDRESS_SIZE;
+ }
+ return success;
+}
diff --git a/Source/Core/Common/Network.h b/Source/Core/Common/Network.h
new file mode 100644
index 0000000000..38b379f2ac
--- /dev/null
+++ b/Source/Core/Common/Network.h
@@ -0,0 +1,24 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include
+
+#include "Common/CommonTypes.h"
+
+enum MACConsumer
+{
+ BBA = 0,
+ IOS = 1
+};
+
+enum
+{
+ MAC_ADDRESS_SIZE = 6
+};
+
+void GenerateMacAddress(const MACConsumer type, u8* mac);
+std::string MacAddressToString(const u8* mac);
+bool StringToMacAddress(const std::string& mac_string, u8* mac);
diff --git a/Source/Core/Core/HW/EXI_DeviceEthernet.cpp b/Source/Core/Core/HW/EXI_DeviceEthernet.cpp
index d80f2bb886..aa6342322e 100644
--- a/Source/Core/Core/HW/EXI_DeviceEthernet.cpp
+++ b/Source/Core/Core/HW/EXI_DeviceEthernet.cpp
@@ -2,8 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
-#include "Common/StringUtil.h"
-
+#include "Common/Network.h"
#include "Core/ConfigManager.h"
#include "Core/HW/EXI_Device.h"
#include "Core/HW/EXI_DeviceEthernet.h"
@@ -14,98 +13,30 @@
// being compiled for a little endian host.
-// TODO move this code into Common or something, for IOS to use
-
-enum MACConsumer
-{
- BBA,
- IOS
-};
-
-void GenerateMAC(MACConsumer type, u8 (&mac)[6])
-{
- memset(mac, 0, 6);
-
- u8 const oui_bba[] = { 0x00, 0x09, 0xbf };
- u8 const oui_ios[] = { 0x00, 0x17, 0xab };
-
- switch (type)
- {
- case BBA:
- memcpy(mac, oui_bba, 3);
- break;
- case IOS:
- memcpy(mac, oui_ios, 3);
- break;
- }
-
- srand((unsigned int)time(nullptr));
-
- u8 id[3] =
- {
- (u8)rand(),
- (u8)rand(),
- (u8)rand()
- };
-
- memcpy(&mac[3], id, 3);
-}
-
CEXIETHERNET::CEXIETHERNET()
{
tx_fifo = new u8[1518];
mBbaMem = new u8[BBA_MEM_SIZE];
- mRecvBuffer = new u8 [BBA_RECV_SIZE];
+ mRecvBuffer = new u8[BBA_RECV_SIZE];
mRecvBufferLength = 0;
MXHardReset();
// Parse MAC address from config, and generate a new one if it doesn't
// exist or can't be parsed.
+ std::string &mac_addr_setting = SConfig::GetInstance().m_bba_mac;
+ u8 mac_addr[MAC_ADDRESS_SIZE] = { 0 };
- auto &mac_addr_setting = SConfig::GetInstance().m_bba_mac;
- bool mac_addr_valid = false;
- u8 mac_addr[6] = { 0 };
-
- if (!mac_addr_setting.empty())
+ if (!StringToMacAddress(mac_addr_setting, mac_addr))
{
- int x = 0;
-
- for (size_t i = 0; i < mac_addr_setting.size() && x < 12; i++)
- {
- char c = mac_addr_setting.at(i);
- if (c >= '0' && c <= '9')
- {
- mac_addr[x / 2] |= (c - '0') << ((x & 1) ? 0 : 4); x++;
- }
- else if (c >= 'A' && c <= 'F')
- {
- mac_addr[x / 2] |= (c - 'A' + 10) << ((x & 1) ? 0 : 4); x++;
- }
- else if (c >= 'a' && c <= 'f')
- {
- mac_addr[x / 2] |= (c - 'a' + 10) << ((x & 1) ? 0 : 4); x++;
- }
- }
-
- if (x / 2 == 6)
- {
- memcpy(&mBbaMem[BBA_NAFR_PAR0], mac_addr, 6);
- mac_addr_valid = true;
- }
- }
-
- if (!mac_addr_valid)
- {
- GenerateMAC(BBA, mac_addr);
-
- mac_addr_setting = ArrayToString(mac_addr, 6, 10, false);
+ GenerateMacAddress(BBA, mac_addr);
+ mac_addr_setting = MacAddressToString(mac_addr);
SConfig::GetInstance().SaveSettings();
-
- memcpy(&mBbaMem[BBA_NAFR_PAR0], mac_addr, 6);
}
+ memcpy(&mBbaMem[BBA_NAFR_PAR0], mac_addr, MAC_ADDRESS_SIZE);
+
// HACK: .. fully established 100BASE-T link
mBbaMem[BBA_NWAYS] = NWAYS_LS100 | NWAYS_LPNWAY | NWAYS_100TXF | NWAYS_ANCLPT;
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.cpp
index 6a83a3e329..0eafb732b4 100644
--- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.cpp
+++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.cpp
@@ -10,6 +10,7 @@
#include "Common/CommonPaths.h"
#include "Common/FileUtil.h"
#include "Common/NandPaths.h"
+#include "Common/Network.h"
#include "Common/SettingsHandler.h"
#include "Common/StringUtil.h"
@@ -305,55 +306,28 @@ s32 CWII_IPC_HLE_Device_net_kd_request::NWC24MakeUserID(u64* nwc24_id, u32 holly
return WC24_OK;
}
-std::string MacAddressToString(u8* mac)
-{
- return StringFromFormat("%02" PRIx8 ":%02" PRIx8 ":%02" PRIx8 ":"
- "%02" PRIx8 ":%02" PRIx8 ":%02" PRIx8,
- mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
-}
-
void SaveMacAddress(u8* mac)
{
SConfig::GetInstance().m_WirelessMac = MacAddressToString(mac);
SConfig::GetInstance().SaveSettings();
}
-void GenerateMacAddress(u8* mac)
-{
- mac[0] = 0x00;
- mac[1] = 0x17;
- mac[2] = 0xAB;
- mac[3] = rand() & 0xFF;
- mac[4] = rand() & 0xFF;
- mac[5] = rand() & 0xFF;
-}
-
void GetMacAddress(u8* mac)
{
+ // Parse MAC address from config, and generate a new one if it doesn't
+ // exist or can't be parsed.
std::string wireless_mac = SConfig::GetInstance().m_WirelessMac;
- if (!wireless_mac.empty())
+ if (!StringToMacAddress(wireless_mac, mac))
{
- memset(mac, 0, 6);
- if ((sscanf(wireless_mac.c_str(),
- " %" SCNx8 ":%" SCNx8 ":%" SCNx8 ":%" SCNx8 ":%" SCNx8 ":%" SCNx8 " ",
- &mac[0], &mac[1], &mac[2], &mac[3], &mac[4], &mac[5]) != 6) &&
- (sscanf(wireless_mac.c_str(),
- " %" SCNx8 "-%" SCNx8 "-%" SCNx8 "-%" SCNx8 "-%" SCNx8 "-%" SCNx8 " ",
- &mac[0], &mac[1], &mac[2], &mac[3], &mac[4], &mac[5]) != 6))
+ GenerateMacAddress(IOS, mac);
+ SaveMacAddress(mac);
+ if (!wireless_mac.empty())
{
- // Unable to parse the MAC address, generate a new one instead.
- GenerateMacAddress(mac);
- SaveMacAddress(mac);
ERROR_LOG(WII_IPC_NET, "The MAC provided (%s) is invalid. We have "\
"generated another one for you.",
- wireless_mac.c_str());
+ MacAddressToString(mac).c_str());
}
}
- else
- {
- GenerateMacAddress(mac);
- SaveMacAddress(mac);
- }
INFO_LOG(WII_IPC_NET, "Using MAC address: %s", MacAddressToString(mac).c_str());
}
@@ -435,7 +409,7 @@ bool CWII_IPC_HLE_Device_net_ncd_manage::IOCtlV(u32 _CommandAddress)
case IOCTLV_NCD_GETWIRELESSMACADDRESS:
INFO_LOG(WII_IPC_NET, "NET_NCD_MANAGE: IOCTLV_NCD_GETWIRELESSMACADDRESS");
- u8 address[6];
+ u8 address[MAC_ADDRESS_SIZE];
GetMacAddress(address);
Memory::WriteBigEData(address,
CommandBuffer.PayloadBuffer.at(1).m_Address,
@@ -532,7 +506,7 @@ bool CWII_IPC_HLE_Device_net_wd_command::IOCtlV(u32 CommandAddress)
memcpy(info->country, "US", 2);
info->ntr_allowed_channels = Common::swap16(0xfffe);
- u8 address[6];
+ u8 address[MAC_ADDRESS_SIZE];
GetMacAddress(address);
memcpy(info->mac, address, sizeof(info->mac));
}
@@ -1238,7 +1212,7 @@ bool CWII_IPC_HLE_Device_net_ip_top::IOCtlV(u32 CommandAddress)
Memory::Write_U32(0, _BufferOut);
break;
case 0x1004: // mac address
- u8 address[6];
+ u8 address[MAC_ADDRESS_SIZE];
GetMacAddress(address);
Memory::WriteBigEData(address, _BufferOut, sizeof(address));
break;