morgan/UxPlay
1
0
Fork 0
mirror of https://github.com/morgan9e/UxPlay synced 2026-04-14 00:04:13 +09:00
Code Issues Packages Projects Releases Wiki Activity

clean up random_mac()

Browse Source
This commit is contained in:
F. Duncanh
2025-09-14 10:54:24 -04:00
parent e5d8a02952
commit ae52b2bd3a
1 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
uxplay.cpp
View File

@@ -63,6 +63,7 @@
#include "lib/stream.h" #include "lib/stream.h"
#include "lib/logger.h" #include "lib/logger.h"
#include "lib/dnssd.h" #include "lib/dnssd.h"
#include "lib/crypto.h"
#include "renderers/video_renderer.h" #include "renderers/video_renderer.h"
#include "renderers/audio_renderer.h" #include "renderers/audio_renderer.h"
#ifdef DBUS #ifdef DBUS
@@ -784,10 +785,6 @@ static std::string find_mac () {
return mac; return mac;
} }
#define MULTICAST 0
#define LOCAL 1
#define OCTETS 6
static bool validate_mac(char * mac_address) { static bool validate_mac(char * mac_address) {
char c; char c;
if (strlen(mac_address) != 17) return false; if (strlen(mac_address) != 17) return false;
@@ -806,16 +803,16 @@ static bool validate_mac(char * mac_address) {
} }
static std::string random_mac () { static std::string random_mac () {
char str[3]; char str[4];
int octet = rand() % 64; unsigned char random[6];
octet = (octet << 1) + LOCAL; get_random_bytes(random, sizeof(random));
octet = (octet << 1) + MULTICAST; /* mark MAC address as locally administered, i.e. random */
snprintf(str,3,"%02x",octet); random[0] = random[0] & ~0x01;
random[0] = random[0] | 0x02;
snprintf(str,3,"%2.2x", random[0]);
std::string mac_address(str); std::string mac_address(str);
for (int i = 1; i < OCTETS; i++) { for (int i = 1; i < 6; i++) {
mac_address = mac_address + ":"; snprintf(str,4,":%2.2x", random[i]);
octet = rand() % 256;
snprintf(str,3,"%02x",octet);
mac_address = mac_address + str; mac_address = mac_address + str;
} }
return mac_address; return mac_address;
@@ -2806,7 +2803,6 @@ int main (int argc, char *argv[]) {
} }
} }
if (mac_address.empty()) { if (mac_address.empty()) {
srand(time(NULL) * getpid());
mac_address = random_mac(); mac_address = random_mac();
LOGI("using randomly-generated MAC address %s",mac_address.c_str()); LOGI("using randomly-generated MAC address %s",mac_address.c_str());
} }