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 #2771 from rubenk/stdbool
[collectd.git]
/
src
/
libcollectdclient
/
server.c
diff --git
a/src/libcollectdclient/server.c
b/src/libcollectdclient/server.c
index
68e4a9e
..
1095eba
100644
(file)
--- a/
src/libcollectdclient/server.c
+++ b/
src/libcollectdclient/server.c
@@
-23,9
+23,7
@@
* Florian octo Forster <octo at collectd.org>
**/
* Florian octo Forster <octo at collectd.org>
**/
-#if HAVE_CONFIG_H
#include "config.h"
#include "config.h"
-#endif
#if !defined(__GNUC__) || !__GNUC__
#define __attribute__(x) /**/
#if !defined(__GNUC__) || !__GNUC__
#define __attribute__(x) /**/
@@
-35,18
+33,22
@@
#include "collectd/network_parse.h" /* for lcc_network_parse_options_t */
#include "collectd/server.h"
#include "collectd/network_parse.h" /* for lcc_network_parse_options_t */
#include "collectd/server.h"
+// clang-format off
#include <errno.h>
#include <errno.h>
-#include <net/if.h>
-#include <netdb.h>
+#include <stdbool.h>
#include <string.h>
#include <string.h>
+#include <unistd.h>
#include <sys/socket.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/types.h>
-#include <unistd.h>
+#include <net/if.h>
+#include <netdb.h>
+#include <netinet/in.h>
+// clang-format on
#include <stdio.h>
#define DEBUG(...) printf(__VA_ARGS__)
#include <stdio.h>
#define DEBUG(...) printf(__VA_ARGS__)
-static
_B
ool is_multicast(struct addrinfo const *ai) {
+static
b
ool is_multicast(struct addrinfo const *ai) {
if (ai->ai_family == AF_INET) {
struct sockaddr_in *addr = (struct sockaddr_in *)ai->ai_addr;
return IN_MULTICAST(ntohl(addr->sin_addr.s_addr));
if (ai->ai_family == AF_INET) {
struct sockaddr_in *addr = (struct sockaddr_in *)ai->ai_addr;
return IN_MULTICAST(ntohl(addr->sin_addr.s_addr));
@@
-83,7
+85,7
@@
static int server_multicast_join(lcc_listener_t *srv,
};
#else
struct ip_mreq mreq = {
};
#else
struct ip_mreq mreq = {
- .imr_
address.s_addr = INADDR_ANY, .imr_multiaddr.s_addr = sa->
s_addr,
+ .imr_
multiaddr.s_addr = sa->sin_addr.
s_addr,
};
#endif
status = setsockopt(srv->conn, IPPROTO_IP, IP_ADD_MEMBERSHIP, &mreq,
};
#endif
status = setsockopt(srv->conn, IPPROTO_IP, IP_ADD_MEMBERSHIP, &mreq,
@@
-108,7
+110,7
@@
static int server_multicast_join(lcc_listener_t *srv,
};
memmove(&mreq6.ipv6mr_multiaddr, &sa->sin6_addr, sizeof(struct in6_addr));
};
memmove(&mreq6.ipv6mr_multiaddr, &sa->sin6_addr, sizeof(struct in6_addr));
- status = setsockopt(srv->conn, IPPROTO_IPV6, IPV6_
ADD_MEMBERSHI
P, &mreq6,
+ status = setsockopt(srv->conn, IPPROTO_IPV6, IPV6_
JOIN_GROU
P, &mreq6,
sizeof(mreq6));
if (status == -1)
return errno;
sizeof(mreq6));
if (status == -1)
return errno;
@@
-176,7
+178,7
@@
static int server_open(lcc_listener_t *srv) {
}
int lcc_listen_and_write(lcc_listener_t srv) {
}
int lcc_listen_and_write(lcc_listener_t srv) {
-
_B
ool close_socket = 0;
+
b
ool close_socket = 0;
if (srv.conn < 0) {
int status = server_open(&srv);
if (srv.conn < 0) {
int status = server_open(&srv);
@@
-186,8
+188,7
@@
int lcc_listen_and_write(lcc_listener_t srv) {
}
if (srv.buffer_size == 0)
}
if (srv.buffer_size == 0)
- /* TODO(octo): this should be a define. */
- srv.buffer_size = 1452;
+ srv.buffer_size = LCC_NETWORK_BUFFER_SIZE;
if (srv.parser == NULL)
srv.parser = lcc_network_parse;
if (srv.parser == NULL)
srv.parser = lcc_network_parse;
@@
-203,12
+204,7
@@
int lcc_listen_and_write(lcc_listener_t srv) {
break;
}
break;
}
- (void)srv.parser(buffer, (size_t)len,
- (lcc_network_parse_options_t){
- .writer = srv.writer,
- .password_lookup = srv.password_lookup,
- .security_level = srv.security_level,
- });
+ (void)srv.parser(buffer, (size_t)len, srv.parse_options);
}
if (close_socket) {
}
if (close_socket) {