From 37d5a79108cf56bafd49d67e1a55790397e3bc4e Mon Sep 17 00:00:00 2001 From: cvs2svn Date: Fri, 2 Sep 2005 12:17:44 +0000 Subject: [PATCH] This commit was manufactured by cvs2svn to create branch 'glite-lb- server_branch_1_3_0_2'. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Sprout from glite-lb-server_branch_1_2_4 2005-08-08 09:33:02 UTC cvs2svn 'This commit was manufactured by cvs2svn to create branch 'glite-lb-' Cherrypick from master 2005-09-02 12:17:37 UTC Aleš Křenek 'Incremented build number [GLBUILDER]': org.glite.lb.server/project/version.properties org.glite.lb.server/src/request.c --- org.glite.lb.server/project/version.properties | 5 +++-- org.glite.lb.server/src/request.c | 14 +++++++++++--- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/org.glite.lb.server/project/version.properties b/org.glite.lb.server/project/version.properties index 21bc091..1455d3d 100644 --- 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 --- 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; -- 1.8.2.3