hgomez 2004/07/27 06:40:08 Added: ajp/ajplib/test ajp.h ajp_msg.c Log: initial msg functions.
Need review of course (at least it compile :) Revision Changes Path 1.1 jakarta-tomcat-connectors/ajp/ajplib/test/ajp.h Index: ajp.h =================================================================== /* Copyright 1999-2004 The Apache Software Foundation * * 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 * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ #ifndef AJP_H #define AJP_H #include "apr_hooks.h" #include "apr.h" #include "apr_lib.h" #include "apr_strings.h" #include "apr_buckets.h" #include "apr_md5.h" #include "apr_network_io.h" #include "apr_pools.h" #include "apr_strings.h" #include "apr_uri.h" #include "apr_date.h" #include "apr_fnmatch.h" #define APR_WANT_STRFUNC #include "apr_want.h" #if APR_HAVE_NETINET_IN_H #include <netinet/in.h> #endif #if APR_HAVE_ARPA_INET_H #include <arpa/inet.h> #endif #if APR_CHARSET_EBCDIC #define USE_CHARSET_EBCDIC #define ajp_xlate_to_ascii(b, l) ap_xlate_proto_to_ascii(b, l) #define ajp_xlate_from_ascii(b, l) ap_xlate_proto_from_ascii(b, l) #else /* APR_CHARSET_EBCDIC */ #define ajp_xlate_to_ascii(b, l) #define ajp_xlate_from_ascii(b, l) #endif struct ajp_idef { char * host; apr_port_t port; apr_sockaddr_t * addr; int keepalive; int timeout; int ndelay; }; typedef struct ajp_idef ajp_idef_t; struct ajp_ilink { apr_socket_t * sock; int requests; }; typedef struct ajp_ilink ajp_ilink_t; struct ajp_env { apr_pool_t * log; apr_pool_t * pool; int loglevel; }; typedef struct ajp_env ajp_env_t; struct ajp_msg { char * buf; int headerLen; int len; int pos; int serverSide; }; typedef struct ajp_msg ajp_msg_t; #define AJP_HEADER_LEN 4 #define AJP_HEADER_SZ_LEN 2 #define AJP_MSG_BUFFER_SZ (8*1024) #define AJP13_MAX_SEND_BODY_SZ (AJP_DEF_BUFFER_SZ - 6) #endif /* AJP_H */ 1.1 jakarta-tomcat-connectors/ajp/ajplib/test/ajp_msg.c Index: ajp_msg.c =================================================================== /* Copyright 1999-2004 The Apache Software Foundation * * 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 * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ #include "ajp.h" int ajp_msg_check_header(ajp_env_t *env, ajp_msg_t * msg) { char *head = msg->buf; int msglen; if (!((head[0] == 0x41 && head[1] == 0x42) || (head[0] == 0x12 && head[1] == 0x34))) { fprintf(stderr, "ajp_check_msg_header() got bad signature %x%x\n", head[0], head[1]); return -1; } msglen = ((head[2] & 0xff) << 8); msglen += (head[3] & 0xFF); if (msglen > AJP_MSG_BUFFER_SZ) { fprintf(stderr, "ajp_check_msg_header() incoming message is too big %d, max is %d\n", msglen, AJP_MSG_BUFFER_SZ); return -2; } msg->len = msglen + AJP_HEADER_LEN; msg->pos = AJP_HEADER_LEN; return msglen; } void ajp_msg_reset(ajp_env_t *env, ajp_msg_t * msg) { msg->len = AJP_HEADER_LEN; msg->pos = AJP_HEADER_LEN; } void ajp_msg_end(ajp_env_t *env, ajp_msg_t * msg) { unsigned short len = msg->len - AJP_HEADER_LEN; if (msg->serverSide) { msg->buf[0] = 0x41; msg->buf[1] = 0x42; } else { msg->buf[0] = 0x12; msg->buf[1] = 0x34; } msg->buf[2] = (unsigned char)((len >> 8) & 0xFF); msg->buf[3] = (unsigned char)(len & 0xFF); } int ajp_msg_append_long(ajp_env_t *env, ajp_msg_t *msg, const unsigned long val) { int len = msg->len; if (len + AJP_HEADER_LEN > AJP_MSG_BUFFER_SZ) { return -1; } msg->buf[len] = (unsigned char)((val >> 24) & 0xFF); msg->buf[len + 1] = (unsigned char)((val >> 16) & 0xFF); msg->buf[len + 2] = (unsigned char)((val >> 8) & 0xFF); msg->buf[len + 3] = (unsigned char)(val & 0xFF); msg->len += 4; return 0; } int ajp_msg_append_int(ajp_env_t *env, ajp_msg_t *msg, const unsigned short val) { int len = msg->len; if (len + 2 > AJP_MSG_BUFFER_SZ) { return -1; } msg->buf[len] = (unsigned char)((val >> 8) & 0xFF); msg->buf[len + 1] = (unsigned char)(val & 0xFF); msg->len += 2; return 0; } int ajp_msg_append_byte(ajp_env_t *env, ajp_msg_t *msg, unsigned char val) { int len = msg->len; if (len + 1 > AJP_MSG_BUFFER_SZ) { return -1; } msg->buf[len] = val; msg->len += 1; return 0; } int ajp_msg_append_cvt_string(ajp_env_t *env, ajp_msg_t *msg, const char *param, int convert) { int len; if (param == NULL) { return(ajp_msg_append_int(env, msg, 0xFFFF)); } len = strlen(param); if (msg->len + len + 2 > AJP_MSG_BUFFER_SZ) { return -1; } /* ignore error - we checked once */ ajp_msg_append_int(env, msg, (unsigned short)len); /* We checked for space !! */ strncpy((char *)msg->buf + msg->len, param, len + 1); /* including \0 */ if (convert) ajp_xlate_to_ascii((char *)msg->buf + msg->len, len + 1); /* convert from EBCDIC if needed */ msg->len += len + 1; return 0; } int ajp_msg_append_string(ajp_env_t *env, ajp_msg_t *msg, const char *param) { return ajp_msg_append_cvt_string(env, msg, param, 1); } static int jk2_msg_ajp_appendAsciiString(ajp_env_t *env, ajp_msg_t *msg, const char *param) { return ajp_msg_append_cvt_string(env, msg, param, 0); } static int jk2_msg_ajp_append_bytes(ajp_env_t *env, ajp_msg_t *msg, const unsigned char *param, const int len) { if (!len) { return 0; } if (msg->len + len > AJP_MSG_BUFFER_SZ) { return -1; } /* We checked for space !! */ memcpy((char *)msg->buf + msg->len, param, len); msg->len += len; return 0; } unsigned long ajp_msg_get_long(ajp_env_t *env, ajp_msg_t *msg) { unsigned long i; if (msg->pos + 3 > msg->len) { fprintf(stderr, "ajp_msg_get_long(): BufferOverflowException %d %d\n", msg->pos, msg->len); return -1; } i = ((msg->buf[(msg->pos++)] & 0xFF) << 24); i |= ((msg->buf[(msg->pos++)] & 0xFF) << 16); i |= ((msg->buf[(msg->pos++)] & 0xFF) << 8); i |= ((msg->buf[(msg->pos++)] & 0xFF)); return i; } unsigned short ajp_msg_get_int(ajp_env_t *env, ajp_msg_t *msg) { int i; if (msg->pos + 1 > msg->len) { fprintf(stderr, "ajp_msg_get_int(): BufferOverflowException %d %d\n", msg->pos, msg->len); return -1; } i = ((msg->buf[(msg->pos++)] & 0xFF) << 8); i += ((msg->buf[(msg->pos++)] & 0xFF)); return i; } unsigned short ajp_msg_peek_int(ajp_env_t *env, ajp_msg_t *msg) { int i; if (msg->pos + 1 > msg->len) { fprintf(stderr, "ajp_msg_peek_int(): BufferOverflowException %d %d\n", msg->pos, msg->len); return -1; } i = ((msg->buf[(msg->pos)] & 0xFF) << 8); i += ((msg->buf[(msg->pos + 1)] & 0xFF)); return i; } unsigned char ajp_msg_get_byte(ajp_env_t *env, ajp_msg_t *msg) { unsigned char rc; if (msg->pos > msg->len) { fprintf(stderr, "ajp_msg_get_byte(): BufferOverflowException %d %d\n", msg->pos, msg->len); return -1; } rc = msg->buf[msg->pos++]; return rc; } char * ajp_msg_get_string(ajp_env_t *env, ajp_msg_t *msg) { int size = ajp_msg_get_int(env, msg); int start = msg->pos; if ((size < 0) || (size + start > AJP_MSG_BUFFER_SZ)) { fprintf(stderr, "ajp_msg_get_string(): BufferOverflowException %d %d\n", msg->pos, msg->len); return (unsigned char *)"ERROR"; /* XXX */ } msg->pos += size; msg->pos++; /* terminating NULL */ return (unsigned char *)(msg->buf + start); } unsigned char *ajp_msg_get_bytes(ajp_env_t *env, ajp_msg_t *msg, int *lenP) { int size = ajp_msg_get_int(env, msg); int start = msg->pos; *lenP = size; if ((size < 0) || (size + start > AJP_MSG_BUFFER_SZ)) { fprintf(stderr, "ajp_msg_get_bytes(): BufferOverflowException %d %d\n", msg->pos, msg->len); return (unsigned char *)"ERROR"; /* XXX */ } msg->pos += size; msg->pos++; /* terminating NULL */ return (unsigned char *)(msg->buf + start); } ajp_msg_t *ajp_msg_create(ajp_env_t *env) { ajp_msg_t *msg = (ajp_msg_t *)apr_pcalloc(env->pool, sizeof(ajp_msg_t)); if (!msg) return NULL; msg->serverSide = 0; msg->buf = (char *)apr_palloc(env->pool, AJP_MSG_BUFFER_SZ); if (msg->buf == NULL) { return NULL; } msg->len = 0; msg->headerLen = AJP_HEADER_LEN; return msg; } int ajp_msg_copy(ajp_env_t *env, ajp_msg_t *msg, ajp_msg_t *dmsg) { if (dmsg == NULL) return -1; if (msg->len > AJP_MSG_BUFFER_SZ) { fprintf(stderr, "ajp_msg_copy(): destination buffer too small %d/%d\n", msg->len, AJP_MSG_BUFFER_SZ); return -2; } memcpy(dmsg->buf, msg->buf, msg->len); dmsg->len = msg->len; dmsg->pos = msg->pos; return dmsg->len; } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
