From: Aleš Křenek <ljocha@ics.muni.cz>
Date: Wed, 15 Mar 2006 18:31:46 +0000 (+0000)
Subject: merge 1.5
X-Git-Tag: merge_for_3_1_after~1
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=2b7e885a4e8d56d3d31af1339679285fbc0dd5a1;p=jra1mw.git

merge 1.5
---

diff --git a/org.glite.lb.logger/Makefile b/org.glite.lb.logger/Makefile
index 5f9cb69..0690f3d 100644
--- a/org.glite.lb.logger/Makefile
+++ b/org.glite.lb.logger/Makefile
@@ -92,19 +92,15 @@ INTERLOG_TEST_OBJS:= \
 	il_test.o 
 
 glite_lb_logd: ${LOGD_OBJS}
-	${LINK} -o $@ ${LOGD_OBJS} ${COMMON_LIB}_${nothrflavour} ${GLITE_GSS_LIB}_${nothrflavour} ${EXT_LIBS} ${GLOBUS_LIBS}
+	${LINK} -o $@ ${LOGD_OBJS} ${COMMON_LIB}_${nothrflavour} 
 
 glite_lb_interlogd: ${INTERLOG_OBJS}
 	${LINK} -o $@ ${INTERLOG_OBJS} \
-		${COMMON_LIB}_${thrflavour} \
-		${GLITE_GSS_LIB}_${nothrflavour} \
-		${EXT_LIBS} ${GLOBUS_THRLIBS} -lpthread
+		${COMMON_LIB}_${thrflavour} 
 
 glite_lb_notif_interlogd: ${INTERLOG_NOBJS}
 	${LINK} -o $@ ${INTERLOG_NOBJS} \
-		${COMMON_LIB}_${thrflavour} \
-		${GLITE_GSS_LIB}_${nothrflavour} \
-		${EXT_LIBS} ${GLOBUS_THRLIBS} -lpthread
+		${COMMON_LIB}_${thrflavour}
 
 default: all
 
@@ -125,7 +121,7 @@ check.ll:
 	-echo commented out -- fix needed
 
 check.il: ${INTERLOG_TEST_OBJS}
-	${LINKXX} -o $@ ${COMMON_LIB}_${thrflavour} ${GLITE_GSS_LIB}_${nothrflavour} ${EXT_LIBS} ${GLOBUS_THRLIBS} ${TEST_LIBS} -lpthread $+
+	${LINKXX} -o $@ ${COMMON_LIB}_${thrflavour} ${GLITE_GSS_LIB}_${nothrflavour} ${TEST_LIBS} -lpthread $+
 
 dist: distsrc distbin
 
diff --git a/org.glite.lb.logger/project/build.number b/org.glite.lb.logger/project/build.number
index 19840f2..373e7a4 100644
--- a/org.glite.lb.logger/project/build.number
+++ b/org.glite.lb.logger/project/build.number
@@ -1,2 +1,2 @@
-#Sat Oct 15 06:54:17 CEST 2005
-module.build=153
+#Wed Mar 15 04:56:46 CET 2006
+module.build=0233
diff --git a/org.glite.lb.logger/project/version.properties b/org.glite.lb.logger/project/version.properties
index 140e77e..41c10c7 100644
--- a/org.glite.lb.logger/project/version.properties
+++ b/org.glite.lb.logger/project/version.properties
@@ -1,4 +1,3 @@
 #Fri Sep 02 14:18:17 CEST 2005
