Github
/
FTL
mirror of
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Condition 'hwaddr!=NULL' is always true and reduce amount of allocated memory for synthesized MAC addresses from 324 to 18 bytes 

Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER 2023-12-07 22:46:47 +01:00
parent a455a40d01
commit 835fcde327
No known key found for this signature in database
GPG Key ID: 00135ACBD90B28DD
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/database/gravity-db.c
View File

@ -398,7 +398,7 @@ static bool get_client_groupids(clientsData* client)
{
log_debug(DEBUG_CLIENTS, "--> No result.");
}
else if(hwaddr != NULL && strlen(hwaddr) > 3 && strncasecmp(hwaddr, "ip-", 3) == 0)
else if(strlen(hwaddr) > 3 && strncasecmp(hwaddr, "ip-", 3) == 0)
{
free(hwaddr);
hwaddr = NULL;
@ -406,7 +406,7 @@ static bool get_client_groupids(clientsData* client)
log_debug(DEBUG_CLIENTS, "Skipping mock-device hardware address lookup");
}
// Set MAC address from database information if available and the MAC address is not already set
else if(hwaddr != NULL && client->hwlen != 6)
else if(client->hwlen != 6)
{
// Proper MAC parsing
unsigned char data[6];
@ -425,9 +425,8 @@ static bool get_client_groupids(clientsData* client)
// MAC address fallback: Try to synthesize MAC address from internal buffer
if(hwaddr == NULL && client->hwlen == 6)
{
const size_t strlen = sizeof("AA:BB:CC:DD:EE:FF");
hwaddr = calloc(18, strlen);
snprintf(hwaddr, strlen, "%02X:%02X:%02X:%02X:%02X:%02X",
hwaddr = calloc(18, sizeof(char)); // 18 == sizeof("AA:BB:CC:DD:EE:FF")
snprintf(hwaddr, 18, "%02X:%02X:%02X:%02X:%02X:%02X",
client->hwaddr[0], client->hwaddr[1], client->hwaddr[2],
client->hwaddr[3], client->hwaddr[4], client->hwaddr[5]);