LocalIP: use macros rather than manual free/close

Author: jannispl

src/common/netif/netif_bsd.c

@@ -84,7 +84,7 @@ bool ffNetifGetDefaultRouteImpl(char iface[IF_NAMESIZE + 1], uint32_t* ifIndex,
                 // Get the preferred source address
                 struct sockaddr_in* src = (struct sockaddr_in*)get_rt_address(rtm, RTA_IFA);
                 if (preferredSourceAddr && src && src->sin_family == AF_INET)
-                    *preferredSourceAddr = src->sin_addr;
+                    *preferredSourceAddr = src->sin_addr.s_addr;
 
                 return true;
             }
@@ -149,7 +149,7 @@ bool ffNetifGetDefaultRouteImpl(char iface[IF_NAMESIZE + 1], uint32_t* ifIndex,
                 // Get the preferred source address
                 struct sockaddr_in* src = (struct sockaddr_in*)get_rt_address(&rtmsg.hdr, RTA_IFA);
                 if (preferredSourceAddr && src && src->sin_family == AF_INET)
-                    *preferredSourceAddr = src->sin_addr;
+                    *preferredSourceAddr = src->sin_addr.s_addr;
 
                 return true;
             }

src/common/netif/netif_linux.c

@@ -1,5 +1,6 @@
 #include "netif.h"
 #include "common/io/io.h"
+#include "util/mallocHelper.h"
 
 #include <arpa/inet.h>
 #include <linux/rtnetlink.h>
@@ -26,7 +27,7 @@ struct Route4Entry {
 
 static bool getDefaultRouteIPv4(char iface[IF_NAMESIZE + 1], uint32_t* ifIndex, uint32_t* preferredSourceAddr)
 {
-    int sock_fd = socket(AF_NETLINK, SOCK_RAW | SOCK_CLOEXEC, NETLINK_ROUTE);
+    FF_AUTO_CLOSE_FD int sock_fd = socket(AF_NETLINK, SOCK_RAW | SOCK_CLOEXEC, NETLINK_ROUTE);
     if (sock_fd < 0)
         return false;
 
@@ -38,7 +39,6 @@ static bool getDefaultRouteIPv4(char iface[IF_NAMESIZE + 1], uint32_t* ifIndex,
     addr.nl_groups = 0;
 
     if (bind(sock_fd, (struct sockaddr*)&addr, sizeof(addr)) < 0) {
-        close(sock_fd);
         return false;
     }
 
@@ -78,7 +78,6 @@ static bool getDefaultRouteIPv4(char iface[IF_NAMESIZE + 1], uint32_t* ifIndex,
                           (struct sockaddr*)&dest_addr, sizeof(dest_addr));
 
     if (sent != sizeof(req)) {
-        close(sock_fd);
         return false;
     }
 
@@ -95,17 +94,14 @@ static bool getDefaultRouteIPv4(char iface[IF_NAMESIZE + 1], uint32_t* ifIndex,
 
     ssize_t peek_size = recvmsg(sock_fd, &msg, MSG_PEEK | MSG_TRUNC);
     if (peek_size < 0) {
-        close(sock_fd);
         return false;
     }
 
-    uint8_t *buffer = malloc((size_t)peek_size);
+    FF_AUTO_FREE uint8_t* buffer = malloc((size_t)peek_size);
 
     ssize_t received = recvfrom(sock_fd, buffer, (size_t)peek_size, 0,
                                 (struct sockaddr*)&src_addr, &src_addr_len);
 
-    close(sock_fd);
-
     struct Route4Entry best_gw;
     memset(&best_gw, 0, sizeof(best_gw));
 
@@ -160,8 +156,6 @@ static bool getDefaultRouteIPv4(char iface[IF_NAMESIZE + 1], uint32_t* ifIndex,
         }
     }
 
-    free(buffer);
-
     if (best_gw.gateway != 0) {
         if (ifIndex) {
             *ifIndex = best_gw.ifindex;