pier 01/07/19 16:51:48
Modified: webapp/lib pr_warp_config.c
Log:
Changed names for configuration functions.
Revision Changes Path
1.4 +13 -5 jakarta-tomcat-connectors/webapp/lib/pr_warp_config.c
Index: pr_warp_config.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/lib/pr_warp_config.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pr_warp_config.c 2001/07/19 04:25:24 1.3
+++ pr_warp_config.c 2001/07/19 23:51:48 1.4
@@ -54,10 +54,10 @@
* *
* ========================================================================= */
-/* @version $Id: pr_warp_config.c,v 1.3 2001/07/19 04:25:24 pier Exp $ */
+/* @version $Id: pr_warp_config.c,v 1.4 2001/07/19 23:51:48 pier Exp $ */
#include "pr_warp.h"
-wa_boolean n_check(wa_connection *conn, warp_packet *pack) {
+wa_boolean c_check(wa_connection *conn, warp_packet *pack) {
warp_config *conf=(warp_config *)conn->conf;
int maj=-1;
int min=-1;
@@ -99,7 +99,7 @@
return(wa_true);
}
-wa_boolean n_configure(wa_connection *conn) {
+wa_boolean c_configure(wa_connection *conn) {
warp_config *conf=(warp_config *)conn->conf;
wa_chain *elem=warp_applications;
apr_pool_t *pool=NULL;
@@ -115,11 +115,12 @@
if ((pack=p_create(wa_pool))==NULL) {
wa_log(WA_MARK,"Cannot create WARP configuration packet");
+ n_disconnect(conn);
apr_pool_destroy(pool);
return(wa_false);
}
- if ((ret=n_check(conn,pack))==wa_false) n_disconnect(conn);
+ if ((ret=c_check(conn,pack))==wa_false) n_disconnect(conn);
while (elem!=NULL) {
wa_application *appl=(wa_application *)elem->curr;
@@ -136,6 +137,7 @@
if (n_recv(conf->sock,pack)!=wa_true) {
wa_log(WA_MARK,"Cannot read packet (%s:%d)",WA_MARK);
+ n_disconnect(conn);
return(wa_false);
}
if (pack->type==TYPE_ERROR) {
@@ -148,10 +150,10 @@
pack->type=TYPE_FATAL;
p_write_string(pack,"Invalid packet received");
n_send(conf->sock,pack);
+ n_disconnect(conn);
}
p_read_int(pack,(int *)&appl->conf);
p_read_string(pack,&temp);
- wa_debug(WA_MARK,"TEMP=\"%s\"",temp);
appl->lpth=apr_pstrdup(wa_pool,temp);
appl->depl=wa_true;
wa_debug(WA_MARK,"Application \"%s\" deployed with root=%s id=%d",
@@ -166,10 +168,16 @@
if (n_recv(conf->sock,pack)!=wa_true) {
wa_log(WA_MARK,"Cannot read packet (%s:%d)",WA_MARK);
+ n_disconnect(conn);
return(wa_false);
}
if (pack->type!=TYPE_CONF_PROCEED) {
wa_log(WA_MARK,"Cannot proceed on this connection");
+ p_reset(pack);
+ pack->type=TYPE_FATAL;
+ p_write_string(pack,"Expected PROCEED packet not received");
+ n_send(conf->sock,pack);
+ n_disconnect(conn);
return(wa_false);
}
