]> tinc-vpn.org Git - tinc/commitdiff
fix build failures
authorRui Chen <rui@chenrui.dev>
Sun, 15 Sep 2024 21:03:59 +0000 (17:03 -0400)
committerGuus Sliepen <guus@tinc-vpn.org>
Tue, 31 Mar 2026 08:55:51 +0000 (10:55 +0200)
seeing some build failure while building for macos sequoia, the error is below:

```
  net_socket.c:105:14: error: no member named 'ifr_ifrn' in 'struct ifreq'
    105 |         strncpy(ifr.ifr_ifrn.ifrn_name, iface, IFNAMSIZ);
        |                 ~~~ ^
  /Library/Developer/CommandLineTools/SDKs/MacOSX15.sdk/usr/include/secure/_string.h:128:28: note: expanded from macro 'strncpy'
    128 |                 __builtin___strncpy_chk (dest, __VA_ARGS__, __darwin_obsz (dest))
        |                                          ^~~~
  net_socket.c:105:14: error: no member named 'ifr_ifrn' in 'struct ifreq'
    105 |         strncpy(ifr.ifr_ifrn.ifrn_name, iface, IFNAMSIZ);
        |                 ~~~ ^
  /Library/Developer/CommandLineTools/SDKs/MacOSX15.sdk/usr/include/secure/_string.h:128:62: note: expanded from macro 'strncpy'
    128 |                 __builtin___strncpy_chk (dest, __VA_ARGS__, __darwin_obsz (dest))
        |                                                                            ^~~~
  /Library/Developer/CommandLineTools/SDKs/MacOSX15.sdk/usr/include/secure/_common.h:41:54: note: expanded from macro '__darwin_obsz'
     41 | #define __darwin_obsz(object) __builtin_object_size (object, _USE_FORTIFY_LEVEL > 1 ? 1 : 0)
        |                                                      ^~~~~~
```

full build log, https://github.com/Homebrew/homebrew-core/actions/runs/10837004674/job/30072048690

Signed-off-by: Rui Chen <rui@chenrui.dev>
src/raw_socket_device.c

index 45676a1e39c5ed58c9a5d4f7b1bd0de286595a2e..fb54557b94664b2fdd11735170d6820be4aa11c5 100644 (file)
@@ -57,8 +57,8 @@ static bool setup_device(void) {
        fcntl(device_fd, F_SETFD, FD_CLOEXEC);
 #endif
 
-       strncpy(ifr.ifr_ifrn.ifrn_name, iface, IFNAMSIZ);
-       ifr.ifr_ifrn.ifrn_name[IFNAMSIZ - 1] = 0;
+       strncpy(ifr.ifr_name, iface, IFNAMSIZ);
+       ifr.ifr_name[IFNAMSIZ - 1] = 0;
 
        if(ioctl(device_fd, SIOCGIFINDEX, &ifr)) {
                close(device_fd);