-module.version=1.3.0
-module.build=2
-module.age=1
+module.version=1.2.3
+module.age=0
diff --git a/org.glite.lb.logger/src/send_event.c b/org.glite.lb.logger/src/send_event.c
index 602fd0d..7f1eb9d 100644
--- a/org.glite.lb.logger/src/send_event.c
+++ b/org.glite.lb.logger/src/send_event.c
@@ -132,7 +132,7 @@ get_reply(struct event_queue *eq, char **buf, int *code_min)
 {
   char *msg=NULL;
   int ret, code;
-  size_t len, l;
+  int len, l;
   struct timeval tv;
   struct reader_data data;
 
diff --git a/org.glite.lb.proxy/Makefile b/org.glite.lb.proxy/Makefile
index 254cbc8..9dc873c 100644
--- a/org.glite.lb.proxy/Makefile
+++ b/org.glite.lb.proxy/Makefile
@@ -70,7 +70,7 @@ endif
 
 
 SRVBONES_LIB:= -L${stagedir}/lib -lglite_lb_server_bones
-LB_SERVER_SHARE_LIB:= -L${stagedir}/lib -lglite_lb_bkserver
+LB_SERVER_SHARE_LIB:=${stagedir}/lib/libglite_lb_bkserver.a
 LB_PROXY_COMMON_LIB:= -L${stagedir}/lib -lglite_lb_common_${nothrflavour}
 COMMON_LIBS:= -L${stagedir}/lib -lglite_lb_common_${nothrflavour} -lglite_security_gss_${nothrflavour}
 GRIDSITE_LIBS = -lgridsite_globus `xml2-config --libs`
@@ -101,7 +101,7 @@ LB_PROXY_LIBS:= \
 
 
 
-glite_lb_proxy: lbproxy.o
+glite_lb_proxy: lbproxy.o ${LB_SERVER_SHARE_LIB}
 	@echo DEBUG: mysql_version=${mysql_version} mysql_prefix=${mysql_prefix}
 	@echo DEBUG: shell: x$(shell echo ${mysql_version} | cut -d. -f1,2)x
 	${LINK} -o $@ lbproxy.o ${LB_PROXY_LIBS}
@@ -141,9 +141,11 @@ install:
 	${INSTALL} -m 755 glite_lb_proxy ${PREFIX}/bin/glite-lb-proxy
 	${INSTALL} -m 644 ${top_srcdir}/config/glite-lb-dbsetup-proxy.sql ${PREFIX}/etc
 	${INSTALL} -m 755 ${top_srcdir}/config/startup ${PREFIX}/etc/init.d/glite-lb-proxy
-	if [ x${DOSTAGE} != xyes ]; then \
-		${INSTALL} -m 755 ${stagedir}/bin/glite-lb-interlogd ${PREFIX}/bin; \
-	fi
+
+# don't do it due to RPM conflict
+#	if [ x${DOSTAGE} != xyes ]; then \
+#		${INSTALL} -m 755 ${stagedir}/bin/glite-lb-interlogd ${PREFIX}/bin; \
+#	fi
 
 
 clean:
diff --git a/org.glite.lb.proxy/config/startup b/org.glite.lb.proxy/config/startup
index 60a03cf..b100d62 100755
--- a/org.glite.lb.proxy/config/startup
+++ b/org.glite.lb.proxy/config/startup
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GLITE_LOCATION=${GLITE_LOCATION:-/opt/glite}
-GLITE_LOCATION_VAR=${GLITE_LOCATION_VAR:-${GLITE_LOCATION}/var}
+GLITE_LOCATION_VAR=${GLITE_LOCATION_VAR:-/var/glite}
 
 [ -f /etc/glite.conf ] && . /etc/glite.conf
 [ -f $GLITE_LOCATION/etc/glite-wms.conf ] && . $GLITE_LOCATION/etc/glite-wms.conf
diff --git a/org.glite.lb.proxy/project/build.number b/org.glite.lb.proxy/project/build.number
index 8e91e0d..6f0927f 100644
--- a/org.glite.lb.proxy/project/build.number
+++ b/org.glite.lb.proxy/project/build.number
@@ -1,2 +1,2 @@
-#Sat Oct 15 06:58:34 CEST 2005
-module.build=10
+#Wed Mar 15 05:07:08 CET 2006
+module.build=0090
diff --git a/org.glite.lb.proxy/project/version.properties b/org.glite.lb.proxy/project/version.properties
index 33505fb..5c682ec 100644
--- a/org.glite.lb.proxy/project/version.properties
+++ b/org.glite.lb.proxy/project/version.properties
@@ -1,4 +1,3 @@
 #Fri Sep 02 14:18:53 CEST 2005
-module.version=1.3.0
-module.build=2
+module.version=1.2.6
 module.age=0
diff --git a/org.glite.lb.proxy/src/lbproxy.c b/org.glite.lb.proxy/src/lbproxy.c
index f8294ab..cd22a70 100644
--- a/org.glite.lb.proxy/src/lbproxy.c
+++ b/org.glite.lb.proxy/src/lbproxy.c
@@ -41,16 +41,11 @@ extern char *lbproxy_ilog_file_prefix;
 
 #define DEFAULTCS			"lbserver/@localhost:lbproxy"
 
-#define CON_QUEUE			20	/* accept() */
+#define CON_QUEUE		20	/* accept() */
 #define SLAVE_OVERLOAD		10	/* queue items per slave */
-#define CLNT_TIMEOUT		10	/* keep idle connection that many seconds */
-#define TOTAL_CLNT_TIMEOUT	60	/* one client may ask one slave multiple times */
-					/* but only limited time to avoid DoS attacks */
-#define CLNT_REJECT_TIMEOUT	100000	/* time limit for client rejection in !usec! */
-#define DNS_TIMEOUT      	5	/* how long wait for DNS lookup */
+#define IDLE_TIMEOUT		10	/* keep idle connection that many seconds */
+#define REQUEST_TIMEOUT		120	/* one client may ask one slave multiple times */
 #define SLAVE_CONNS_MAX		500	/* commit suicide after that many connections */
-#define MASTER_TIMEOUT		30 	/* maximal time of one-round of master network communication */
-#define SLAVE_TIMEOUT		30 	/* maximal time of one-round of slave network communication */
 
 /* file to store pid and generate semaphores key
  */
@@ -220,7 +215,7 @@ int main(int argc, char *argv[])
 	gethostname(host, sizeof host);
 	host[sizeof host - 1] = 0;
 	asprintf(&port, "%d", GLITE_WMSC_JOBID_DEFAULT_PORT);
-	dprintf(("server address: %s:%d\n", host, port));
+	dprintf(("server address: %s:%s\n", host, port));
 
 	service_table[SRV_SERVE].conn = socket(PF_UNIX, SOCK_STREAM, 0);
 	if ( service_table[SRV_SERVE].conn < 0 ) { perror("socket()"); return 1; }
@@ -310,11 +305,9 @@ int main(int argc, char *argv[])
 	glite_srvbones_set_param(GLITE_SBPARAM_SLAVES_COUNT, slaves);
 	glite_srvbones_set_param(GLITE_SBPARAM_SLAVE_OVERLOAD, SLAVE_OVERLOAD);
 	glite_srvbones_set_param(GLITE_SBPARAM_SLAVE_CONNS_MAX, SLAVE_CONNS_MAX);
-	to = (struct timeval){CLNT_TIMEOUT, 0};
-	glite_srvbones_set_param(GLITE_SBPARAM_CONNECT_TIMEOUT, &to);
-	to = (struct timeval){CLNT_TIMEOUT, 0};
+	to = (struct timeval){REQUEST_TIMEOUT, 0};
 	glite_srvbones_set_param(GLITE_SBPARAM_REQUEST_TIMEOUT, &to);
-	to = (struct timeval){TOTAL_CLNT_TIMEOUT, 0};
+	to = (struct timeval){IDLE_TIMEOUT, 0};
 	glite_srvbones_set_param(GLITE_SBPARAM_IDLE_TIMEOUT, &to);
 
 	glite_srvbones_run(clnt_data_init, service_table, sizofa(service_table), debug);
@@ -357,8 +350,7 @@ int handle_conn(int conn, struct timeval *timeout, void *data)
 {
 	struct clnt_data_t *cdata = (struct clnt_data_t *)data;
 	edg_wll_Context		ctx;
-	struct timeval		total_to = { TOTAL_CLNT_TIMEOUT,0 },
-						conn_start, now;
+	struct timeval		conn_start, now;
 
 	if ( !(ctx = (edg_wll_Context) calloc(1, sizeof(*ctx))) ) {
 		fprintf(stderr, "Couldn't create context");
@@ -379,13 +371,6 @@ int handle_conn(int conn, struct timeval *timeout, void *data)
 	ctx->semset = semset;
 	ctx->semaphores = semaphores;
 
-	ctx->p_tmp_timeout.tv_sec = SLAVE_TIMEOUT;
-	ctx->p_tmp_timeout.tv_usec = 0;
-	if ( total_to.tv_sec < ctx->p_tmp_timeout.tv_sec ) {
-		ctx->p_tmp_timeout.tv_sec = total_to.tv_sec;
-		ctx->p_tmp_timeout.tv_usec = total_to.tv_usec;
-	}
-	
 	ctx->srvName = strdup(host);
 	ctx->srvPort = atoi(port);
 	
diff --git a/org.glite.lb.utils/project/build.number b/org.glite.lb.utils/project/build.number
index 5cfec85..d3834f3 100644
--- a/org.glite.lb.utils/project/build.number
+++ b/org.glite.lb.utils/project/build.number
@@ -1 +1,2 @@
-module.build = 0
+#Wed Mar 15 05:01:47 CET 2006
+module.build=0080
diff --git a/org.glite.lb.utils/project/version.properties b/org.glite.lb.utils/project/version.properties
index 08606d2..4ecedd7 100755
--- a/org.glite.lb.utils/project/version.properties
+++ b/org.glite.lb.utils/project/version.properties
@@ -1,2 +1,2 @@
-module.version = 1.1.0
+module.version = 1.0.1
 module.age = 0