Overview
| Comment: | OFSystemInfo: Include scope for fe80::/10 IPv6s |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
1157d52bc02b9d3fc620a1fd3b428d15 |
| User & Date: | js on 2023-07-22 08:09:49 |
| Other Links: | manifest | tags |
Context
|
2023-07-22
| ||
| 08:26 | +[OFSystemInfo networkInterfaces]: ATalk on Linux check-in: e6dffebc47 user: js tags: trunk | |
| 08:09 | OFSystemInfo: Include scope for fe80::/10 IPv6s check-in: 1157d52bc0 user: js tags: trunk | |
|
2023-07-19
| ||
| 21:36 | configure: Add --disable-werror check-in: 99fb17e49b user: js tags: trunk | |
Changes
Modified src/platform/POSIX/OFSystemInfo+NetworkInterfaces.m from [5833caf501] to [99256ec9a8].
| ︙ | ︙ | |||
145 146 147 148 149 150 151 152 153 154 155 156 157 158 | [interface setObject: addresses forKey: key]; } memset(&address, 0, sizeof(address)); address.family = addressFamily; memcpy(&address.sockaddr.in, ¤t->ifr_addr, sockaddrSize); [addresses addItem: &address]; next: # ifdef _SIZEOF_ADDR_IFREQ buffer += _SIZEOF_ADDR_IFREQ(*current); # else | > > > > > > > > > > | 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 | [interface setObject: addresses forKey: key]; } memset(&address, 0, sizeof(address)); address.family = addressFamily; memcpy(&address.sockaddr.in, ¤t->ifr_addr, sockaddrSize); # if defined(OF_HAVE_IPV6) && defined(HAVE_IF_NAMETOINDEX) if (address.sockaddr.in6.sin6_family == AF_INET6 && address.sockaddr.in6.sin6_addr.s6_addr[0] == 0xFE && (address.sockaddr.in6.sin6_addr.s6_addr[1] & 0xC0) == 0x80) address.sockaddr.in6.sin6_scope_id = if_nametoindex( [name cStringWithEncoding: encoding]); # endif [addresses addItem: &address]; next: # ifdef _SIZEOF_ADDR_IFREQ buffer += _SIZEOF_ADDR_IFREQ(*current); # else |
| ︙ | ︙ | |||
185 186 187 188 189 190 191 192 193 194 195 196 197 198 |
}
#ifdef OF_HAVE_IPV6
static bool
queryNetworkInterfaceIPv6Addresses(OFMutableDictionary *ret)
{
# if defined(OF_LINUX) && defined(OF_HAVE_FILES)
OFFile *file;
OFString *line;
OFMutableDictionary *interface;
OFEnumerator *enumerator;
@try {
file = [OFFile fileWithPath: @"/proc/net/if_inet6" mode: @"r"];
| > > > | 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 |
}
#ifdef OF_HAVE_IPV6
static bool
queryNetworkInterfaceIPv6Addresses(OFMutableDictionary *ret)
{
# if defined(OF_LINUX) && defined(OF_HAVE_FILES)
# ifdef HAVE_IF_NAMETOINDEX
OFStringEncoding encoding = [OFLocale encoding];
# endif
OFFile *file;
OFString *line;
OFMutableDictionary *interface;
OFEnumerator *enumerator;
@try {
file = [OFFile fileWithPath: @"/proc/net/if_inet6" mode: @"r"];
|
| ︙ | ︙ | |||
220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 |
if ((interface = [ret objectForKey: name]) == nil) {
interface = [OFMutableDictionary dictionary];
[ret setObject: interface forKey: name];
}
memset(&address, 0, sizeof(address));
address.family = OFSocketAddressFamilyIPv6;
for (size_t i = 0; i < 32; i += 2) {
unsigned long long byte;
@try {
byte = [[addressString
substringWithRange: OFMakeRange(i, 2)]
unsignedLongLongValueWithBase: 16];
} @catch (OFInvalidFormatException *e) {
goto next_line;
}
if (byte > 0xFF)
goto next_line;
address.sockaddr.in6.sin6_addr.s6_addr[i / 2] =
(unsigned char)byte;
}
if ((addresses = [interface
objectForKey: OFNetworkInterfaceIPv6Addresses]) == nil) {
addresses = [OFMutableData
dataWithItemSize: sizeof(OFSocketAddress)];
[interface setObject: addresses
forKey: OFNetworkInterfaceIPv6Addresses];
| > > > > > > > > | 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 |
if ((interface = [ret objectForKey: name]) == nil) {
interface = [OFMutableDictionary dictionary];
[ret setObject: interface forKey: name];
}
memset(&address, 0, sizeof(address));
address.family = OFSocketAddressFamilyIPv6;
address.sockaddr.in6.sin6_family = AF_INET6;
for (size_t i = 0; i < 32; i += 2) {
unsigned long long byte;
@try {
byte = [[addressString
substringWithRange: OFMakeRange(i, 2)]
unsignedLongLongValueWithBase: 16];
} @catch (OFInvalidFormatException *e) {
goto next_line;
}
if (byte > 0xFF)
goto next_line;
address.sockaddr.in6.sin6_addr.s6_addr[i / 2] =
(unsigned char)byte;
}
# ifdef HAVE_IF_NAMETOINDEX
if (address.sockaddr.in6.sin6_addr.s6_addr[0] == 0xFE &&
(address.sockaddr.in6.sin6_addr.s6_addr[1] & 0xC0) == 0x80)
address.sockaddr.in6.sin6_scope_id = if_nametoindex(
[name cStringWithEncoding: encoding]);
# endif
if ((addresses = [interface
objectForKey: OFNetworkInterfaceIPv6Addresses]) == nil) {
addresses = [OFMutableData
dataWithItemSize: sizeof(OFSocketAddress)];
[interface setObject: addresses
forKey: OFNetworkInterfaceIPv6Addresses];
|
| ︙ | ︙ |