Changeset 283 for trunk/src/sh_error.c

Timestamp:

May 4, 2010, 10:28:11 PM (15 years ago)

Author:

katerina

Message:

Patch for ticket #207 (server logs client reports to prelude).

File:

• trunk/src/sh_error.c (modified) (6 diffs)

trunk/src/sh_error.c

@@ -841 +841 @@
 #ifdef SH_WITH_SERVER
 static char inet_peer[SH_MINIBUF] = { '\0' };
+#ifdef HAVE_LIBPRELUDE
+static char inet_peer_ip[SH_IP_BUF] = { '\0' };
+
+void sh_error_set_peer_ip(const char * str)
+{
+  if (str == NULL)
+    inet_peer_ip[0] = '\0';
+  else
+    sl_strlcpy(inet_peer_ip, str, sizeof(inet_peer_ip));
+}
+#endif
 
 void sh_error_set_peer(const char * str)
@@ -847 +858 @@
     inet_peer[0] = '\0';
   else
-    sl_strlcpy(inet_peer, str, SH_MINIBUF);
+    sl_strlcpy(inet_peer, str, sizeof(inet_peer));
 }
 #endif
@@ -880 +891 @@
   int    class_inet = clt_class;      /* initialize from global */
   char   local_inet_peer[SH_MINIBUF];
+#ifdef HAVE_LIBPRELUDE
+  char   local_inet_peer_ip[SH_IP_BUF];
+#endif    
 #endif
 
@@ -924 +938 @@
   if ((msg_id == MSG_TCP_MSG) && (inet_peer[0] != '\0'))
     {
-      sl_strlcpy(local_inet_peer, inet_peer, SH_MINIBUF);
+      sl_strlcpy(local_inet_peer, inet_peer, sizeof(local_inet_peer));
       sh_error_set_peer(NULL);
     }
   else
     local_inet_peer[0] = '\0';
+
+#ifdef HAVE_LIBPRELUDE
+  if ((msg_id == MSG_TCP_MSG) && (inet_peer_ip[0] != '\0'))
+    {
+      sl_strlcpy(local_inet_peer_ip, inet_peer_ip, sizeof(local_inet_peer_ip));
+      sh_error_set_peer_ip(NULL);
+    }
+  else
+    local_inet_peer_ip[0] = '\0';
+#endif
 
   clt_class = (-1);      /* reset global */
@@ -1263 +1287 @@
                *  Reports first error after failure. Always tries.
                */
-              (void) sh_prelude_alert (severity, (int) class, lmsg->msg,
-                                       lmsg->status, msg_id);
-
+#if defined(HAVE_LIBPRELUDE) && defined(SH_WITH_SERVER) 
+              (void) sh_prelude_alert (severity, (int) class, 
+                                       lmsg->msg, lmsg->status, msg_id, 
+                                       local_inet_peer_ip);
+#else
+              (void) sh_prelude_alert (severity, (int) class, 
+                                       lmsg->msg, lmsg->status, msg_id, 
+                                       NULL);
+#endif
               prelude_block = 0;
             }
@@ -1301 +1331 @@
                     (void) sh_log_file (lmsg->msg, NULL);
                   else
-                    (void) sh_log_file (lmsg->msg, local_inet_peer);
+                    (void) sh_log_file (lmsg->msg, local_inet_peer);
                 }
 #else