This commit was manufactured by cvs2svn to create branch 'glite-lb-

server_branch_1_3_0_2'.

Sprout from glite-lb-server_branch_1_2_4 2005-08-08 09:33:02 UTC cvs2svn <admin@example.com> 'This commit was manufactured by cvs2svn to create branch 'glite-lb-'
Cherrypick from master 2005-09-02 12:17:37 UTC Aleš Křenek <ljocha@ics.muni.cz> 'Incremented build number [GLBUILDER]':
    org.glite.lb.server/project/version.properties
    org.glite.lb.server/src/request.c

diff --git a/org.glite.lb.server/project/version.properties b/org.glite.lb.server/project/version.properties
index 21bc091..1455d3d 100644 (file)
--- a/org.glite.lb.server/project/version.properties
+++ b/org.glite.lb.server/project/version.properties
@@ -1,3 +1,4 @@
-#Thu May 19 13:16:56 CEST 2005
-module.version=1.2.4
+#Fri Sep 02 14:18:35 CEST 2005
+module.version=1.3.0
+module.build=2
 module.age=1

diff --git a/org.glite.lb.server/src/request.c b/org.glite.lb.server/src/request.c
index a3288a4..3ad753b 100644 (file)
--- a/org.glite.lb.server/src/request.c
+++ b/org.glite.lb.server/src/request.c
@@ -16,15 +16,23 @@
 #define UNUSED_VAR
 #endif
     
+/* XXX: is it OK to assume buf always contains the whole message? */
 int 
 handle_request(edg_wll_Context ctx,char *buf)
 {
-  char *event;
-  int ret;
+  char *event,*start = buf,y[1000];
+  int ret,x;
 
   edg_wll_ResetError(ctx);
 
-  ret = decode_il_msg(&event, buf);
+/* XXX: detect interlogger <= 1.1.1 */
+  ret = sscanf(buf,"%d %999s\n%d",&x,y,&x);
+  if (ret == 3) {
+       start = strchr(buf,'\n');
+       start++;
+  }
+
+  ret = decode_il_msg(&event, start);
   if(ret < 0) {
     edg_wll_SetError(ctx,EDG_WLL_IL_PROTO,"reading event string");
     return EDG_WLL_IL_PROTO;