cvs commit: jakarta-tomcat-connectors/jk/native/common jk_ajp14.h
mturk 2004/11/08 05:25:57
Modified:jk/native/common jk_ajp14.h
Log:
Format code
Revision ChangesPath
1.14 +72 -72jakarta-tomcat-connectors/jk/native/common/jk_ajp14.h
Index: jk_ajp14.h
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp14.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- jk_ajp14.h8 Oct 2004 07:50:40 - 1.13
+++ jk_ajp14.h8 Nov 2004 13:25:57 - 1.14
@@ -208,96 +208,96 @@
/*
* The login structure
*/
-typedef struct jk_login_service jk_login_service_t;
+typedef struct jk_login_service jk_login_service_t;
-struct jk_login_service
-{
+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;
-};
+/*
+ * 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;
+};
/*
* functions defined here
*/
-void ajp14_compute_md5(jk_login_service_t *s, jk_logger_t *l);
+void ajp14_compute_md5(jk_login_service_t *s, jk_logger_t *l);
-int ajp14_marshal_login_init_into_msgb(jk_msg_buf_t *msg,
- jk_login_service_t *s,
- jk_logger_t *l);
-
-int ajp14_unmarshal_login_seed(jk_msg_buf_t *msg,
- jk_login_service_t *s, jk_logger_t *l);
-
-int ajp14_marshal_login_comp_into_msgb(jk_msg_buf_t *msg,
- jk_login_service_t *s,
- jk_logger_t *l);
+int ajp14_marshal_login_init_into_msgb(jk_msg_buf_t *msg,
+ jk_login_service_t *s,
+ jk_logger_t *l);
-int ajp14_unmarshal_log_ok(jk_msg_buf_t *msg,
+int ajp14_unmarshal_login_seed(jk_msg_buf_t *msg,
jk_login_service_t *s, jk_logger_t *l);
-int ajp14_unmarshal_log_nok(jk_msg_buf_t *msg, jk_logger_t *l);
+int ajp14_marshal_login_comp_into_msgb(jk_msg_buf_t *msg,
+ jk_login_service_t *s,
+ jk_logger_t *l);
-int ajp14_marshal_shutdown_into_msgb(jk_msg_buf_t *msg,
- jk_login_service_t *s,
- jk_logger_t *l);
+int ajp14_unmarshal_log_ok(jk_msg_buf_t *msg,
+ jk_login_service_t *s, jk_logger_t *l);
-int ajp14_unmarshal_shutdown_nok(jk_msg_buf_t *msg, jk_logger_t *l);
+int ajp14_unmarshal_log_nok(jk_msg_buf_t *msg, jk_logger_t *l);
-int ajp14_marshal_unknown_packet_into_msgb(jk_msg_buf_t *msg,
- jk_msg_buf_t *unk,
- jk_logger_t *l);
+int ajp14_marshal_shutdown_into_msgb(jk_msg_buf_t *msg,
+ jk_login_service_t *s,
+ jk_logger_t *l);
-int ajp14_marshal_context_query_into_msgb(jk_msg_buf_t *msg,
- char *virtual, jk_logger_t *l);
+int ajp14_unmarshal_shutdown_nok(jk_msg_buf_t *msg, jk_logger_t *l);
-int ajp14_unmarshal_context_info(jk_msg_buf_t *msg,
- jk_context_t *context, jk_logger_t *l);
+int ajp14_marshal_unknown_packet_into_msgb(jk_msg_buf_t *msg,
+
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_ajp14.h
costin 01/11/26 09:19:16 Modified:jk/native/common jk_ajp14.h Log: Just indentation, getting everything bellow 80 chars lines. ( it seems some 4-space tabs got in, I've set my emacs to use only spaces, I hope this will solve the problem ) Revision ChangesPath 1.8 +83 -138 jakarta-tomcat-connectors/jk/native/common/jk_ajp14.h Index: jk_ajp14.h === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp14.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- jk_ajp14.h2001/11/20 16:58:46 1.7 +++ jk_ajp14.h2001/11/26 17:19:16 1.8 @@ -58,7 +58,7 @@ /*** * Description: Next generation bi-directional protocol handler. * * Author: Henri Gomez [EMAIL PROTECTED] * - * Version: $Revision: 1.7 $ * + * Version: $Revision: 1.8 $ * ***/ #ifndef JK_AJP14_H #define JK_AJP14_H @@ -72,77 +72,54 @@ #define AJP14_PROTO 14 -#define AJP14_DEF_HOST (localhost) -#define AJP14_DEF_PORT (8011) -#define AJP14_READ_BUF_SIZE (8*1024) -#define AJP14_DEF_RETRY_ATTEMPTS(1) -#define AJP14_DEF_CACHE_SZ (1) -#define AJP14_MAX_SEND_BODY_SZ (DEF_BUFFER_SZ - 6) -#define AJP14_HEADER_LEN (4) -#define AJP14_HEADER_SZ_LEN (2) +#define AJP14_DEF_HOST (localhost) +#define AJP14_DEF_PORT (8011) +#define AJP14_READ_BUF_SIZEd(8*1024) +#define AJP14_DEF_RETRY_ATTEMPTS (1) +#define AJP14_DEF_CACHE_SZ (1) +#define AJP14_MAX_SEND_BODY_SZ (DEF_BUFFER_SZ - 6) +#define AJP14_HEADER_LEN (4) +#define AJP14_HEADER_SZ_LEN (2) /* - * Initial Login Phase (web server - servlet engine) - */ -#define AJP14_LOGINIT_CMD(unsigned char)0x10 - -/* - * Second Login Phase (servlet engine - web server), md5 seed is received - */ -#define AJP14_LOGSEED_CMD(unsigned char)0x11 - -/* - * Third Login Phase (web server - servlet engine), md5 of seed + secret is sent - */ -#define AJP14_LOGCOMP_CMD(unsigned char)0x12 - -/* - * Login Accepted (servlet engine - web server) - */ -#define AJP14_LOGOK_CMD (unsigned char)0x13 - -/* - * Login Rejected (servlet engine - web server), will be logged - */ -#define AJP14_LOGNOK_CMD (unsigned char)0x14 - -/* * Context Query (web server - servlet engine), which URI are handled by servlet engine ? */ -#define AJP14_CONTEXT_QRY_CMD(unsigned char)0x15 +#define AJP14_CONTEXT_QRY_CMD(unsigned char)0x15 /* * Context Info (servlet engine - web server), URI handled response */ -#define AJP14_CONTEXT_INFO_CMD (unsigned char)0x16 +#define AJP14_CONTEXT_INFO_CMD (unsigned char)0x16 /* * Context Update (servlet engine - web server), status of context changed */ -#define AJP14_CONTEXT_UPDATE_CMD (unsigned char)0x17 +#define AJP14_CONTEXT_UPDATE_CMD (unsigned char)0x17 /* * Servlet Engine Status (web server - servlet engine), what's the status of the servlet engine ? */ -#define AJP14_STATUS_CMD (unsigned char)0x18 +#define AJP14_STATUS_CMD (unsigned char)0x18 /* - * Secure Shutdown command (web server - servlet engine), please servlet stop yourself. + * Secure Shutdown command (web server - servlet engine), + * please servlet stop yourself. */ -#define AJP14_SHUTDOWN_CMD (unsigned char)0x19 +#define AJP14_SHUTDOWN_CMD (unsigned char)0x19 /* * Secure Shutdown command Accepted (servlet engine - web server) */ -#define AJP14_SHUTOK_CMD (unsigned char)0x1A +#define AJP14_SHUTOK_CMD (unsigned char)0x1A /* * Secure Shutdown Rejected (servlet engine - web server) */ -#define AJP14_SHUTNOK_CMD(unsigned char)0x1B +#define AJP14_SHUTNOK_CMD(unsigned char)0x1B /* - * Context Status (web server - servlet engine), what's the status of the context ? + * Context Status (web server - servlet engine), what's + * the status of the context ? */ #define AJP14_CONTEXT_STATE_CMD (unsigned char)0x1C @@ -152,7 +129,8 @@ #define AJP14_CONTEXT_STATE_REP_CMD (unsigned char)0x1D /* - * Unknown Packet Reply (web server - servlet engine), when a packet couldn't be decoded + * Unknown Packet Reply (web server - servlet
