-/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
- * applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
#include "ajp.h"
+APLOG_USE_MODULE(proxy_ajp);
static char *hex_table = "0123456789ABCDEF";
rv = apr_palloc(pool, bl);
apr_snprintf(rv, bl,
"ajp_msg_dump(): %s pos=%" APR_SIZE_T_FMT
- " len=%" APR_SIZE_T_FMT " max=%d\n",
- err, msg->pos, msg->len, AJP_MSG_BUFFER_SZ);
+ " len=%" APR_SIZE_T_FMT " max=%" APR_SIZE_T_FMT "\n",
+ err, msg->pos, msg->len, msg->max_size);
bl -= strlen(rv);
p = rv + strlen(rv);
for (i = 0; i < len; i += 16) {
(head[0] == 0x12 && head[1] == 0x34))) {
ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL,
- "ajp_check_msg_header() got bad signature %x%x",
+ "ajp_msg_check_header() got bad signature %02x%02x",
head[0], head[1]);
return AJP_EBAD_SIGNATURE;
msglen = ((head[2] & 0xff) << 8);
msglen += (head[3] & 0xFF);
- if (msglen > AJP_MSG_BUFFER_SZ) {
+ if (msglen > msg->max_size) {
ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL,
- "ajp_check_msg_header() incoming message is "
- "too big %" APR_SIZE_T_FMT ", max is %d",
- msglen, AJP_MSG_BUFFER_SZ);
+ "ajp_msg_check_header() incoming message is "
+ "too big %" APR_SIZE_T_FMT ", max is %" APR_SIZE_T_FMT,
+ msglen, msg->max_size);
return AJP_ETOBIG;
}
apr_status_t ajp_msg_reuse(ajp_msg_t *msg)
{
apr_byte_t *buf;
+ apr_size_t max_size;
buf = msg->buf;
+ max_size = msg->max_size;
memset(msg, 0, sizeof(ajp_msg_t));
msg->buf = buf;
+ msg->max_size = max_size;
msg->header_len = AJP_HEADER_LEN;
ajp_msg_reset(msg);
return APR_SUCCESS;
{
apr_size_t len = msg->len;
- if ((len + 4) > AJP_MSG_BUFFER_SZ) {
+ if ((len + 4) > msg->max_size) {
return ajp_log_overflow(msg, "ajp_msg_append_uint32");
}
{
apr_size_t len = msg->len;
- if ((len + 2) > AJP_MSG_BUFFER_SZ) {
+ if ((len + 2) > msg->max_size) {
return ajp_log_overflow(msg, "ajp_msg_append_uint16");
}
{
apr_size_t len = msg->len;
- if ((len + 1) > AJP_MSG_BUFFER_SZ) {
+ if ((len + 1) > msg->max_size) {
return ajp_log_overflow(msg, "ajp_msg_append_uint8");
}
}
len = strlen(value);
- if ((msg->len + len + 2) > AJP_MSG_BUFFER_SZ) {
+ if ((msg->len + len + 3) > msg->max_size) {
return ajp_log_overflow(msg, "ajp_msg_append_cvt_string");
}
/* We checked for space !! */
memcpy(msg->buf + msg->len, value, len + 1); /* including \0 */
- if (convert) /* convert from EBCDIC if needed */
- ajp_xlate_to_ascii((char *)msg->buf + msg->len, len + 1);
+ if (convert) {
+ /* convert from EBCDIC if needed */
+ ap_xlate_proto_to_ascii((char *)msg->buf + msg->len, len + 1);
+ }
msg->len += len + 1;
return APR_SUCCESS; /* Shouldn't we indicate an error ? */
}
- if ((msg->len + valuelen) > AJP_MSG_BUFFER_SZ) {
+ if ((msg->len + valuelen) > msg->max_size) {
return ajp_log_overflow(msg, "ajp_msg_append_bytes");
}
status = ajp_msg_get_uint16(msg, &size);
start = msg->pos;
- if ((status != APR_SUCCESS) || (size + start > AJP_MSG_BUFFER_SZ)) {
+ if ((status != APR_SUCCESS) || (size + start > msg->max_size)) {
return ajp_log_overflow(msg, "ajp_msg_get_string");
}
/* save the current position */
start = msg->pos;
- if ((status != APR_SUCCESS) || (size + start > AJP_MSG_BUFFER_SZ)) {
+ if ((status != APR_SUCCESS) || (size + start > msg->max_size)) {
return ajp_log_overflow(msg, "ajp_msg_get_bytes");
}
msg->pos += (apr_size_t)size; /* only bytes, no trailer */
* Create an AJP Message from pool
*
* @param pool memory pool to allocate AJP message from
+ * @param size size of the buffer to create
* @param rmsg Pointer to newly created AJP message
* @return APR_SUCCESS or error
*/
-apr_status_t ajp_msg_create(apr_pool_t *pool, ajp_msg_t **rmsg)
+apr_status_t ajp_msg_create(apr_pool_t *pool, apr_size_t size, ajp_msg_t **rmsg)
{
ajp_msg_t *msg = (ajp_msg_t *)apr_pcalloc(pool, sizeof(ajp_msg_t));
- if (!msg) {
- ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL,
- "ajp_msg_create(): can't allocate AJP message memory");
- return APR_ENOPOOL;
- }
-
msg->server_side = 0;
- msg->buf = (apr_byte_t *)apr_palloc(pool, AJP_MSG_BUFFER_SZ);
-
- /* XXX: This should never happen
- * In case if the OS cannont allocate 8K of data
- * we are in serious trouble
- * No need to check the alloc return value, cause the
- * core dump is probably the best solution anyhow.
- */
- if (msg->buf == NULL) {
- ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL,
- "ajp_msg_create(): can't allocate AJP message memory");
- return APR_ENOPOOL;
- }
-
+ msg->buf = (apr_byte_t *)apr_palloc(pool, size);
msg->len = 0;
msg->header_len = AJP_HEADER_LEN;
+ msg->max_size = size;
*rmsg = msg;
return APR_SUCCESS;
*/
apr_status_t ajp_msg_copy(ajp_msg_t *smsg, ajp_msg_t *dmsg)
{
- if (dmsg == NULL) {
- ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL,
- "ajp_msg_copy(): destination msg is null");
- return AJP_EINVAL;
- }
-
- if (smsg->len > AJP_MSG_BUFFER_SZ) {
+ if (smsg->len > smsg->max_size) {
ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL,
"ajp_msg_copy(): destination buffer too "
- "small %" APR_SIZE_T_FMT ", max size is %d",
- smsg->len, AJP_MSG_BUFFER_SZ);
+ "small %" APR_SIZE_T_FMT ", max size is %" APR_SIZE_T_FMT,
+ smsg->len, smsg->max_size);
return AJP_ETOSMALL;
}