handling replies continuously from server

[oweals/gnunet.git] / src / util / common_logging.c

diff --git a/src/util/common_logging.c b/src/util/common_logging.c
index 22901bf268bc44b3358b231b9514df55f0b5e0a3..2c0fd57a817845ca4313d650f36544cc5fc9798e 100644 (file)
--- a/src/util/common_logging.c
+++ b/src/util/common_logging.c
@@ -429,7 +429,6 @@ parse_definitions (const char *constname, int force)
   if (tmp == NULL)
     return 0;
   def = GNUNET_strdup (tmp);
-  level = -1;
   from_line = 0;
   to_line = INT_MAX;
   for (p = def, state = 0, start = def; keep_looking; p++)
@@ -457,7 +456,7 @@ parse_definitions (const char *constname, int force)
           from_line = strtol (start, &t, 10);
           if (errno != 0 || from_line < 0)
           {
-            free (def);
+            GNUNET_free (def);
             return counter;
           }
           if (t < p && t[0] == '-')
@@ -467,7 +466,7 @@ parse_definitions (const char *constname, int force)
             to_line = strtol (start, &t, 10);
             if (errno != 0 || to_line < 0 || t != p)
             {
-              free (def);
+              GNUNET_free (def);
               return counter;
             }
           }
@@ -499,7 +498,7 @@ parse_definitions (const char *constname, int force)
             0 != add_definition (comp, file, function, from_line, to_line,
                                  level, force))
         {
-          free (def);
+          GNUNET_free (def);
           return counter;
         }
         counter += 1;
@@ -512,7 +511,7 @@ parse_definitions (const char *constname, int force)
       break;
     }
   }
-  free (def);
+  GNUNET_free (def);
   return counter;
 }
 
@@ -531,6 +530,8 @@ parse_all_definitions ()
   gnunet_force_log_parsed = GNUNET_YES;
 }
 #endif
+
+
 /**
  * Setup logging.
  *
@@ -546,6 +547,7 @@ GNUNET_log_setup (const char *comp, const char *loglevel, const char *logfile)
   int dirwarn;
   char *fn;
   const char *env_logfile = NULL;
+  int altlog_fd;
 
   min_level = get_type (loglevel);
 #if !defined(GNUNET_CULL_LOGGING)
@@ -569,10 +571,40 @@ GNUNET_log_setup (const char *comp, const char *loglevel, const char *logfile)
   if (NULL == fn)
     return GNUNET_SYSERR;
   dirwarn = (GNUNET_OK != GNUNET_DISK_directory_create_for_file (fn));
-  altlog = FOPEN (fn, "a");
-  if (altlog == NULL)
+#if WINDOWS
+  altlog_fd = OPEN (fn, O_APPEND |
+                        O_BINARY |
+                        O_WRONLY | O_CREAT,
+                        _S_IREAD | _S_IWRITE);
+#else
+  altlog_fd = OPEN (fn, O_APPEND |
+                        O_WRONLY | O_CREAT,
+                        S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
+#endif
+  if (altlog_fd != -1)
+  {
+    int dup_return;
+    if (GNUNET_stderr != NULL)
+      fclose (GNUNET_stderr);
+    dup_return = dup2 (altlog_fd, 2);
+    (void) close (altlog_fd);
+    if (dup_return != -1)
+    {
+      altlog = fdopen (2, "ab");
+      if (altlog == NULL)
+      {
+        (void) close (2);
+        altlog_fd = -1;
+      }
+    }
+    else
+    {
+      altlog_fd = -1;
+    }
+  }
+  if (altlog_fd == -1)
   {
-    GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR, "fopen", fn);
+    GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR, "open", fn);
     if (dirwarn)
       GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                   _("Failed to create or access directory for log file `%s'\n"),
@@ -581,8 +613,6 @@ GNUNET_log_setup (const char *comp, const char *loglevel, const char *logfile)
     return GNUNET_SYSERR;
   }
   GNUNET_free (fn);
-  if (GNUNET_stderr != NULL)
-    fclose (GNUNET_stderr);
   GNUNET_stderr = altlog;
   return GNUNET_OK;
 }
@@ -650,7 +680,7 @@ output_message (enum GNUNET_ErrorType kind, const char *comp,
 
   if (GNUNET_stderr != NULL)
   {
-    fprintf (GNUNET_stderr, "%s %s %s %s", datestr, comp,
+    FPRINTF (GNUNET_stderr, "%s %s %s %s", datestr, comp,
              GNUNET_error_type_to_string (kind), msg);
     fflush (GNUNET_stderr);
   }
@@ -919,6 +949,23 @@ GNUNET_i2s (const struct GNUNET_PeerIdentity *pid)
   return (const char *) ret.encoding;
 }
 
+/**
+ * Convert a peer identity to a string (for printing debug messages).
+ * This is one of the very few calls in the entire API that is
+ * NOT reentrant!
+ *
+ * @param pid the peer identity
+ * @return string form of the pid; will be overwritten by next
+ *         call to GNUNET_i2s.
+ */
+const char *
+GNUNET_i2s_full (const struct GNUNET_PeerIdentity *pid)
+{
+  static struct GNUNET_CRYPTO_HashAsciiEncoded ret;
+
+  GNUNET_CRYPTO_hash_to_enc (&pid->hashPubKey, &ret);
+  return (const char *) ret.encoding;
+}
 
 
 /**