From b106a54f92adf4e050049887eb0be8ce0da56990 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ji=C5=99=C3=AD=20=C5=A0kr=C3=A1bal?= Date: Wed, 8 Dec 2004 11:50:34 +0000 Subject: [PATCH] - using right data for buffers and for comunication --- org.glite.lb.server/Makefile | 2 +- org.glite.lb.server/project/version.properties | 4 ++-- org.glite.lb.server/src/lbproxy.c | 6 +++--- org.glite.lb.server/src/stored_master.c | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/org.glite.lb.server/Makefile b/org.glite.lb.server/Makefile index 3b620e8..c4d2927 100644 --- a/org.glite.lb.server/Makefile +++ b/org.glite.lb.server/Makefile @@ -143,7 +143,7 @@ glite_lb_bkindex: ${INDEX_OBJS} default all: compile -compile: glite_lb_bkserverd glite_lb_bkindex +compile: glite_lb_bkserverd glite_lb_bkindex glite_lb_proxy check: compile test.xml test.query -echo check.query not complete yet diff --git a/org.glite.lb.server/project/version.properties b/org.glite.lb.server/project/version.properties index b9dccfd..95e8fab 100644 --- a/org.glite.lb.server/project/version.properties +++ b/org.glite.lb.server/project/version.properties @@ -1,4 +1,4 @@ -#Wed Dec 08 06:07:11 CET 2004 -module.version=0.6.2 +#Tue Dec 07 06:14:49 CET 2004 +module.version=0.7.2 module.build=111 module.age=4 diff --git a/org.glite.lb.server/src/lbproxy.c b/org.glite.lb.server/src/lbproxy.c index 8413cfe..345f814 100644 --- a/org.glite.lb.server/src/lbproxy.c +++ b/org.glite.lb.server/src/lbproxy.c @@ -374,15 +374,15 @@ int handle_conn(int conn, struct timeval client_start, void *data) ctx->p_tmp_timeout.tv_usec = total_to.tv_usec; } - ctx->connPlain = (edg_wll_Connection *) calloc(1, sizeof(edg_wll_Connection)); - if ( !ctx->connPlain ) { + ctx->connProxy = (edg_wll_ConnProxy *) calloc(1, sizeof(edg_wll_ConnProxy)); + if ( !ctx->connProxy ) { perror("calloc"); edg_wll_FreeContext(ctx); return -1; } - if ( edg_wll_plain_accept(conn, ctx->connPlain) ) { + if ( edg_wll_plain_accept(conn, &ctx->connProxy->conn) ) { perror("accept"); edg_wll_FreeContext(ctx); diff --git a/org.glite.lb.server/src/stored_master.c b/org.glite.lb.server/src/stored_master.c index 103a0fd..bfc2f8d 100644 --- a/org.glite.lb.server/src/stored_master.c +++ b/org.glite.lb.server/src/stored_master.c @@ -66,7 +66,7 @@ int edg_wll_StoreProtoProxy(edg_wll_Context ctx) edg_wll_ResetError(ctx); - ret = edg_wll_plain_read_full(ctx->connPlain, fbuf, 17, &ctx->p_tmp_timeout); + ret = edg_wll_plain_read_full(&ctx->connProxy->conn, fbuf, 17, &ctx->p_tmp_timeout); if ( ret < 0 ) return edg_wll_SetError(ctx, errno, "StoreProtoProxy() - reading data"); len = atoi(fbuf); @@ -75,7 +75,7 @@ int edg_wll_StoreProtoProxy(edg_wll_Context ctx) buf = malloc(len+1); if ( !buf ) return edg_wll_SetError(ctx, errno, "StoreProtoProxy()"); - if ( edg_wll_plain_read_full(ctx->connPlain, buf, len, &ctx->p_tmp_timeout) < 0) { + if ( edg_wll_plain_read_full(&ctx->connProxy->conn, buf, len, &ctx->p_tmp_timeout) < 0) { free(buf); return edg_wll_SetError(ctx, errno, "StoreProtoProxy() - reading data"); } @@ -85,7 +85,7 @@ int edg_wll_StoreProtoProxy(edg_wll_Context ctx) free(buf); if ( (len = create_reply(ctx, fbuf, sizeof fbuf)) ) { - if ( edg_wll_plain_write_full(ctx->connPlain, fbuf, len, &ctx->p_tmp_timeout) < 0 ) + if ( edg_wll_plain_write_full(&ctx->connProxy->conn, fbuf, len, &ctx->p_tmp_timeout) < 0 ) return edg_wll_SetError(ctx, errno, "StoreProtoProxy() - sending reply"); } else edg_wll_SetError(ctx, E2BIG, "create_reply()"); -- 1.8.2.3