Merge "wireguard: Add routes for allowedIPs" into tizen

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

diff --git a/src/log.c b/src/log.c
index 3112a43..7a4839b 100755 (executable)
--- a/src/log.c
+++ b/src/log.c
@@ -23,15 +23,14 @@
 #include <config.h>
 #endif
 
-#define _GNU_SOURCE
 #include <stdio.h>
 #include <unistd.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
 #include <syslog.h>
-#include <execinfo.h>
 #include <dlfcn.h>
+#include <signal.h>
 
 #include "connman.h"
 
@@ -41,6 +40,11 @@ static const char *program_path;
 #if defined TIZEN_EXT
 #include <sys/stat.h>
 #include <sys/time.h>
+#include <stdbool.h>
+#include <dlog.h>
+
+#undef LOG_TAG
+#define LOG_TAG "CONNMAN"
 
 #define LOG_FILE_PATH "/opt/usr/data/network/connman.log"
 #define MAX_LOG_SIZE   1 * 1024 * 1024
@@ -52,6 +56,29 @@ static const char *program_path;
 #define syslog __connman_log_s
 
 static FILE *log_file = NULL;
+static bool dlog_logging = true;
+static bool file_logging = true;
+static bool simple_log = true;
+
+bool get_simple_log_option(void)
+{
+       return simple_log;
+}
+
+void set_simple_log_option(bool option)
+{
+       simple_log = option;
+}
+
+void set_dlog_logging_option(bool option)
+{
+       dlog_logging = option;
+}
+
+void set_file_logging_option(bool option)
+{
+       file_logging = option;
+}
 
 void __connman_log_open(const char *ident, int option, int facility)
 {
@@ -128,7 +155,7 @@ void __connman_log(const int log_priority, const char *format, va_list ap)
        int log_size = 0;
        struct stat buf;
        char str[256];
-       char strtime[40];
+       char strtime[64];
 
        if (!log_file)
                log_file = (FILE *)fopen(LOG_FILE_PATH, "a+");
@@ -169,12 +196,19 @@ void __connman_log_s(int log_priority, const char *format, ...)
 
        va_start(ap, format);
 
-       vsyslog(LOG_DEBUG, format, ap);
+       if (dlog_logging)
+               dlog_vprint(DLOG_DEBUG, LOG_TAG, format, ap);
+
+       if (file_logging)
+               vsyslog(LOG_DEBUG, format, ap);
 
        va_end(ap);
 }
 #endif
 
+/* This makes sure we always have a __debug section. */
+CONNMAN_DEBUG_DEFINE(dummy);
+
 /**
  * connman_info:
  * @format: format string
@@ -187,7 +221,12 @@ void connman_info(const char *format, ...)
        va_list ap;
 
        va_start(ap, format);
+#if defined TIZEN_EXT
+       if (dlog_logging)
+               dlog_vprint(DLOG_INFO, LOG_TAG, format, ap);
 
+       if (file_logging)
+#endif
        vsyslog(LOG_INFO, format, ap);
 
        va_end(ap);
@@ -205,7 +244,12 @@ void connman_warn(const char *format, ...)
        va_list ap;
 
        va_start(ap, format);
+#if defined TIZEN_EXT
+       if (dlog_logging)
+               dlog_vprint(DLOG_WARN, LOG_TAG, format, ap);
 
+       if (file_logging)
+#endif
        vsyslog(LOG_WARNING, format, ap);
 
        va_end(ap);
@@ -223,11 +267,15 @@ void connman_error(const char *format, ...)
        va_list ap;
 
        va_start(ap, format);
+#if defined TIZEN_EXT
+       if (dlog_logging)
+               dlog_vprint(DLOG_ERROR, LOG_TAG, format, ap);
 
+       if (file_logging)
+#endif
        vsyslog(LOG_ERR, format, ap);
 
        va_end(ap);
-       fflush(log_file);
 }
 
 /**
@@ -242,126 +290,22 @@ void connman_debug(const char *format, ...)
        va_list ap;
 
        va_start(ap, format);
-
-       vsyslog(LOG_DEBUG, format, ap);
-
-       va_end(ap);
-       fflush(log_file);
-}
-
-static void print_backtrace(unsigned int offset)
-{
-       void *frames[99];
-       size_t n_ptrs;
-       unsigned int i;
-       int outfd[2], infd[2];
-       int pathlen;
-       pid_t pid;
-
-       if (!program_exec)
-               return;
-
-       pathlen = strlen(program_path);
-
-       n_ptrs = backtrace(frames, G_N_ELEMENTS(frames));
-       if (n_ptrs < offset)
-               return;
-
-       if (pipe(outfd) < 0)
-               return;
-
-       if (pipe(infd) < 0) {
-               close(outfd[0]);
-               close(outfd[1]);
-               return;
-       }
-
-       pid = fork();
-       if (pid < 0) {
-               close(outfd[0]);
-               close(outfd[1]);
-               close(infd[0]);
-               close(infd[1]);
-               return;
-       }
-
-       if (pid == 0) {
-               close(outfd[1]);
-               close(infd[0]);
-
-               dup2(outfd[0], STDIN_FILENO);
-               dup2(infd[1], STDOUT_FILENO);
-
-               execlp("addr2line", "-C", "-f", "-e", program_exec, NULL);
-
-               exit(EXIT_FAILURE);
-       }
-
-       close(outfd[0]);
-       close(infd[1]);
-
-       connman_error("++++++++ backtrace ++++++++");
-
-       for (i = offset; i < n_ptrs - 1; i++) {
-               Dl_info info;
-               char addr[20], buf[PATH_MAX * 2];
-               int len, written;
-               char *ptr, *pos;
-
-               dladdr(frames[i], &info);
-
-               len = snprintf(addr, sizeof(addr), "%p\n", frames[i]);
-               if (len < 0)
-                       break;
-
-               written = write(outfd[1], addr, len);
-               if (written < 0)
-                       break;
-
-               len = read(infd[0], buf, sizeof(buf) - 1);
-               if (len < 0)
-                       break;
-
-               buf[len] = '\0';
-
-               pos = strchr(buf, '\n');
 #if defined TIZEN_EXT
-               if (pos) {
-#endif
-               *pos++ = '\0';
-
-               if (strcmp(buf, "??") == 0) {
-                       connman_error("#%-2u %p in %s", i - offset,
-                                               frames[i], info.dli_fname);
-                       continue;
-               }
-
-               ptr = strchr(pos, '\n');
-               *ptr++ = '\0';
+       if (dlog_logging)
+               dlog_vprint(DLOG_DEBUG, LOG_TAG, format, ap);
 
-               if (strncmp(pos, program_path, pathlen) == 0)
-                       pos += pathlen + 1;
-
-               connman_error("#%-2u %p in %s() at %s", i - offset,
-                                               frames[i], buf, pos);
-#if defined TIZEN_EXT
-               }
+       if (file_logging)
 #endif
-       }
-
-       connman_error("+++++++++++++++++++++++++++");
-
-       kill(pid, SIGTERM);
+       vsyslog(LOG_DEBUG, format, ap);
 
-       close(outfd[1]);
-       close(infd[0]);
+       va_end(ap);
 }
 
 static void signal_handler(int signo)
 {
        connman_error("Aborting (signal %d) [%s]", signo, program_exec);
 
-       print_backtrace(2);
+       print_backtrace(program_path, program_exec, 2);
 
        exit(EXIT_FAILURE);
 }