git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
consification
[exim.git]
/
src
/
src
/
os.c
diff --git
a/src/src/os.c
b/src/src/os.c
index 5ce56b5151a30b70349a89b1b01a673070726cb7..9a450a8656c98fe35df7206bc9e5bb7cbf855c8e 100644
(file)
--- a/
src/src/os.c
+++ b/
src/src/os.c
@@
-493,12
+493,13
@@
if (getifaddrs(&ifalist) != 0)
log_write(0, LOG_PANIC_DIE, "Unable to call getifaddrs: %d %s",
errno, strerror(errno));
log_write(0, LOG_PANIC_DIE, "Unable to call getifaddrs: %d %s",
errno, strerror(errno));
-struct ifaddrs *ifa;
-for (ifa = ifalist; ifa != NULL; ifa = ifa->ifa_next)
+for (struct ifaddrs * ifa = ifalist; ifa; ifa = ifa->ifa_next)
{
{
- if (ifa->ifa_addr->sa_family != AF_INET
+ struct sockaddr * ifa_addr = ifa->ifa_addr;
+ if (!ifa_addr) continue;
+ if (ifa_addr->sa_family != AF_INET
#if HAVE_IPV6
#if HAVE_IPV6
- && ifa
->ifa
_addr->sa_family != AF_INET6
+ && ifa_addr->sa_family != AF_INET6
#endif /* HAVE_IPV6 */
)
continue;
#endif /* HAVE_IPV6 */
)
continue;
@@
-509,12
+510,12
@@
for (ifa = ifalist; ifa != NULL; ifa = ifa->ifa_next)
/* Create a data block for the address, fill in the data, and put it on the
chain. */
/* Create a data block for the address, fill in the data, and put it on the
chain. */
- next = store_get(sizeof(ip_address_item));
+ next = store_get(sizeof(ip_address_item)
, FALSE
);
next->next = NULL;
next->port = 0;
next->next = NULL;
next->port = 0;
- (void)host_ntoa(-1, ifa
->ifa
_addr, next->address, NULL);
+ (void)host_ntoa(-1, ifa_addr, next->address, NULL);
- if (
yield == NULL
)
+ if (
!yield
)
yield = last = next;
else
{
yield = last = next;
else
{
@@
-617,7
+618,6
@@
int vs;
ip_address_item *yield = NULL;
ip_address_item *last = NULL;
ip_address_item *next;
ip_address_item *yield = NULL;
ip_address_item *last = NULL;
ip_address_item *next;
-char *cp;
char buf[MAX_INTERFACES*sizeof(struct V_ifreq)];
struct sockaddr *addrp;
size_t len = 0;
char buf[MAX_INTERFACES*sizeof(struct V_ifreq)];
struct sockaddr *addrp;
size_t len = 0;
@@
-683,7
+683,7
@@
buffer is not guaranteed to be aligned. Thus, we must first copy the basic
struct to some aligned memory before looking at the field in the fixed part to
find its length, and then recopy the correct length. */
struct to some aligned memory before looking at the field in the fixed part to
find its length, and then recopy the correct length. */
-for (cp = buf; cp < buf + ifc.V_ifc_len; cp += len)
+for (c
har * c
p = buf; cp < buf + ifc.V_ifc_len; cp += len)
{
memcpy(CS &ifreq, cp, sizeof(ifreq));
{
memcpy(CS &ifreq, cp, sizeof(ifreq));
@@
-745,7
+745,7
@@
for (cp = buf; cp < buf + ifc.V_ifc_len; cp += len)
/* Create a data block for the address, fill in the data, and put it on the
chain. */
/* Create a data block for the address, fill in the data, and put it on the
chain. */
- next = store_get(sizeof(ip_address_item));
+ next = store_get(sizeof(ip_address_item)
, FALSE
);
next->next = NULL;
next->port = 0;
(void)host_ntoa(-1, addrp, next->address, NULL);
next->next = NULL;
next->port = 0;
(void)host_ntoa(-1, addrp, next->address, NULL);
@@
-777,13
+777,13
@@
interfaces. We just return the loopback address(es). */
ip_address_item *
os_common_find_running_interfaces(void)
{
ip_address_item *
os_common_find_running_interfaces(void)
{
-ip_address_item *yield = store_get(sizeof(address_item));
+ip_address_item *yield = store_get(sizeof(address_item)
, FALSE
);
yield->address = US"127.0.0.1";
yield->port = 0;
yield->next = NULL;
#if HAVE_IPV6
yield->address = US"127.0.0.1";
yield->port = 0;
yield->next = NULL;
#if HAVE_IPV6
-yield->next = store_get(sizeof(address_item));
+yield->next = store_get(sizeof(address_item)
, FALSE
);
yield->next->address = US"::1";
yield->next->port = 0;
yield->next->next = NULL;
yield->next->address = US"::1";
yield->next->port = 0;
yield->next->next = NULL;
@@
-833,7
+833,7
@@
return type.
res_state
os_get_dns_resolver_res(void)
{
res_state
os_get_dns_resolver_res(void)
{
-
return &_res;
+return &_res;
}
#endif /* OS_GET_DNS_RESOLVER_RES */
}
#endif /* OS_GET_DNS_RESOLVER_RES */