hgomez 01/06/07 07:40:53
Modified: jk/src/native/common jk_util.c jk_util.h
Log:
Added secretkey support from worker.properties
Revision Changes Path
1.3 +15 -5 jakarta-tomcat-connectors/jk/src/native/common/jk_util.c
Index: jk_util.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/src/native/common/jk_util.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jk_util.c 2001/05/15 10:23:03 1.2
+++ jk_util.c 2001/06/07 14:40:50 1.3
@@ -57,7 +57,7 @@
* Description: Utility functions (mainly configuration) *
* Author: Henri Gomez <[EMAIL PROTECTED]> *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.2 $ *
+ * Version: $Revision: 1.3 $ *
***************************************************************************/
@@ -83,6 +83,7 @@
#define BALANCED_WORKERS ("balanced_workers")
#define WORKER_AJP12 ("ajp12")
#define DEFAULT_WORKER_TYPE JK_AJP12_WORKER_NAME
+#define SECRET_KEY_OF_WORKER ("secretkey")
#define DEFAULT_WORKER JK_AJP12_WORKER_NAME
#define WORKER_LIST_PROPERTY_NAME ("worker.list")
@@ -366,6 +367,18 @@
return map_get_int(m, buf, def);
}
+char * jk_get_worker_secret_key(jk_map_t *m,
+ const char *wname)
+{
+ char buf[1024];
+
+ if(!m || !wname) {
+ return NULL;
+ }
+
+ sprintf(buf, "%s.%s.%s", PREFIX_OF_WORKER, wname, SECRET_KEY_OF_WORKER);
+ return map_get_string(m, buf, NULL);
+}
int jk_get_worker_list(jk_map_t *m,
char ***list,
@@ -417,10 +430,7 @@
char **ar = NULL;
sprintf(buf, "%s.%s.%s", PREFIX_OF_WORKER, lb_wname, BALANCED_WORKERS);
- ar = map_get_string_list(m,
- buf,
- num_of_wokers,
- NULL);
+ ar = map_get_string_list(m, buf, num_of_wokers, NULL);
if(ar) {
*list = ar;
return JK_TRUE;
1.2 +4 -1 jakarta-tomcat-connectors/jk/src/native/common/jk_util.h
Index: jk_util.h
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/src/native/common/jk_util.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jk_util.h 2001/05/14 09:42:23 1.1
+++ jk_util.h 2001/06/07 14:40:51 1.2
@@ -56,7 +56,7 @@
/***************************************************************************
* Description: Various utility functions *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.1 $ *
+ * Version: $Revision: 1.2 $ *
***************************************************************************/
#ifndef _JK_UTIL_H
#define _JK_UTIL_H
@@ -106,6 +106,9 @@
int jk_get_worker_cache_size(jk_map_t *m,
const char *wname,
int def);
+
+char * jk_get_worker_secret_key(jk_map_t *m,
+ const char *wname);
void jk_set_log_format(char *logformat);
