projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-5.5'
[collectd.git]
/
src
/
libcollectdclient
/
network.c
diff --git
a/src/libcollectdclient/network.c
b/src/libcollectdclient/network.c
index
f76be5b
..
7b98497
100644
(file)
--- a/
src/libcollectdclient/network.c
+++ b/
src/libcollectdclient/network.c
@@
-89,6
+89,7
@@
static int server_close_socket (lcc_server_t *srv) /* {{{ */
return (0);
close (srv->fd);
return (0);
close (srv->fd);
+ srv->fd = -1;
free (srv->sa);
srv->sa = NULL;
srv->sa_len = 0;
free (srv->sa);
srv->sa = NULL;
srv->sa_len = 0;
@@
-107,12
+108,6
@@
static void int_server_destroy (lcc_server_t *srv) /* {{{ */
next = srv->next;
next = srv->next;
- if (srv->fd >= 0)
- {
- close (srv->fd);
- srv->fd = -1;
- }
-
free (srv->node);
free (srv->service);
free (srv->username);
free (srv->node);
free (srv->service);
free (srv->username);
@@
-457,8
+452,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,
-
interface, strlen (interface) + 1
);
+ status = setsockopt (srv->fd, SOL_SOCKET, SO_BINDTODEVICE,
interface,
+
(socklen_t) (strlen (interface) + 1)
);
if (status != 0)
return (-1);
#endif
if (status != 0)
return (-1);
#endif