Pc identifier Mac address issues #108 & #107

gcontini

2020-10-31 85d97f05f6f8e4c1d73cd2bb096806839d16f3b0

 src/library/os/linux/network.cpp

@@ -28,7 +28,7 @@
#include <string.h>
#include <memory.h>

#include "../../base/StringUtils.h"
#include "../../base/string_utils.h"
#include "../../base/logger.h"
#include "../network.hpp"

@@ -60,15 +60,14 @@
      if (ifa->ifa_addr == NULL || (ifa->ifa_flags & IFF_LOOPBACK) != 0) {
         continue;
      }
      string if_name(ifa->ifa_name, mstrnlen_s(ifa->ifa_name, NI_MAXHOST));
      string if_name(ifa->ifa_name, mstrnlen_s(ifa->ifa_name, LCC_ADAPTER_DESCRIPTION_LEN));
      // if_name_position = ifname_position(ifnames, ifa->ifa_name, if_num);
      // interface name not seen en advance
      OsAdapterInfo *currentAdapter;
      // FIXME not working
      if (adapterByName.find(if_name) == adapterByName.end()) {
         OsAdapterInfo newAdapter;
         memset(&newAdapter, 0, sizeof(OsAdapterInfo));
         strncpy(&newAdapter.description[0], ifa->ifa_name, NI_MAXHOST);
         strncpy(&newAdapter.description[0], ifa->ifa_name, LCC_ADAPTER_DESCRIPTION_LEN);
         adapterByName[if_name] = newAdapter;
      }
      auto it = adapterByName.find(if_name);
@@ -76,7 +75,7 @@
      family = ifa->ifa_addr->sa_family;
      /* Display interface name and family (including symbolic
       form of the latter for the common families) */
#ifdef _DEBUG
#ifndef NDEBUG
      printf("%-8s %s (%d)\n", ifa->ifa_name,
            (family == AF_PACKET) ? "AF_PACKET"
                            : (family == AF_INET) ? "AF_INET" : (family == AF_INET6) ? "AF_INET6" : "???",
@@ -97,11 +96,11 @@
         int i;
         for (i = 0; i < 6; i++) {
            currentAdapter->mac_address[i] = s1->sll_addr[i];
#ifdef _DEBUG
#ifndef NDEBUG
            printf("%02x:", s1->sll_addr[i]);
#endif
         }
#ifdef _DEBUG
#ifndef NDEBUG
         printf("\t %s\n", ifa->ifa_name);
#endif
      }