cvs commit: jakarta-tomcat-connectors/jk/native/common jk_channel.h jk_channel_socket.c jk_endpoint.h jk_env.c jk_env.h jk_handler_discovery.c jk_handler_logon.c jk_logger.c jk_msg.h jk_registry.c
costin 01/12/04 11:46:31 Removed: jk/native/common jk_channel.h jk_channel_socket.c jk_endpoint.h jk_env.c jk_env.h jk_handler_discovery.c jk_handler_logon.c jk_logger.c jk_msg.h jk_registry.c Log: Rolling back. -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_channel.h
costin 01/11/16 14:45:20
Modified:jk/native/common jk_channel.h
Log:
Few changes in jk_channel, based on what was required in implementing it.
Revision ChangesPath
1.4 +66 -46jakarta-tomcat-connectors/jk/native/common/jk_channel.h
Index: jk_channel.h
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_channel.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- jk_channel.h 2001/11/07 21:39:35 1.3
+++ jk_channel.h 2001/11/16 22:45:19 1.4
@@ -58,17 +58,19 @@
#ifndef JK_CHANNEL_H
#define JK_CHANNEL_H
-
-#ifdef __cplusplus
-extern C {
-#endif /* __cplusplus */
-
#include jk_global.h
#include jk_logger.h
#include jk_pool.h
#include jk_msg_buff.h
+#ifdef __cplusplus
+extern C {
+#endif /* __cplusplus */
+
+struct jk_worker;
+struct jk_endpoint;
struct jk_channel;
+
typedef struct jk_channel jk_channel_t;
/**
@@ -95,52 +97,70 @@
* @author Costin Manolache
*/
struct jk_channel {
- /** Pool for the channel
- */
- jk_pool_t *pool;
- jk_logger_t *logger;
-
- char *name;
+char *name;
- /** Prepare the channel, check the properties. This
- * will resolve the host and do all the validations.
- * ( needed to remove the dependencies on sockets in ajp)
- */
- int (JK_METHOD *init)(jk_channel_t *_this );
-
- /** Open the communication channel
- */
- int (JK_METHOD *open)(jk_channel_t *_this );
-
- /** Close the communication channel
- */
- int (JK_METHOD *close)(jk_channel_t *_this );
-
+/** List of properties this channel 'knows'.
+ * This will permit admin code to 'query' each channel
+ * and the setting code can better report errors.
+ */
+char **supportedProperties;
+
+struct jk_worker *worker; /* XXX Do we need it ? */
+jk_logger_t *logger;
+jk_map_t *properties;
+jk_pool_t *pool; /* XXX Do we need it ? */
+
+
+/** Prepare the channel, check the properties. This
+ * will resolve the host and do all the validations.
+ * ( needed to remove the dependencies on sockets in ajp)
+ *
+ * The channel may save or use data from the worker ( like cache
+ * the inet addr, etc )
+ * XXX revisit this - we may pass too much that is not needed
+ */
+int (JK_METHOD *init)(jk_channel_t *_this,
+ jk_map_t *properties,
+ char *worker_name,
+ struct jk_worker *worker,
+ jk_logger_t *l );
+
+/** Open the communication channel
+ */
+int (JK_METHOD *open)(jk_channel_t *_this,
+ struct jk_endpoint *endpoint );
+
+/** Close the communication channel
+ */
+int (JK_METHOD *close)(jk_channel_t *_this,
+struct jk_endpoint *endpoint );
+
/** Send a packet
- */
- int (JK_METHOD *send)(jk_channel_t *_this,
- jk_msg_buf_t *b );
-
- /** Receive a packet
*/
- int (JK_METHOD *recv)(jk_channel_t *_this,
- jk_msg_buf_t *b );
-
- /** Set a channel property. Properties are used to configure the
- * communication channel ( example: port, host, file, shmem_name, etc).
- */
- int (JK_METHOD *setProperty)(jk_channel_t *_this,
-char *name, char *value);
-
- /** Get a channel property
- */
- int (JK_METHOD *getProperty)(jk_channel_t *_this,
+int (JK_METHOD *send)(jk_channel_t *_this,
+ struct jk_endpoint *endpoint,
+ char *b, int len );
+
+/** Receive a packet
+ */
+int (JK_METHOD *recv)(jk_channel_t *_this,
+ struct jk_endpoint *endpoint,
+ char *b, int len );
+
+/** Set a channel property. Properties are used to configure the
+ * communication channel ( example: port, host, file, shmem_name, etc).
+ */
+int (JK_METHOD *setProperty)(jk_channel_t *_this,
+ char *name, char *value);
+
+/** Get a channel property
+ */
+int (JK_METHOD *getProperty)(jk_channel_t *_this,
char *name, char **value);
-
- void *_privatePtr;
- int _privateInt;
+
+void *_privatePtr;
};
-
+
#ifdef __cplusplus
}
#endif /* __cplusplus */
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_channel.h
costin 01/11/01 20:22:59 Added: jk/native/common jk_channel.h Log: A first step in abstracting the TCP communication and adding support for faster mechanisms. Revision ChangesPath 1.1 jakarta-tomcat-connectors/jk/native/common/jk_channel.h Index: jk_channel.h === /* = * * * * The Apache Software License, Version 1.1 * * * * Copyright (c) 1999-2001 The Apache Software Foundation. * * All rights reserved.* * * * = * * * * Redistribution and use in source and binary forms, with or without modi- * * fication, are permitted provided that the following conditions are met: * * * * 1. Redistributions of source code must retain the above copyright notice * *notice, this list of conditions and the following disclaimer. * * * * 2. Redistributions in binary form must reproduce the above copyright * *notice, this list of conditions and the following disclaimer in the * *documentation and/or other materials provided with the distribution. * * * * 3. The end-user documentation included with the redistribution, if any, * *must include the following acknowlegement: * * * * This product includes software developed by the Apache Software * *Foundation http://www.apache.org/. * * * *Alternately, this acknowlegement may appear in the software itself, if * *and wherever such third-party acknowlegements normally appear. * * * * 4. The names The Jakarta Project, Jk, and Apache Software * *Foundation must not be used to endorse or promote products derived * *from this software without prior written permission. For written * *permission, please contact [EMAIL PROTECTED].* * * * 5. Products derived from this software may not be called Apache nor may * *Apache appear in their names without prior written permission of the * *Apache Software Foundation.* * * * THIS SOFTWARE IS PROVIDED AS IS AND ANY EXPRESSED OR IMPLIED WARRANTIES * * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY * * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL * * THE APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY * * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, * * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN * * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * * POSSIBILITY OF SUCH DAMAGE. * * * * = * * * * This software consists of voluntary contributions made by many indivi- * * duals on behalf of the Apache Software Foundation. For more information * * on the Apache Software Foundation, please see http://www.apache.org/. * * * * = */ #include jk_global.h #include jk_logger.h #include jk_pool.h /** * Abstraction
