projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #3202 from mrunge/collectd-5.9
[collectd.git]
/
src
/
libcollectdclient
/
network.c
diff --git
a/src/libcollectdclient/network.c
b/src/libcollectdclient/network.c
index
49257d4
..
2d6b3ed
100644
(file)
--- a/
src/libcollectdclient/network.c
+++ b/
src/libcollectdclient/network.c
@@
-47,6
+47,10
@@
#include <net/if.h>
#endif
#include <net/if.h>
#endif
+#ifdef WIN32
+#define AI_ADDRCONFIG 0
+#endif
+
#include "collectd/network.h"
#include "collectd/network_buffer.h"
#include "collectd/network.h"
#include "collectd/network_buffer.h"
@@
-364,15
+368,15
@@
int lcc_server_set_ttl(lcc_server_t *srv, uint8_t ttl) /* {{{ */
return 0;
} /* }}} int lcc_server_set_ttl */
return 0;
} /* }}} int lcc_server_set_ttl */
-int lcc_server_set_interface(lcc_server_t *srv, char const *i
nter
face) /* {{{ */
+int lcc_server_set_interface(lcc_server_t *srv, char const *iface) /* {{{ */
{
unsigned int if_index;
int status;
{
unsigned int if_index;
int status;
- if ((srv == NULL) || (i
nter
face == NULL))
+ if ((srv == NULL) || (iface == NULL))
return EINVAL;
return EINVAL;
- if_index = if_nametoindex(i
nter
face);
+ if_index = if_nametoindex(iface);
if (if_index == 0)
return ENOENT;
if (if_index == 0)
return ENOENT;
@@
-420,8
+424,8
@@
int lcc_server_set_interface(lcc_server_t *srv, char const *interface) /* {{{ */
/* else: Not a multicast interface. */
#if defined(SO_BINDTODEVICE)
/* else: Not a multicast interface. */
#if defined(SO_BINDTODEVICE)
- status = setsockopt(srv->fd, SOL_SOCKET, SO_BINDTODEVICE, i
nter
face,
- (socklen_t)(strlen(i
nter
face) + 1));
+ status = setsockopt(srv->fd, SOL_SOCKET, SO_BINDTODEVICE, iface,
+ (socklen_t)(strlen(iface) + 1));
if (status != 0)
return -1;
#endif
if (status != 0)
return -1;
#endif