www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00
Code Activity

Style

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1629736 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Christophe Jaillet
2014-10-06 19:13:32 +00:00
parent dc87b838db
commit c1235fe947
1 changed files with 121 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

175
modules/debugging/mod_firehose.c
View File

@@ -106,14 +106,16 @@ typedef struct firehose_ctx_t
static apr_status_t filter_output_cleanup(void *dummy) static apr_status_t filter_output_cleanup(void *dummy)
{ {
ap_filter_t *f = (ap_filter_t *) dummy; ap_filter_t *f = (ap_filter_t *)dummy;
ap_remove_output_filter(f); ap_remove_output_filter(f);
return APR_SUCCESS; return APR_SUCCESS;
} }
static apr_status_t filter_input_cleanup(void *dummy) static apr_status_t filter_input_cleanup(void *dummy)
{ {
ap_filter_t *f = (ap_filter_t *) dummy; ap_filter_t *f = (ap_filter_t *)dummy;
ap_remove_input_filter(f); ap_remove_input_filter(f);
return APR_SUCCESS; return APR_SUCCESS;
} }
@@ -123,7 +125,7 @@ static apr_status_t filter_input_cleanup(void *dummy)
*/ */
static apr_status_t pumpit_cleanup(void *dummy) static apr_status_t pumpit_cleanup(void *dummy)
{ {
firehose_ctx_t *ctx = (firehose_ctx_t *) dummy; firehose_ctx_t *ctx = (firehose_ctx_t *)dummy;
apr_status_t rv; apr_status_t rv;
apr_size_t hdr_len; apr_size_t hdr_len;
char header[HEADER_LEN + 1]; char header[HEADER_LEN + 1];
@@ -133,8 +135,8 @@ static apr_status_t pumpit_cleanup(void *dummy)
} }
hdr_len = apr_snprintf(header, sizeof(header), HEADER_FMT, hdr_len = apr_snprintf(header, sizeof(header), HEADER_FMT,
(apr_uint64_t) 0, (apr_uint64_t) apr_time_now(), ctx->direction, (apr_uint64_t)0, (apr_uint64_t)apr_time_now(),
ctx->uuid, ctx->count); ctx->direction, ctx->uuid, ctx->count);
ap_xlate_proto_to_ascii(header, hdr_len); ap_xlate_proto_to_ascii(header, hdr_len);
rv = apr_file_write_full(ctx->conn->file, header, hdr_len, NULL); rv = apr_file_write_full(ctx->conn->file, header, hdr_len, NULL);
@@ -143,22 +145,24 @@ static apr_status_t pumpit_cleanup(void *dummy)
/* ignore the error */ /* ignore the error */
} }
else if (ctx->r) { else if (ctx->r) {
ap_log_rerror( ap_log_rerror(APLOG_MARK, APLOG_WARNING, rv, ctx->r,
APLOG_MARK, "mod_firehose: could not write %"
APLOG_WARNING, APR_UINT64_T_FMT
rv, " bytes to '%s' for '%c' connection '%s' and"
ctx->r, " count '%0" APR_UINT64_T_HEX_FMT "', bytes"
"mod_firehose: could not write %" APR_UINT64_T_FMT " bytes to '%s' for '%c' connection '%s' and count '%0" APR_UINT64_T_HEX_FMT "', bytes dropped (further errors will be suppressed)", " dropped (further errors will be suppressed)",
(apr_uint64_t)(hdr_len), ctx->conn->filename, ctx->conn->direction, ctx->uuid, ctx->count); (apr_uint64_t)(hdr_len), ctx->conn->filename,
ctx->conn->direction, ctx->uuid, ctx->count);
} }
else { else {
ap_log_cerror( ap_log_cerror(APLOG_MARK, APLOG_WARNING, rv, ctx->c,
APLOG_MARK, "mod_firehose: could not write %"
APLOG_WARNING, APR_UINT64_T_FMT
rv, " bytes to '%s' for '%c' connection '%s' and"
ctx->c, " count '%0" APR_UINT64_T_HEX_FMT "', bytes"
"mod_firehose: could not write %" APR_UINT64_T_FMT " bytes to '%s' for '%c' connection '%s' and count '%0" APR_UINT64_T_HEX_FMT "', bytes dropped (further errors will be suppressed)", " dropped (further errors will be suppressed)",
(apr_uint64_t)(hdr_len), ctx->conn->filename, ctx->conn->direction, ctx->uuid, ctx->count); (apr_uint64_t)(hdr_len), ctx->conn->filename,
ctx->conn->direction, ctx->uuid, ctx->count);
} }
ctx->conn->suppress = 1; ctx->conn->suppress = 1;
} }
@@ -208,13 +212,14 @@ static apr_status_t pumpit(ap_filter_t *f, apr_bucket *b, firehose_ctx_t *ctx)
* the chunk. * the chunk.
*/ */
hdr_len = apr_snprintf(header, sizeof(header), HEADER_FMT, hdr_len = apr_snprintf(header, sizeof(header), HEADER_FMT,
(apr_uint64_t) body_len, (apr_uint64_t) apr_time_now(), (apr_uint64_t)body_len,
(apr_uint64_t)apr_time_now(),
ctx->direction, ctx->uuid, ctx->count); ctx->direction, ctx->uuid, ctx->count);
ap_xlate_proto_to_ascii(header, hdr_len); ap_xlate_proto_to_ascii(header, hdr_len);
vec[0].iov_base = header; vec[0].iov_base = header;
vec[0].iov_len = hdr_len; vec[0].iov_len = hdr_len;
vec[1].iov_base = (void *) (buf + offset); vec[1].iov_base = (void *)(buf + offset);
vec[1].iov_len = body_len; vec[1].iov_len = body_len;
vec[2].iov_base = CRLF; vec[2].iov_base = CRLF;
vec[2].iov_len = 2; vec[2].iov_len = 2;
@@ -225,22 +230,32 @@ static apr_status_t pumpit(ap_filter_t *f, apr_bucket *b, firehose_ctx_t *ctx)
/* ignore the error */ /* ignore the error */
} }
else if (ctx->r) { else if (ctx->r) {
ap_log_rerror( ap_log_rerror(APLOG_MARK, APLOG_WARNING, rv, ctx->r,
APLOG_MARK, "mod_firehose: could not write %"
APLOG_WARNING, APR_UINT64_T_FMT
rv, " bytes to '%s' for '%c' connection '%s' and"
ctx->r, " count '%0" APR_UINT64_T_HEX_FMT "', bytes"
"mod_firehose: could not write %" APR_UINT64_T_FMT " bytes to '%s' for '%c' connection '%s' and count '%0" APR_UINT64_T_HEX_FMT "', bytes dropped (further errors will be suppressed)", " dropped (further errors will be suppressed)",
(apr_uint64_t)(vec[0].iov_len + vec[1].iov_len + vec[2].iov_len), ctx->conn->filename, ctx->conn->direction, ctx->uuid, ctx->count); (apr_uint64_t)(vec[0].iov_len +
vec[1].iov_len +
vec[2].iov_len),
ctx->conn->filename,
ctx->conn->direction, ctx->uuid,
ctx->count);
} }
else { else {
ap_log_cerror( ap_log_cerror(APLOG_MARK, APLOG_WARNING, rv, ctx->c,
APLOG_MARK, "mod_firehose: could not write %"
APLOG_WARNING, APR_UINT64_T_FMT
rv, " bytes to '%s' for '%c' connection '%s' and"
ctx->c, " count '%0" APR_UINT64_T_HEX_FMT "', bytes"
"mod_firehose: could not write %" APR_UINT64_T_FMT " bytes to '%s' for '%c' connection '%s' and count '%0" APR_UINT64_T_HEX_FMT "', bytes dropped (further errors will be suppressed)", " dropped (further errors will be suppressed)",
(apr_uint64_t)(vec[0].iov_len + vec[1].iov_len + vec[2].iov_len), ctx->conn->filename, ctx->conn->direction, ctx->uuid, ctx->count); (apr_uint64_t)(vec[0].iov_len +
vec[1].iov_len +
vec[2].iov_len),
ctx->conn->filename,
ctx->conn->direction, ctx->uuid,
ctx->count);
} }
ctx->conn->suppress = 1; ctx->conn->suppress = 1;
rv = APR_SUCCESS; rv = APR_SUCCESS;
@@ -288,8 +303,9 @@ static apr_status_t firehose_input_filter(ap_filter_t *f,
return rv; return rv;
} }
for (b = APR_BRIGADE_FIRST(bb); b != APR_BRIGADE_SENTINEL(bb); b for (b = APR_BRIGADE_FIRST(bb);
= APR_BUCKET_NEXT(b)) { b != APR_BRIGADE_SENTINEL(bb);
b = APR_BUCKET_NEXT(b)) {
rv = pumpit(f, b, ctx); rv = pumpit(f, b, ctx);
if (APR_SUCCESS != rv) { if (APR_SUCCESS != rv) {
return rv; return rv;
@@ -351,7 +367,7 @@ static int firehose_create_request(request_rec *r)
f = r->connection->input_filters; f = r->connection->input_filters;
while (f) { while (f) {
if (f->frec->filter_func.in_func == &firehose_input_filter) { if (f->frec->filter_func.in_func == &firehose_input_filter) {
ctx = (firehose_ctx_t *) f->ctx; ctx = (firehose_ctx_t *)f->ctx;
if (ctx->conn->request == FIREHOSE_REQUEST) { if (ctx->conn->request == FIREHOSE_REQUEST) {
pumpit_cleanup(ctx); pumpit_cleanup(ctx);
if (!set) { if (!set) {
@@ -367,7 +383,7 @@ static int firehose_create_request(request_rec *r)
f = r->connection->output_filters; f = r->connection->output_filters;
while (f) { while (f) {
if (f->frec->filter_func.out_func == &firehose_output_filter) { if (f->frec->filter_func.out_func == &firehose_output_filter) {
ctx = (firehose_ctx_t *) f->ctx; ctx = (firehose_ctx_t *)f->ctx;
if (ctx->conn->request == FIREHOSE_REQUEST) { if (ctx->conn->request == FIREHOSE_REQUEST) {
pumpit_cleanup(ctx); pumpit_cleanup(ctx);
if (!set) { if (!set) {
@@ -421,11 +437,11 @@ static int firehose_pre_conn(conn_rec *c, void *csd)
apr_uuid_get(&uuid); apr_uuid_get(&uuid);
} }
conn = (firehose_conn_t *) conf->firehoses->elts; conn = (firehose_conn_t *)conf->firehoses->elts;
for (i = 0; i < conf->firehoses->nelts; i++) { for (i = 0; i < conf->firehoses->nelts; i++) {
if (!conn->file || (conn->proxy == FIREHOSE_NORMAL if (!conn->file || (conn->proxy == FIREHOSE_NORMAL && !c->sbh) ||
&& !c->sbh) || (conn->proxy == FIREHOSE_PROXY && c->sbh)) { (conn->proxy == FIREHOSE_PROXY && c->sbh)) {
conn++; conn++;
continue; continue;
} }
@@ -468,24 +484,23 @@ static int firehose_open_logs(apr_pool_t *p, apr_pool_t *plog,
/* make sure we only open the files on the second pass for config */ /* make sure we only open the files on the second pass for config */
apr_pool_userdata_get(&data, "mod_firehose", s->process->pool); apr_pool_userdata_get(&data, "mod_firehose", s->process->pool);
if (!data) { if (!data) {
apr_pool_userdata_set((const void *) 1, "mod_firehose", apr_pool_userdata_set((const void *)1, "mod_firehose",
apr_pool_cleanup_null, s->process->pool); apr_pool_cleanup_null, s->process->pool);
return OK; return OK;
} }
while (s) { while (s) {
conf = ap_get_module_config(s->module_config, conf = ap_get_module_config(s->module_config, &firehose_module);
&firehose_module);
conn = (firehose_conn_t *) conf->firehoses->elts; conn = (firehose_conn_t *)conf->firehoses->elts;
for (i = 0; i < conf->firehoses->nelts; i++) { for (i = 0; i < conf->firehoses->nelts; i++) {
if (APR_SUCCESS != (rv = apr_file_open(&conn->file, conn->filename, if (APR_SUCCESS != (rv = apr_file_open(&conn->file, conn->filename,
APR_FOPEN_WRITE | APR_FOPEN_CREATE | APR_FOPEN_APPEND APR_FOPEN_WRITE | APR_FOPEN_CREATE | APR_FOPEN_APPEND
| conn->nonblock, APR_OS_DEFAULT, plog))) { | conn->nonblock, APR_OS_DEFAULT, plog))) {
ap_log_error(APLOG_MARK, ap_log_error(APLOG_MARK, APLOG_WARNING, rv, s,
APLOG_WARNING, "mod_firehose: could not open '%s' for write, "
rv, s, "mod_firehose: could not open '%s' for write, disabling firehose %s%s %s filter", "disabling firehose %s%s %s filter",
conn->filename, conn->proxy == FIREHOSE_PROXY ? "proxy " : "", conn->filename, conn->proxy == FIREHOSE_PROXY ? "proxy " : "",
conn->request == FIREHOSE_REQUEST ? " request" : "connection", conn->request == FIREHOSE_REQUEST ? " request" : "connection",
conn->direction == FIREHOSE_IN ? "input" : "output"); conn->direction == FIREHOSE_IN ? "input" : "output");
@@ -529,8 +544,8 @@ static void *firehose_merge_sconfig(apr_pool_t *p, void *basev,
void *overridesv) void *overridesv)
{ {
firehose_conf_t *cconf = apr_pcalloc(p, sizeof(firehose_conf_t)); firehose_conf_t *cconf = apr_pcalloc(p, sizeof(firehose_conf_t));
firehose_conf_t *base = (firehose_conf_t *) basev; firehose_conf_t *base = (firehose_conf_t *)basev;
firehose_conf_t *overrides = (firehose_conf_t *) overridesv; firehose_conf_t *overrides = (firehose_conf_t *)overridesv;
cconf->firehoses = apr_array_append(p, overrides->firehoses, cconf->firehoses = apr_array_append(p, overrides->firehoses,
base->firehoses); base->firehoses);
@@ -538,16 +553,18 @@ static void *firehose_merge_sconfig(apr_pool_t *p, void *basev,
return cconf; return cconf;
} }
static const char *firehose_enable_connection(cmd_parms *cmd, const char *arg1, static const char *firehose_enable_connection(cmd_parms *cmd,
const char *arg2, proxy_enum proxy, direction_enum direction, const char *arg1,
const char *arg2,
proxy_enum proxy,
direction_enum direction,
request_enum request) request_enum request)
{ {
const char *name = arg2 ? arg2 : arg1; const char *name = arg2 ? arg2 : arg1;
firehose_conn_t *firehose; firehose_conn_t *firehose;
firehose_conf_t firehose_conf_t *ptr =
*ptr = (firehose_conf_t *)ap_get_module_config(cmd->server->module_config,
(firehose_conf_t *) ap_get_module_config(cmd->server->module_config,
&firehose_module); &firehose_module);
firehose = apr_array_push(ptr->firehoses); firehose = apr_array_push(ptr->firehoses);
@@ -562,7 +579,8 @@ static const char *firehose_enable_connection(cmd_parms *cmd, const char *arg1,
#ifdef APR_FOPEN_NONBLOCK #ifdef APR_FOPEN_NONBLOCK
firehose->nonblock = APR_FOPEN_NONBLOCK; firehose->nonblock = APR_FOPEN_NONBLOCK;
#else #else
return "The parameter 'nonblock' is not supported by APR on this platform"; return "The parameter 'nonblock' is not supported by APR on this "
"platform";
#endif #endif
} }
else if (!strcmp(arg1, "block")) { else if (!strcmp(arg1, "block")) {
@@ -570,7 +588,8 @@ static const char *firehose_enable_connection(cmd_parms *cmd, const char *arg1,
} }
else { else {
return apr_psprintf(cmd->pool, return apr_psprintf(cmd->pool,
"The parameter '%s' should be 'block' or 'nonblock'", arg1); "The parameter '%s' should be 'block' or 'nonblock'",
arg1);
} }
} }
else { else {
@@ -581,11 +600,12 @@ static const char *firehose_enable_connection(cmd_parms *cmd, const char *arg1,
} }
static const char *firehose_enable_connection_input(cmd_parms *cmd, static const char *firehose_enable_connection_input(cmd_parms *cmd,
void *dummy, const char *arg1, const char *arg2) void *dummy,
const char *arg1,
const char *arg2)
{ {
const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY | NOT_IN_LIMIT);
| NOT_IN_LIMIT);
if (err != NULL) { if (err != NULL) {
return err; return err;
} }
@@ -596,11 +616,12 @@ static const char *firehose_enable_connection_input(cmd_parms *cmd,
} }
static const char *firehose_enable_connection_output(cmd_parms *cmd, static const char *firehose_enable_connection_output(cmd_parms *cmd,
void *dummy, const char *arg1, const char *arg2) void *dummy,
const char *arg1,
const char *arg2)
{ {
const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY | NOT_IN_LIMIT);
| NOT_IN_LIMIT);
if (err != NULL) { if (err != NULL) {
return err; return err;
} }
@@ -611,11 +632,11 @@ static const char *firehose_enable_connection_output(cmd_parms *cmd,
} }
static const char *firehose_enable_request_input(cmd_parms *cmd, void *dummy, static const char *firehose_enable_request_input(cmd_parms *cmd, void *dummy,
const char *arg1, const char *arg2) const char *arg1,
const char *arg2)
{ {
const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY | NOT_IN_LIMIT);
| NOT_IN_LIMIT);
if (err != NULL) { if (err != NULL) {
return err; return err;
} }
@@ -626,11 +647,11 @@ static const char *firehose_enable_request_input(cmd_parms *cmd, void *dummy,
} }
static const char *firehose_enable_request_output(cmd_parms *cmd, void *dummy, static const char *firehose_enable_request_output(cmd_parms *cmd, void *dummy,
const char *arg1, const char *arg2) const char *arg1,
const char *arg2)
{ {
const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY | NOT_IN_LIMIT);
| NOT_IN_LIMIT);
if (err != NULL) { if (err != NULL) {
return err; return err;
} }
@@ -641,11 +662,12 @@ static const char *firehose_enable_request_output(cmd_parms *cmd, void *dummy,
} }
static const char *firehose_enable_proxy_connection_input(cmd_parms *cmd, static const char *firehose_enable_proxy_connection_input(cmd_parms *cmd,
void *dummy, const char *arg1, const char *arg2) void *dummy,
const char *arg1,
const char *arg2)
{ {
const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY | NOT_IN_LIMIT);
| NOT_IN_LIMIT);
if (err != NULL) { if (err != NULL) {
return err; return err;
} }
@@ -656,11 +678,12 @@ static const char *firehose_enable_proxy_connection_input(cmd_parms *cmd,
} }
static const char *firehose_enable_proxy_connection_output(cmd_parms *cmd, static const char *firehose_enable_proxy_connection_output(cmd_parms *cmd,
void *dummy, const char *arg1, const char *arg2) void *dummy,
const char *arg1,
const char *arg2)
{ {
const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY | NOT_IN_LIMIT);
| NOT_IN_LIMIT);
if (err != NULL) { if (err != NULL) {
return err; return err;
} }