From 9ea6ecccdb6c86c34eb20b16318e9690d8e2a7d3 Mon Sep 17 00:00:00 2001 From: Bryan Roe Date: Thu, 17 Jan 2019 15:42:58 -0800 Subject: [PATCH] Fixed duplicate MAC detection so that it skips 00:00:00:00:00:00, which is commonly used for loopback interfaces --- meshcore/agentcore.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meshcore/agentcore.c b/meshcore/agentcore.c index 2abc9a7..68d0f61 100644 --- a/meshcore/agentcore.c +++ b/meshcore/agentcore.c @@ -3184,7 +3184,10 @@ int MeshAgent_AgentMode(MeshAgentHostContainer *agentHost, int paramLen, char ** int i = 0; while (i < len) { - if (ILibString_IndexOf(mac, (int)macLen, curr + i, 19) >= 0) { break; } + if (strncmp(curr + i, "[00:00:00:00:00:00]", 19) != 0) + { + if (ILibString_IndexOf(mac, (int)macLen, curr + i, 19) >= 0) { break; } + } i += 19; } if (i >= len) { resetNodeId = 1; ILibSimpleDataStore_PutEx(agentHost->masterDb, "LocalMacAddresses", 17, mac, (int)macLen); }