projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bumped version to 3.11.7; Updated ChangeLog.
[collectd.git]
/
src
/
ntpd.c
diff --git
a/src/ntpd.c
b/src/ntpd.c
index
d65d1ed
..
08c0c9f
100644
(file)
--- a/
src/ntpd.c
+++ b/
src/ntpd.c
@@
-631,6
+631,14
@@
static int ntpd_receive_response (int req_code, int *res_items, int *res_size,
continue;
}
continue;
}
+ if (pkt_item_len > res_item_size)
+ {
+ syslog (LOG_ERR, "ntpd plugin: (pkt_item_len = %i) "
+ ">= (res_item_size = %i)",
+ pkt_item_len, res_item_size);
+ continue;
+ }
+
/* If this is the first packet (time wise, not sequence wise),
* set `res_size'. If it's not the first packet check if the
* items have the same size. Discard invalid packets. */
/* If this is the first packet (time wise, not sequence wise),
* set `res_size'. If it's not the first packet check if the
* items have the same size. Discard invalid packets. */
@@
-647,9
+655,16
@@
static int ntpd_receive_response (int req_code, int *res_items, int *res_size,
continue;
}
continue;
}
+ /*
+ * Because the items in the packet may be smaller than the
+ * items requested, the following holds true:
+ */
+ assert ((*res_size == pkt_item_len)
+ && (pkt_item_len <= res_item_size));
+
/* Calculate the padding. No idea why there might be any padding.. */
pkt_padding = 0;
/* Calculate the padding. No idea why there might be any padding.. */
pkt_padding = 0;
- if (
res_item_size > pkt_item_len
)
+ if (
pkt_item_len < res_item_size
)
pkt_padding = res_item_size - pkt_item_len;
DBG ("res_item_size = %i; pkt_padding = %i;",
res_item_size, pkt_padding);
pkt_padding = res_item_size - pkt_item_len;
DBG ("res_item_size = %i; pkt_padding = %i;",
res_item_size, pkt_padding);
@@
-700,11
+715,20
@@
static int ntpd_receive_response (int req_code, int *res_items, int *res_size,
syslog (LOG_ERR, "ntpd plugin: realloc failed.");
continue;
}
syslog (LOG_ERR, "ntpd plugin: realloc failed.");
continue;
}
+ items_num += pkt_item_num;
*res_data = items;
for (i = 0; i < pkt_item_num; i++)
{
*res_data = items;
for (i = 0; i < pkt_item_num; i++)
{
+ /* dst: There are already `*res_items' items with
+ * res_item_size bytes each in in `*res_data'. Set
+ * dst to the first byte after that. */
void *dst = (void *) (*res_data + ((*res_items) * res_item_size));
void *dst = (void *) (*res_data + ((*res_items) * res_item_size));
+ /* src: We use `pkt_item_len' to calculate the offset
+ * from the beginning of the packet, because the
+ * items in the packet may be smaller than the
+ * items that were requested. We skip `i' such
+ * items. */
void *src = (void *) (((char *) res.data) + (i * pkt_item_len));
/* Set the padding to zeros */
void *src = (void *) (((char *) res.data) + (i * pkt_item_len));
/* Set the padding to zeros */
@@
-712,8
+736,10
@@
static int ntpd_receive_response (int req_code, int *res_items, int *res_size,
memset (dst, '\0', res_item_size);
memcpy (dst, src, (size_t) pkt_item_len);
memset (dst, '\0', res_item_size);
memcpy (dst, src, (size_t) pkt_item_len);
+ /* Increment `*res_items' by one, so `dst' will end up
+ * one further in the next round. */
(*res_items)++;
(*res_items)++;
- }
+ }
/* for (pkt_item_num) */
pkt_recvd[pkt_sequence] = (char) 1;
pkt_recvd_num++;
pkt_recvd[pkt_sequence] = (char) 1;
pkt_recvd_num++;
@@
-723,7
+749,7
@@
static int ntpd_receive_response (int req_code, int *res_items, int *res_size,
} /* while (done == 0) */
return (0);
} /* while (done == 0) */
return (0);
-}
+}
/* int ntpd_receive_response */
/* For a description of the arguments see `ntpd_do_query' below. */
static int ntpd_send_request (int req_code, int req_items, int req_size, char *req_data)
/* For a description of the arguments see `ntpd_do_query' below. */
static int ntpd_send_request (int req_code, int req_items, int req_size, char *req_data)
@@
-881,7
+907,7
@@
static void ntpd_read (void)
struct info_peer_summary *ptr;
double offset;
struct info_peer_summary *ptr;
double offset;
- char peername[
512
];
+ char peername[
NI_MAXHOST
];
int refclock_id;
ptr = ps + i;
int refclock_id;
ptr = ps + i;