From: Aleš Křenek <ljocha@ics.muni.cz>
Date: Mon, 26 Feb 2007 16:32:35 +0000 (+0000)
Subject: merge 3.0->3.1, #4
X-Git-Tag: glite-lb-logger_R_1_3_5_1~1
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=25de85db3cf3ee25872a9113f7fcb44aa97feb26;p=jra1mw.git

merge 3.0->3.1, #4
---

diff --git a/org.glite.lb.logger/src/logd.c b/org.glite.lb.logger/src/logd.c
index 775f789..5ab58e0 100644
--- a/org.glite.lb.logger/src/logd.c
+++ b/org.glite.lb.logger/src/logd.c
@@ -6,6 +6,7 @@
 #include <sys/wait.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
+#include <arpa/inet.h>
 #include <signal.h>
 #include <unistd.h> 
 #include <string.h>
@@ -157,12 +158,16 @@ doit(int socket, gss_cred_id_t cred_handle, char *file_name_prefix, int noipc, i
     OM_uint32	min_stat;
     gss_OID	name_type = GSS_C_NO_OID;
 
+    struct sockaddr_in	peer;
+    socklen_t	alen = sizeof peer;
+
+    getpeername(socket,(struct sockaddr *) &peer,&alen);
     /* authentication */
-    edg_wll_ll_log(LOG_INFO,"Processing authentication:\n");
+    edg_wll_ll_log(LOG_INFO,"%s: Processing authentication:\n",inet_ntoa(peer.sin_addr));
 // FIXME - put here some meaningfull value of timeout + do somthing if timeouted
     ret = edg_wll_gss_accept(cred_handle,socket,&timeout,&con, &gss_stat);
     if (ret) {
-	    edg_wll_ll_log(LOG_ERR,"edg_wll_gss_accept() failed\n");
+	    edg_wll_ll_log(LOG_ERR,"%s: edg_wll_gss_accept() failed\n",inet_ntoa(peer.sin_addr));
 	    return(-1);
     }
 
@@ -172,7 +177,7 @@ doit(int socket, gss_cred_id_t cred_handle, char *file_name_prefix, int noipc, i
     if (GSS_ERROR(gss_stat.major_status)) {
        char *gss_err;
        edg_wll_gss_get_error(&gss_stat, "Cannot read client identification", &gss_err);
-       edg_wll_ll_log(LOG_WARNING, "%s\n", gss_err);
+       edg_wll_ll_log(LOG_WARNING, "%s: %s\n", inet_ntoa(peer.sin_addr),gss_err);
        free(gss_err);
     } else {
        gss_stat.major_status = gss_display_name(&gss_stat.minor_status, client_name,
@@ -180,7 +185,7 @@ doit(int socket, gss_cred_id_t cred_handle, char *file_name_prefix, int noipc, i
        if (GSS_ERROR(gss_stat.major_status)) {
 	  char *gss_err;
 	  edg_wll_gss_get_error(&gss_stat, "Cannot process client identification", &gss_err);
-	  edg_wll_ll_log(LOG_WARNING, "%s\n", gss_err);
+	  edg_wll_ll_log(LOG_WARNING, "%s: %s\n",inet_ntoa(peer.sin_addr),gss_err);
 	  free(gss_err);
        }
     }