Added support of WPA3-SAE security mode.

[platform/upstream/connman.git] / src / log.c

diff --git a/src/log.c b/src/log.c
index ead9b2e..3112a43 100755 (executable)
--- a/src/log.c
+++ b/src/log.c
@@ -40,10 +40,11 @@ static const char *program_path;
 
 #if defined TIZEN_EXT
 #include <sys/stat.h>
+#include <sys/time.h>
 
 #define LOG_FILE_PATH "/opt/usr/data/network/connman.log"
 #define MAX_LOG_SIZE   1 * 1024 * 1024
-#define MAX_LOG_COUNT  3
+#define MAX_LOG_COUNT  15
 
 #define openlog __connman_log_open
 #define closelog __connman_log_close
@@ -76,7 +77,8 @@ static void __connman_log_update_file_revision(int rev)
        next_log_file = g_strdup_printf("%s.%d", LOG_FILE_PATH, next_log_rev);
 
        if (next_log_rev >= MAX_LOG_COUNT)
-               remove(next_log_file);
+               if (remove(next_log_file) != 0)
+                       goto error;
 
        if (access(next_log_file, F_OK) == 0)
                __connman_log_update_file_revision(next_log_rev);
@@ -84,14 +86,16 @@ static void __connman_log_update_file_revision(int rev)
        if (rename(log_file, next_log_file) != 0)
                remove(log_file);
 
+error:
        g_free(log_file);
        g_free(next_log_file);
 }
 
-static void __connman_log_make_backup(void)
+static int __connman_log_make_backup(void)
 {
        const int rev = 0;
        char *backup = NULL;
+       int ret = 0;
 
        backup = g_strdup_printf("%s.%d", LOG_FILE_PATH, rev);
 
@@ -99,21 +103,24 @@ static void __connman_log_make_backup(void)
                __connman_log_update_file_revision(rev);
 
        if (rename(LOG_FILE_PATH, backup) != 0)
-               remove(LOG_FILE_PATH);
+               if (remove(LOG_FILE_PATH) != 0)
+                       ret = -1;
 
        g_free(backup);
+       return ret;
 }
 
 static void __connman_log_get_local_time(char *strtime, const int size)
 {
-       time_t buf;
+       struct timeval tv;
        struct tm *local_ptm;
+       char buf[32];
 
-       time(&buf);
-       buf = time(NULL);
-       local_ptm = localtime(&buf);
+       gettimeofday(&tv, NULL);
+       local_ptm = localtime(&tv.tv_sec);
 
-       strftime(strtime, size, "%m/%d %H:%M:%S", local_ptm);
+       strftime(buf, sizeof(buf), "%m/%d %H:%M:%S", local_ptm);
+       snprintf(strtime, size, "%s.%03ld", buf, tv.tv_usec / 1000);
 }
 
 void __connman_log(const int log_priority, const char *format, va_list ap)
@@ -129,14 +136,20 @@ void __connman_log(const int log_priority, const char *format, va_list ap)
        if (!log_file)
                return;
 
-       fstat(fileno(log_file), &buf);
+       if (fstat(fileno(log_file), &buf) < 0) {
+               fclose(log_file);
+               log_file = NULL;
+               return;
+       }
+
        log_size = buf.st_size;
 
        if (log_size >= MAX_LOG_SIZE) {
                fclose(log_file);
                log_file = NULL;
 
-               __connman_log_make_backup();
+               if (__connman_log_make_backup() != 0)
+                       return;
 
                log_file = (FILE *)fopen(LOG_FILE_PATH, "a+");
 
@@ -214,6 +227,7 @@ void connman_error(const char *format, ...)
        vsyslog(LOG_ERR, format, ap);
 
        va_end(ap);
+       fflush(log_file);
 }
 
 /**
@@ -232,6 +246,7 @@ void connman_debug(const char *format, ...)
        vsyslog(LOG_DEBUG, format, ap);
 
        va_end(ap);
+       fflush(log_file);
 }
 
 static void print_backtrace(unsigned int offset)
@@ -310,6 +325,9 @@ static void print_backtrace(unsigned int offset)
                buf[len] = '\0';
 
                pos = strchr(buf, '\n');
+#if defined TIZEN_EXT
+               if (pos) {
+#endif
                *pos++ = '\0';
 
                if (strcmp(buf, "??") == 0) {
@@ -326,6 +344,9 @@ static void print_backtrace(unsigned int offset)
 
                connman_error("#%-2u %p in %s() at %s", i - offset,
                                                frames[i], buf, pos);
+#if defined TIZEN_EXT
+               }
+#endif
        }
 
        connman_error("+++++++++++++++++++++++++++");