thirdparty/ppsspp
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Forward Declaration of OnRandomMACAddress added.

Browse source 
Added function to create random MAC

...added headers needed for CreateRandMAC

Defined function to create a random MAC

Added in option to randomize MAC address

Changed uint_16 to u16 from CommonTypes.h

Fixed case sensitivity. Woo!

QT -= gui caused <QTGui/QImage> to not be found

undo unnecessary change

undo the undo

removed random option, fixed spacing

removed forward declaration

Changed default mac to random one

Added in several STL includes: iostream, sstream.
CreateRandMAC is now only used for initial runs, no more random option.

Removed unneeded headers

Moved ctime and cstdlib to the cpp file

Added in random MAC function call

Update Config.cpp

Revert "undo the undo"

This reverts commit e21852961806727230dca31ceb5193ee2f298c7b.
This commit is contained in:
GreenBagels 2014-06-19 15:38:54 -04:00 • committed by greenbagels
parent 9d73a3b751
commit c4ced7a835
2 changed files with 20 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Core/Config.cpp
View file

@ -15,6 +15,9 @@
// Official git repository and contact information can be found at
// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
#include <cstdlib>
#include <ctime>
#include "base/display.h"
#include "base/NativeApp.h"
#include "ext/vjson/json.h"
@ -530,7 +533,7 @@ static ConfigSetting systemParamSettings[] = {
ReportedConfigSetting("PSPFirmwareVersion", &g_Config.iFirmwareVersion, PSP_DEFAULT_FIRMWARE),
ConfigSetting("NickName", &g_Config.sNickName, "PPSSPP"),
ConfigSetting("proAdhocServer", &g_Config.proAdhocServer, "localhost"),
ConfigSetting("MacAddress", &g_Config.localMacAddress, "01:02:03:04:05:06"),
ConfigSetting("MacAddress", &g_Config.localMacAddress, g_Config.CreateRandMAC().c_str()),
ReportedConfigSetting("Language", &g_Config.iLanguage, &DefaultSystemParamLanguage),
ConfigSetting("TimeFormat", &g_Config.iTimeFormat, PSP_SYSTEMPARAM_TIME_FORMAT_24HR),
ConfigSetting("DateFormat", &g_Config.iDateFormat, PSP_SYSTEMPARAM_DATE_FORMAT_YYYYMMDD),
@ -997,3 +1000,16 @@ void Config::GetReportingInfo(UrlEncoder &data) {
}
}
}
std::string Config::CreateRandMAC() {
std::stringstream randStream;
srand(time(0));
for(int i = 0; i < 6; i++) {
randStream << std::hex << (rand() % 256); //generates each octet for the mac in hex format
if (i<5) {
randStream << ':'; //we need a : between every octet
}
}
return randStream.str(); //no need for creating a new string, just return this
}

2
Core/Config.h
View file

@ -337,6 +337,8 @@ public:
void GetReportingInfo(UrlEncoder &data);
std::string CreateRandMAC(); // Uses <cstdlib>'s rand() PRNG to create a pseudorandom MAC address
private:
std::string iniFilename_;
std::string controllerIniFilename_;