From 09f29a25dd8115031f31852d59e10aea3d933a1b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ale=C5=A1=20K=C5=99enek?= Date: Tue, 15 Jul 2008 16:08:38 +0000 Subject: [PATCH] understand both old and current sync flag --- org.glite.lb.logger/src/logd_proto.c | 6 +++--- org.glite.lb.logger/src/server_msg.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/org.glite.lb.logger/src/logd_proto.c b/org.glite.lb.logger/src/logd_proto.c index 8b93ae7..6c4015d 100644 --- a/org.glite.lb.logger/src/logd_proto.c +++ b/org.glite.lb.logger/src/logd_proto.c @@ -496,7 +496,7 @@ int edg_wll_log_proto_server(edg_wll_GssConnection *con, struct timeval *timeout #endif /* if not priority send now the answer back to client */ - if (!(event->any.priority & EDG_WLL_LOGFLAG_SYNC)) { + if (!(event->any.priority & (EDG_WLL_LOGFLAG_SYNC|EDG_WLL_LOGFLAG_SYNC_COMPAT))) { if (!send_answer_back(con,answer,timeout)) { answer_sent = 1; } @@ -504,7 +504,7 @@ int edg_wll_log_proto_server(edg_wll_GssConnection *con, struct timeval *timeout /* send message via IPC (UNIX socket) */ if (!noipc) { - if (event->any.priority & EDG_WLL_LOGFLAG_SYNC) { + if (event->any.priority & (EDG_WLL_LOGFLAG_SYNC|EDG_WLL_LOGFLAG_SYNC_COMPAT)) { edg_wll_ll_log(LOG_DEBUG,"Initializing 2nd UNIX socket (%s) for priority messages confirmation...",confirm_sock_name); if(init_confirmation() < 0) { edg_wll_ll_log(LOG_DEBUG,"error.\n"); @@ -528,7 +528,7 @@ int edg_wll_log_proto_server(edg_wll_GssConnection *con, struct timeval *timeout goto edg_wll_log_proto_server_end_1; } else edg_wll_ll_log(LOG_DEBUG,"o.k.\n"); - if (event->any.priority & EDG_WLL_LOGFLAG_SYNC) { + if (event->any.priority & (EDG_WLL_LOGFLAG_SYNC|EDG_WLL_LOGFLAG_SYNC_COMPAT)) { edg_wll_ll_log(LOG_INFO,"Waiting for confirmation..."); if ((count = wait_for_confirmation(timeout, &answer)) < 0) { edg_wll_ll_log(LOG_INFO,"error.\n"); diff --git a/org.glite.lb.logger/src/server_msg.c b/org.glite.lb.logger/src/server_msg.c index 5323ec6..90dec49 100644 --- a/org.glite.lb.logger/src/server_msg.c +++ b/org.glite.lb.logger/src/server_msg.c @@ -42,7 +42,7 @@ create_msg(il_octet_string_t *ev, char **buffer, long *receipt, time_t *expires) p += 12; /* skip the key and = */ n = atoi(p); - if((n & EDG_WLL_LOGFLAG_SYNC) == 0) { + if((n & (EDG_WLL_LOGFLAG_SYNC|EDG_WLL_LOGFLAG_SYNC_COMPAT)) == 0) { /* normal asynchronous message */ *receipt = 0L; } -- 1.8.2.3