projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
src/Makefile: Don't set subdir-objects.
[collectd.git]
/
src
/
network.c
diff --git
a/src/network.c
b/src/network.c
index
6be4ed5
..
bf1f2ab
100644
(file)
--- a/
src/network.c
+++ b/
src/network.c
@@
-934,7
+934,7
@@
static int parse_part_string (void **ret_buffer, size_t *ret_buffer_len,
uint16_t pkg_length;
size_t payload_size;
uint16_t pkg_length;
size_t payload_size;
- if (output_len
<
= 0)
+ if (output_len
=
= 0)
return (EINVAL);
if (buffer_len < header_size)
return (EINVAL);
if (buffer_len < header_size)
@@
-1369,7
+1369,7
@@
static int parse_part_encr_aes256 (sockent_t *se, /* {{{ */
warning_has_been_printed = 1;
}
warning_has_been_printed = 1;
}
- *ret_buffer
+= ph_length
;
+ *ret_buffer
= (void *) (((char *) *ret_buffer) + ph_length)
;
*ret_buffer_size -= ph_length;
return (0);
*ret_buffer_size -= ph_length;
return (0);
@@
-1408,7
+1408,7
@@
static int parse_packet (sockent_t *se, /* {{{ */
(void *) buffer,
sizeof (pkg_type));
memcpy ((void *) &pkg_length,
(void *) buffer,
sizeof (pkg_type));
memcpy ((void *) &pkg_length,
- (void *) (
buffer
+ sizeof (pkg_type)),
+ (void *) (
((char *) buffer)
+ sizeof (pkg_type)),
sizeof (pkg_length));
pkg_length = ntohs (pkg_length);
sizeof (pkg_length));
pkg_length = ntohs (pkg_length);
@@
-2311,7
+2311,7
@@
static int sockent_server_listen (sockent_t *se) /* {{{ */
freeaddrinfo (ai_list);
freeaddrinfo (ai_list);
- if (se->data.server.fd_num
<
= 0)
+ if (se->data.server.fd_num
=
= 0)
return (-1);
return (0);
} /* }}} int sockent_server_listen */
return (-1);
return (0);
} /* }}} int sockent_server_listen */
@@
-2501,7
+2501,7
@@
static int network_receive (void) /* {{{ */
break;
}
break;
}
- ent->data = malloc (
*ent->data
);
+ ent->data = malloc (
network_config_packet_size
);
if (ent->data == NULL)
{
sfree (ent);
if (ent->data == NULL)
{
sfree (ent);