Merge branch 'develop' of http://139.9.88.116:3000/r/module/open-license-ma...

nancy.liao

2025-05-29 8d405b265285c368df2e9cf1c14acee7532e0ee7

 src/library/os/linux/network.cpp

@@ -49,7 +49,7 @@
   FUNCTION_RETURN f_return = FUNC_RET_OK;
   struct ifaddrs *ifaddr, *ifa;
   int family, n = 0;
   unsigned int if_num, if_max;
   unsigned int if_num;

   if (getifaddrs(&ifaddr) == -1) {
      LOG_WARN("getifaddrs failed == -1");
@@ -67,7 +67,7 @@
      if (adapterByName.find(if_name) == adapterByName.end()) {
         OsAdapterInfo newAdapter;
         memset(&newAdapter, 0, sizeof(OsAdapterInfo));
         strncpy(&newAdapter.description[0], ifa->ifa_name, LCC_ADAPTER_DESCRIPTION_LEN);
         mstrlcpy(&newAdapter.description[0], ifa->ifa_name, LCC_ADAPTER_DESCRIPTION_LEN);
         adapterByName[if_name] = newAdapter;
      }
      auto it = adapterByName.find(if_name);
@@ -75,12 +75,10 @@
      family = ifa->ifa_addr->sa_family;
      /* Display interface name and family (including symbolic
       form of the latter for the common families) */
#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" : "???",
            family);
#endif
      LOG_DEBUG("%-8s %s (%d)\n", ifa->ifa_name,
              (family == AF_PACKET) ? "AF_PACKET"
                              : (family == AF_INET) ? "AF_INET" : (family == AF_INET6) ? "AF_INET6" : "???",
              family);
      /* For an AF_INET* interface address, display the address
       * || family == AF_INET6*/
      if (family == AF_INET) {
@@ -96,13 +94,9 @@
         int i;
         for (i = 0; i < 6; i++) {
            currentAdapter->mac_address[i] = s1->sll_addr[i];
#ifndef NDEBUG
            printf("%02x:", s1->sll_addr[i]);
#endif
            LOG_DEBUG("%02x:", s1->sll_addr[i]);
         }
#ifndef NDEBUG
         printf("\t %s\n", ifa->ifa_name);
#endif
         LOG_DEBUG("\t %s\n", ifa->ifa_name);
      }
   }
   freeifaddrs(ifaddr);