1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
|
--- base/networking.c 2021-02-01 10:20:11.000000000 -0500
+++ base/networking.c 2021-02-18 12:05:06.746722000 -0500
@@ -30,18 +30,15 @@
#include <errno.h> /* for errno, EAFNOSUPPORT */
#include <glib/gstdio.h>
#include <ifaddrs.h> /* for ifaddrs, freeifaddrs, getifaddrs */
+#include <sys/types.h>
#include <net/if.h> /* for IFNAMSIZ */
+#include <netinet/in.h>
#include <stdint.h> /* for uint32_t, uint8_t */
#include <stdlib.h> /* for atoi, strtol */
#include <string.h> /* for memcpy, bzero, strchr, strlen, strcmp, strncpy */
#include <sys/socket.h> /* for AF_INET, AF_INET6, AF_UNSPEC, sockaddr_storage */
#include <unistd.h> /* for close */
-#ifdef __FreeBSD__
-#include <netinet/in.h>
-#define s6_addr32 __u6_addr.__u6_addr32
-#endif
-
#undef G_LOG_DOMAIN
/**
* @brief GLib log domain.
@@ -51,13 +48,13 @@
/* Global variables */
/* Source interface name eg. eth1. */
-char global_source_iface[IFNAMSIZ] = {'\0'};
+char global_source_iface[IFNAMSIZ];
/* Source IPv4 address. */
-struct in_addr global_source_addr = {.s_addr = 0};
+struct in_addr global_source_addr;
/* Source IPv6 address. */
-struct in6_addr global_source_addr6 = {.s6_addr32 = {0, 0, 0, 0}};
+struct in6_addr global_source_addr6;
/* Source Interface/Address related functions. */
@@ -250,10 +247,19 @@
if (ip4 == NULL || ip6 == NULL)
return;
- ip6->s6_addr32[0] = 0;
- ip6->s6_addr32[1] = 0;
- ip6->s6_addr32[2] = htonl (0xffff);
- memcpy (&ip6->s6_addr32[3], ip4, sizeof (struct in_addr));
+ ip6->s6_addr[0] = 0;
+ ip6->s6_addr[1] = 0;
+ ip6->s6_addr[2] = 0;
+ ip6->s6_addr[3] = 0;
+ ip6->s6_addr[4] = 0;
+ ip6->s6_addr[5] = 0;
+ ip6->s6_addr[6] = 0;
+ ip6->s6_addr[7] = 0;
+ ip6->s6_addr[8] = 0;
+ ip6->s6_addr[9] = 0;
+ ip6->s6_addr[10] = 0xff;
+ ip6->s6_addr[11] = 0xff;
+ memcpy (&ip6->s6_addr[12], ip4, sizeof (struct in_addr));
}
/**
@@ -268,7 +274,7 @@
if (!addr6)
return;
if (IN6_IS_ADDR_V4MAPPED (addr6))
- inet_ntop (AF_INET, &addr6->s6_addr32[3], str, INET6_ADDRSTRLEN);
+ inet_ntop (AF_INET, &addr6->s6_addr[12], str, INET6_ADDRSTRLEN);
else
inet_ntop (AF_INET6, addr6, str, INET6_ADDRSTRLEN);
}
@@ -814,11 +820,11 @@
if (IN6_IS_ADDR_V4MAPPED (&addr6))
{
/* addr is 0.0.0.0 */
- if (addr6_p->s6_addr32[3] == 0)
+ if (addr6_p->s6_addr[12] == 0)
return 1;
/* addr starts with 127.0.0.1 */
- if ((addr6_p->s6_addr32[3] & htonl (0xFF000000))
+ if ((addr6_p->s6_addr[12] & htonl (0xFF000000))
== htonl (0x7F000000))
return 1;
}
|
