projects
/
rrdtool.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
The buffer length for command buffers should be controlled by a single
[rrdtool.git]
/
src
/
rrd_daemon.c
diff --git
a/src/rrd_daemon.c
b/src/rrd_daemon.c
index
a200135
..
79fbc31
100644
(file)
--- a/
src/rrd_daemon.c
+++ b/
src/rrd_daemon.c
@@
-219,9
+219,7
@@
typedef struct {
size_t files_num;
} journal_set;
size_t files_num;
} journal_set;
-/* max length of socket command or response */
-#define CMD_MAX 4096
-#define RBUF_SIZE (CMD_MAX*2)
+#define RBUF_SIZE (RRD_CMD_MAX*2)
/*
* Variables
/*
* Variables
@@
-543,7
+541,7
@@
static int add_to_wbuf(listen_socket_t *sock, char *str, size_t len) /* {{{ */
static int add_response_info(listen_socket_t *sock, char *fmt, ...) /* {{{ */
{
va_list argp;
static int add_response_info(listen_socket_t *sock, char *fmt, ...) /* {{{ */
{
va_list argp;
- char buffer[CMD_MAX];
+ char buffer[
RRD_
CMD_MAX];
int len;
if (JOURNAL_REPLAY(sock)) return 0;
int len;
if (JOURNAL_REPLAY(sock)) return 0;
@@
-588,7
+586,7
@@
static int send_response (listen_socket_t *sock, response_code rc,
char *fmt, ...) /* {{{ */
{
va_list argp;
char *fmt, ...) /* {{{ */
{
va_list argp;
- char buffer[CMD_MAX];
+ char buffer[
RRD_
CMD_MAX];
int lines;
ssize_t wrote;
int rclen, len;
int lines;
ssize_t wrote;
int rclen, len;
@@
-1327,7
+1325,7
@@
static int handle_request_update (HANDLER_PROTO) /* {{{ */
char *file, file_tmp[PATH_MAX];
int values_num = 0;
int status;
char *file, file_tmp[PATH_MAX];
int values_num = 0;
int status;
- char orig_buf[CMD_MAX];
+ char orig_buf[
RRD_
CMD_MAX];
cache_item_t *ci;
cache_item_t *ci;
@@
-2204,7
+2202,7
@@
static int handle_request_help (HANDLER_PROTO) /* {{{ */
if (help && (help->syntax || help->help))
{
if (help && (help->syntax || help->help))
{
- char tmp[CMD_MAX];
+ char tmp[
RRD_
CMD_MAX];
snprintf(tmp, sizeof(tmp)-1, "Help for %s\n", help->cmd);
resp_txt = tmp;
snprintf(tmp, sizeof(tmp)-1, "Help for %s\n", help->cmd);
resp_txt = tmp;
@@
-2439,7
+2437,7
@@
static int journal_replay (const char *file) /* {{{ */
int entry_cnt = 0;
int fail_cnt = 0;
uint64_t line = 0;
int entry_cnt = 0;
int fail_cnt = 0;
uint64_t line = 0;
- char entry[CMD_MAX];
+ char entry[
RRD_
CMD_MAX];
time_t now;
if (file == NULL) return 0;
time_t now;
if (file == NULL) return 0;