costin 01/12/12 14:01:49
Modified: jk/native2/include jk_worker.h
Log:
Removed the login_struct, it's private to the login handler.
The secret is now a property of the worker (not specific to ajp14 ).
logon method is no longer needed, normal message handlers are used instead.
Revision Changes Path
1.6 +5 -52 jakarta-tomcat-connectors/jk/native2/include/jk_worker.h
Index: jk_worker.h
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_worker.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- jk_worker.h 2001/12/07 23:10:34 1.5
+++ jk_worker.h 2001/12/12 22:01:49 1.6
@@ -58,7 +58,7 @@
/***************************************************************************
* Description: Workers controller header file *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.5 $ *
+ * Version: $Revision: 1.6 $ *
***************************************************************************/
#ifndef JK_WORKER_H
@@ -71,6 +71,7 @@
#include "jk_mt.h"
#include "jk_uriMap.h"
#include "jk_objCache.h"
+#include "jk_msg.h"
#ifdef __cplusplus
extern "C" {
@@ -80,55 +81,10 @@
struct jk_endpoint;
struct jk_env;
struct jk_objCache;
+struct jk_msg;
typedef struct jk_worker jk_worker_t;
-
/*
- * The login structure
- */
-typedef struct jk_login_service jk_login_service_t;
-#define AJP14_ENTROPY_SEED_LEN 32 /* we're using MD5 => 32 chars
*/
-#define AJP14_COMPUTED_KEY_LEN 32 /* we're using MD5 also */
-
-struct jk_login_service {
-
- /*
- * Pointer to web-server name
- */
- char * web_server_name;
-
- /*
- * Pointer to servlet-engine name
- */
- char * servlet_engine_name;
-
- /*
- * Pointer to secret key
- */
- char * secret_key;
-
- /*
- * Received entropy seed
- */
- char entropy[AJP14_ENTROPY_SEED_LEN + 1];
-
- /*
- * Computed key
- */
- char computed_key[AJP14_COMPUTED_KEY_LEN + 1];
-
- /*
- * What we want to negociate
- */
- unsigned long negociation;
-
- /*
- * What we received from servlet engine
- */
- unsigned long negociated;
-};
-
-/*
* The worker 'class', which represents something to which the web server
* can delegate requests.
*
@@ -213,7 +169,8 @@
/* struct jk_endpoint **ep_cache; */
int proto;
- struct jk_login_service *login;
+ /* Password for ajp14+ connections. If null we default to ajp13.*/
+ char * secret;
/* Each worker can be part of a load-balancer scheme.
* The information can be accessed by other components -
@@ -230,10 +187,6 @@
jk_worker_t **lb_workers;
int num_of_workers;
- int (* logon)(struct jk_endpoint *ae,
- jk_logger_t *l);
-
-
/*
* For all of the below (except destroy), the first argument is
* essentially a 'this' pointer.
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
