From 82a3ebfff9b19d2f1e3d649eb8d3d3ed17b9df10 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Michal=20Voc=C5=AF?= Date: Fri, 2 Jun 2006 13:01:59 +0000 Subject: [PATCH] * updates to use modified il_string interface --- org.glite.lb.client/Makefile | 4 ++-- org.glite.lb.client/src/notification.c | 10 +++++++--- org.glite.lb.client/src/prod_proto.c | 15 +++++++++++++-- 3 files changed, 22 insertions(+), 7 deletions(-) diff --git a/org.glite.lb.client/Makefile b/org.glite.lb.client/Makefile index 0e176c6..b219539 100644 --- a/org.glite.lb.client/Makefile +++ b/org.glite.lb.client/Makefile @@ -275,7 +275,7 @@ producer_test.o: %.o: %.cpp ${CXX} -c ${CXXFLAGS} ${TEST_INC} ${GLOBUSINC} $< man: ${MAN_GZ} - + stage: compile ${FAKELIB} ${FAKETHRLIB} $(MAKE) install PREFIX=${stagedir} ${INSTALL} -m 644 ${FAKELIB} ${FAKETHRLIB} ${stagedir}/lib @@ -292,7 +292,7 @@ distbin: $(MAKE) install PREFIX=`pwd`/tmpbuilddir${stagedir} save_dir=`pwd`; cd tmpbuilddir${stagedir} && tar -czf $$save_dir/${top_srcdir}/${distdir}/${package}-${version}_bin.tar.gz *; cd $$save_dir rm -rf tmpbuilddir - + install: mkdir -p ${PREFIX}/bin mkdir -p ${PREFIX}/sbin diff --git a/org.glite.lb.client/src/notification.c b/org.glite.lb.client/src/notification.c index a9fe57b..5899d9b 100644 --- a/org.glite.lb.client/src/notification.c +++ b/org.glite.lb.client/src/notification.c @@ -818,9 +818,13 @@ select: goto err; /* error set in send_reply() */ } - if(decode_il_msg(&event_char, ctx->connPoolNotif[0].buf) < 0) - return edg_wll_SetError(ctx, EDG_WLL_IL_PROTO, "decoding event string"); - + { + il_octet_string_t ev; + + if(decode_il_msg(&ev, ctx->connPoolNotif[0].buf) < 0) + return edg_wll_SetError(ctx, EDG_WLL_IL_PROTO, "decoding event string"); + event_char = ev.data; + } /****************************************************************/ /* end of notif-interlogger message exchange */ /****************************************************************/ diff --git a/org.glite.lb.client/src/prod_proto.c b/org.glite.lb.client/src/prod_proto.c index 19822e6..a652916 100644 --- a/org.glite.lb.client/src/prod_proto.c +++ b/org.glite.lb.client/src/prod_proto.c @@ -288,7 +288,13 @@ int edg_wll_log_proto_client_proxy(edg_wll_Context context, edg_wll_PlainConnect lbproto_code = 0; edg_wll_ResetError(context); - len = encode_il_msg(&buffer, logline); + { + il_octet_string_t ll; + + ll.len = strlen(logline); + ll.data = logline; + len = encode_il_msg(&buffer, &ll); + } if(len < 0) { edg_wll_SetError(context,ENOMEM,"edg_wll_log_proto_client_proxy(): error encoding message"); goto edg_wll_log_proto_client_proxy_end; @@ -364,7 +370,12 @@ int edg_wll_log_proto_client_direct(edg_wll_Context context, edg_wll_GssConnecti edg_wll_ResetError(context); /* encode message */ - len = encode_il_msg(&buffer, logline); + { + il_octet_string_t ll; + + ll.len=strlen(logline); ll.data=logline; + len = encode_il_msg(&buffer, &ll); + } if(len < 0) { edg_wll_SetError(context, ENOMEM, "edg_wll_log_proto_client_direct(): error encoding message"); goto edg_wll_log_proto_client_direct_end; -- 1.8.2.3