diff --git a/src/olsrd.c b/src/olsrd.c
index 3336634a5f6d0c983809f48fa88b4af32cdf9a35..899ad3e8f2ef4e565cb782c4290f8cfbf08f39cf 100644 (file)
--- a/src/olsrd.c
+++ b/src/olsrd.c
@@ -150,20 +150,18 @@ static size_t strtabsplit (char *string, char **fields, size_t size) /* {{{ */
static FILE *olsrd_connect (void) /* {{{ */
{
- struct addrinfo ai_hints = { 0 };
- struct addrinfo *ai_list, *ai_ptr;
+ struct addrinfo *ai_list;
int ai_return;
FILE *fh;
-#ifdef AI_ADDRCONFIG
- ai_hints.ai_flags |= AI_ADDRCONFIG;
-#endif
- ai_hints.ai_family = PF_UNSPEC;
- ai_hints.ai_socktype = SOCK_STREAM;
- ai_hints.ai_protocol = IPPROTO_TCP;
+ struct addrinfo ai_hints = {
+ .ai_family = AF_UNSPEC,
+ .ai_flags = AI_ADDRCONFIG,
+ .ai_protocol = IPPROTO_TCP,
+ .ai_socktype = SOCK_STREAM
+ };
- ai_list = NULL;
ai_return = getaddrinfo (olsrd_get_node (), olsrd_get_service (),
&ai_hints, &ai_list);
if (ai_return != 0)
}
fh = NULL;
- for (ai_ptr = ai_list; ai_ptr != NULL; ai_ptr = ai_ptr->ai_next)
+ for (struct addrinfo *ai_ptr = ai_list; ai_ptr != NULL; ai_ptr = ai_ptr->ai_next)
{
int fd;
int status;