deleted file mode 100644

@@ -1,471 +0,0 @@

-/*

- * debug print 

- *

- * Copyright (C) 2001-2003 FhG Fokus

- *

- * This file is part of Kamailio, a free SIP server.

- *

- * Kamailio is free software; you can redistribute it and/or modify

- * it under the terms of the GNU General Public License as published by

- * the Free Software Foundation; either version 2 of the License, or

- * (at your option) any later version

- *

- * Kamailio is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU General Public License for more details.

- *

- * You should have received a copy of the GNU General Public License 

- * along with this program; if not, write to the Free Software 

- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

- */

-/*!

- * \file

- * \brief Kamailio core :: Debug print

- * \ingroup core

- * Module: \ref core

- */

-

-

- 

-#include "globals.h"

-#include "dprint.h"

-#include "pvar.h"

- 

-#include <stdarg.h>

-#include <stdio.h>

-#include <strings.h>

-

-char *_km_log_engine_type = NULL;

-char *_km_log_engine_data = NULL;

-

-km_log_f _km_log_func = &syslog;

-

-/**

- *

- */

-void km_log_func_set(km_log_f f)

-{

-	_km_log_func = f;

-}

-

-#ifndef NO_SIG_DEBUG

-/* signal protection: !=0 when LOG/DBG/... are printing */

-volatile int dprint_crit = 0; 

-#endif

-

-static char* str_fac[]={"LOG_AUTH","LOG_CRON","LOG_DAEMON",

-			"LOG_KERN","LOG_LOCAL0","LOG_LOCAL1",

-			"LOG_LOCAL2","LOG_LOCAL3","LOG_LOCAL4","LOG_LOCAL5",

-			"LOG_LOCAL6","LOG_LOCAL7","LOG_LPR","LOG_MAIL",

-			"LOG_NEWS","LOG_USER","LOG_UUCP",

-#ifndef __OS_solaris

-			"LOG_AUTHPRIV","LOG_FTP","LOG_SYSLOG",

-#endif

-			0};

-			

-static int int_fac[]={LOG_AUTH ,  LOG_CRON , LOG_DAEMON ,

-		      LOG_KERN , LOG_LOCAL0 , LOG_LOCAL1 ,

-		      LOG_LOCAL2 , LOG_LOCAL3 , LOG_LOCAL4 , LOG_LOCAL5 ,

-		      LOG_LOCAL6 , LOG_LOCAL7 , LOG_LPR , LOG_MAIL ,

-		      LOG_NEWS , LOG_USER , LOG_UUCP,

-#ifndef __OS_solaris

-		      LOG_AUTHPRIV,LOG_FTP,LOG_SYSLOG,

-#endif

-		      0};

-

-struct log_level_info log_level_info[] = {

-	{"ALERT", LOG_ALERT},	  /* L_ALERT */

-	{"BUG", LOG_CRIT},        /* L_BUG */

-	{"CRITICAL", LOG_CRIT},   /* L_CRIT2 */

-	{"",    LOG_CRIT},         /* L_CRIT */

-	{"ERROR", LOG_ERR},       /* L_ERR */

-	{"WARNING", LOG_WARNING}, /* L_WARN */

-	{"NOTICE", LOG_NOTICE},   /* L_NOTICE */

-	{"INFO", LOG_INFO},       /* L_INFO */

-	{"DEBUG", LOG_DEBUG}	  /* L_DBG */

-};

-

-int str2facility(char *s)

-{

-	int i;

-

-	for (i=0; str_fac[i]; i++) {

-		if (!strcasecmp(s,str_fac[i]))

-			return int_fac[i];

-	}

-	return -1;

-}

-

-char* facility2str(int fl, int *len)

-{

-	int i;

-

-	for (i=0; str_fac[i]; i++) {

-		if (fl == int_fac[i]) {

-			*len = strlen(str_fac[i]);

-			return str_fac[i];

-		}

-	}

-

-	return NULL;

-}

-

-/* fixup function for log_facility cfg parameter */

-int log_facility_fixup(void *handle, str *gname, str *name, void **val)

-{

-	int	i;

-

-	if ((i = str2facility((char *)*val)) == -1) {

-		LM_ERR("invalid log facility: %s\n", (char *)*val);

-		return -1;

-	}

-	*val = (void *)(long)i;

-	return 0;

-}

-

-

-/**

- * per process debug log level (local)

- */

-

-/* value for unset local log level  */

-#define UNSET_LOCAL_DEBUG_LEVEL	    -255

-#define UNSET_LOCAL_DEBUG_FACILITY  -255

-

-/* the local debug log level */

-static int _local_debug_level = UNSET_LOCAL_DEBUG_LEVEL;

-static int _local_debug_facility = UNSET_LOCAL_DEBUG_FACILITY;

-/* callback to get per module debug level */

-static get_module_debug_level_f _module_debug_level = NULL;

-static get_module_debug_facility_f _module_debug_facility = NULL;

-

-/**

- * @brief set callback function for per module debug level

- */

-void set_module_debug_level_cb(get_module_debug_level_f f)

-{

-	_module_debug_level = f;

-}

-

-void set_module_debug_facility_cb(get_module_debug_facility_f f)

-{

-	_module_debug_facility = f;

-}

-

-/**

- * @brief return the log level - the local one if it set,

- *   otherwise the global value

- */

-int get_debug_level(char *mname, int mnlen) {

-	int mlevel;

-	/*important -- no LOGs inside, because it will loop */

-	if(unlikely(_module_debug_level!=NULL && mnlen>0)) {

-		if(_module_debug_level(mname, mnlen, &mlevel)==0) {

-			return mlevel;

-		}

-	}

-	return (_local_debug_level != UNSET_LOCAL_DEBUG_LEVEL) ?

-				_local_debug_level : cfg_get(core, core_cfg, debug);

-}

-

-/**

- * @brief return the log facility - the local one if it set,

- *   otherwise the global value

- */

-int get_debug_facility(char *mname, int mnlen) {

-	int mfacility;

-	/*important -- no LOGs inside, because it will loop */

-	if(unlikely(_module_debug_facility!=NULL && mnlen>0)) {

-		if(_module_debug_facility(mname, mnlen, &mfacility)==0) {

-			return mfacility;

-		}

-	}

-	return (_local_debug_facility != UNSET_LOCAL_DEBUG_FACILITY) ?

-				_local_debug_facility : cfg_get(core, core_cfg, log_facility);

-}

-

-

-/**

- * @brief set the local debug log level

- */

-void set_local_debug_level(int level)

-{

-	_local_debug_level = level;

-}

-

-/**

- * @brief reset the local debug log level

- */

-void reset_local_debug_level(void)

-{

-	_local_debug_level = UNSET_LOCAL_DEBUG_LEVEL;

-}

-

-/**

- * @brief set the local debug log facility

- */

-void set_local_debug_facility(int facility)

-{

-	_local_debug_facility = facility;

-}

-

-/**

- * @brief reset the local debug log facility

- */

-void reset_local_debug_facility(void)

-{

-	_local_debug_facility = UNSET_LOCAL_DEBUG_FACILITY;

-}

-

-typedef struct log_level_color {

-	char f;

-	char b;

-} log_level_color_t;

-

-log_level_color_t _log_level_colors[L_MAX - L_MIN + 1];

-

-void dprint_init_colors(void)

-{

-	int i;

-

-	i = 0;

-

-	memset(_log_level_colors, 0,

-			(L_MAX - L_MIN + 1)*sizeof(log_level_color_t));

-

-	/* L_ALERT */

-	_log_level_colors[i].f = 'R'; /* default */

-	_log_level_colors[i].b = 'x'; /* default */

-	i++;

-

-	/* L_BUG */

-	_log_level_colors[i].f = 'P'; /* default */

-	_log_level_colors[i].b = 'x'; /* default */

-	i++;

-

-	/* L_CRIT2 */

-	_log_level_colors[i].f = 'y'; /* default */

-	_log_level_colors[i].b = 'x'; /* default */

-	i++;

-

-	/* L_CRIT */

-	_log_level_colors[i].f = 'b'; /* default */

-	_log_level_colors[i].b = 'x'; /* default */

-	i++;

-

-	/* L_ERR */

-	_log_level_colors[i].f = 'r'; /* default */

-	_log_level_colors[i].b = 'x'; /* default */

-	i++;

-

-	/* L_WARN */

-	_log_level_colors[i].f = 'p'; /* default */

-	_log_level_colors[i].b = 'x'; /* default */

-	i++;

-

-	/* L_NOTICE */

-	_log_level_colors[i].f = 'g'; /* default */

-	_log_level_colors[i].b = 'x'; /* default */

-	i++;

-

-	/* L_INFO */

-	_log_level_colors[i].f = 'c'; /* default */

-	_log_level_colors[i].b = 'x'; /* default */

-	i++;

-

-	/* L_DBG */

-	_log_level_colors[i].f = 'x'; /* default */

-	_log_level_colors[i].b = 'x'; /* default */

-	i++;

-}

-

-#define TERM_COLOR_SIZE 16

-

-#define dprint_termc_add(p, end, s) \

-        do{ \

-                if ((p)+(sizeof(s)-1)<=(end)){ \

-                        memcpy((p), s, sizeof(s)-1); \

-                        (p)+=sizeof(s)-1; \

-                }else{ \

-                        /* overflow */ \

-                        LM_ERR("dprint_termc_add overflow\n"); \

-                        goto error; \

-                } \

-        } while(0)

-

-

-void dprint_term_color(char f, char b, str *obuf)

-{

-	static char term_color[TERM_COLOR_SIZE];

-	char* p;

-	char* end;

-

-	p = term_color;

-	end = p + TERM_COLOR_SIZE;

-

-	/* excape sequence */

-	dprint_termc_add(p, end, "\033[");

-

-	if(f!='_')

-	{

-		if (islower((int)f))

-		{

-			/* normal font */

-			dprint_termc_add(p, end, "0;");

-		} else {

-			/* bold font */

-			dprint_termc_add(p, end, "1;");

-			f += 32;

-		}

-	}

-

-	/* foreground */

-	switch(f)

-	{

-		case 'x':

-			dprint_termc_add(p, end, "39;");

-		break;

-		case 's':

-			dprint_termc_add(p, end, "30;");

-		break;

-		case 'r':

-			dprint_termc_add(p, end, "31;");

-		break;

-		case 'g':

-			dprint_termc_add(p, end, "32;");

-		break;

-		case 'y':

-			dprint_termc_add(p, end, "33;");

-		break;

-		case 'b':

-			dprint_termc_add(p, end, "34;");

-		break;

-		case 'p':

-			dprint_termc_add(p, end, "35;");

-		break;

-		case 'c':

-			dprint_termc_add(p, end, "36;");

-		break;

-		case 'w':

-			dprint_termc_add(p, end, "37;");

-		break;

-		default:

-			dprint_termc_add(p, end, "39;");

-	}

-

-	/* background */

-	switch(b)

-	{

-		case 'x':

-			dprint_termc_add(p, end, "49");

-		break;

-		case 's':

-			dprint_termc_add(p, end, "40");

-		break;

-		case 'r':

-			dprint_termc_add(p, end, "41");

-		break;

-		case 'g':

-			dprint_termc_add(p, end, "42");

-		break;

-		case 'y':

-			dprint_termc_add(p, end, "43");

-		break;

-		case 'b':

-			dprint_termc_add(p, end, "44");

-		break;

-		case 'p':

-			dprint_termc_add(p, end, "45");

-		break;

-		case 'c':

-			dprint_termc_add(p, end, "46");

-		break;

-		case 'w':

-			dprint_termc_add(p, end, "47");

-		break;

-		default:

-			dprint_termc_add(p, end, "49");

-	}

-

-	/* end */

-	dprint_termc_add(p, end, "m");

-

-	obuf->s = term_color;

-	obuf->len = p - term_color;

-	return;

-

-error:

-	obuf->s = term_color;

-	term_color[0] = '\0';

-	obuf->len = 0;

-}

-

-void dprint_color(int level)

-{

-	str obuf;

-

-	if(level<L_MIN || level>L_MAX)

-		return;

-	dprint_term_color(_log_level_colors[level - L_MIN].f,

-			_log_level_colors[level - L_MIN].b,

-			&obuf);

-	fprintf(stderr, "%.*s", obuf.len, obuf.s);

-}

-

-void dprint_color_reset(void)

-{

-	str obuf;

-

-	dprint_term_color('x', 'x', &obuf);

-	fprintf(stderr, "%.*s", obuf.len, obuf.s);

-}

-

-void dprint_color_update(int level, char f, char b)

-{

-	if(level<L_MIN || level>L_MAX)

-		return;

-	if(f && f!='0') _log_level_colors[level - L_MIN].f = f;

-	if(b && b!='0') _log_level_colors[level - L_MIN].b = b;

-}

-

-

-/* log_prefix functionality */

-str *log_prefix_val = NULL;

-int log_prefix_mode = 0;

-static pv_elem_t *log_prefix_pvs = NULL;

-

-#define LOG_PREFIX_SIZE	1024

-static char log_prefix_buf[LOG_PREFIX_SIZE];

-static str log_prefix_str;

-

-void log_prefix_init(void)

-{

-	str s;

-	if(log_prefix_fmt==NULL)

-		return;

-	s.s = log_prefix_fmt; s.len = strlen(s.s);

-

-	if(pv_parse_format(&s, &log_prefix_pvs)<0)

-	{

-		LM_ERR("wrong format[%s]\n", s.s);

-		return;

-	}

-}

-

-void log_prefix_set(sip_msg_t *msg)

-{

-	if(log_prefix_pvs == NULL)

-		return;

-	if(msg==NULL || !(IS_SIP(msg) || IS_SIP_REPLY(msg))) {

-		log_prefix_val = NULL;

-		return;

-	}

-	log_prefix_str.s = log_prefix_buf;

-	log_prefix_str.len = LOG_PREFIX_SIZE;

-	if(pv_printf(msg, log_prefix_pvs, log_prefix_str.s, &log_prefix_str.len)<0)

-		return;

-	if(log_prefix_str.len<=0)

-		return;

-	log_prefix_val = &log_prefix_str;

-}

@@ -432,6 +432,7 @@ void dprint_color_update(int level, char f, char b)

 /* log_prefix functionality */

 str *log_prefix_val = NULL;

+int log_prefix_mode = 0;

 static pv_elem_t *log_prefix_pvs = NULL;

 #define LOG_PREFIX_SIZE	1024

@@ -90,13 +90,27 @@ int str2facility(char *s)

 {

 	int i;

-	for( i=0; str_fac[i] ; i++) {

+	for (i=0; str_fac[i]; i++) {

 		if (!strcasecmp(s,str_fac[i]))

 			return int_fac[i];

 	}

 	return -1;

 }

+char* facility2str(int fl, int *len)

+{

+	int i;

+

+	for (i=0; str_fac[i]; i++) {

+		if (fl == int_fac[i]) {

+			*len = strlen(str_fac[i]);

+			return str_fac[i];

+		}

+	}

+

+	return NULL;

+}

+

 /* fixup function for log_facility cfg parameter */

 int log_facility_fixup(void *handle, str *gname, str *name, void **val)

 {

@@ -420,7 +420,7 @@ void dprint_color_update(int level, char f, char b)

 str *log_prefix_val = NULL;

 static pv_elem_t *log_prefix_pvs = NULL;

-#define LOG_PREFIX_SIZE	128

+#define LOG_PREFIX_SIZE	1024

 static char log_prefix_buf[LOG_PREFIX_SIZE];

 static str log_prefix_str;

@@ -36,6 +36,19 @@

 #include <stdio.h>

 #include <strings.h>

+char *_km_log_engine_type = NULL;

+char *_km_log_engine_data = NULL;

+

+km_log_f _km_log_func = &syslog;

+

+/**

+ *

+ */

+void km_log_func_set(km_log_f f)

+{

+	_km_log_func = f;

+}

+

 #ifndef NO_SIG_DEBUG

 /* signal protection: !=0 when LOG/DBG/... are printing */

 volatile int dprint_crit = 0; 

@@ -103,12 +103,15 @@ int log_facility_fixup(void *handle, str *gname, str *name, void **val)

  */

 /* value for unset local log level  */

-#define UNSET_LOCAL_DEBUG_LEVEL	-255

+#define UNSET_LOCAL_DEBUG_LEVEL	    -255

+#define UNSET_LOCAL_DEBUG_FACILITY  -255

 /* the local debug log level */

 static int _local_debug_level = UNSET_LOCAL_DEBUG_LEVEL;

+static int _local_debug_facility = UNSET_LOCAL_DEBUG_FACILITY;

 /* callback to get per module debug level */

 static get_module_debug_level_f _module_debug_level = NULL;

+static get_module_debug_facility_f _module_debug_facility = NULL;

 /**

  * @brief set callback function for per module debug level

@@ -118,12 +121,17 @@ void set_module_debug_level_cb(get_module_debug_level_f f)

 	_module_debug_level = f;

 }

+void set_module_debug_facility_cb(get_module_debug_facility_f f)

+{

+	_module_debug_facility = f;

+}

+

 /**

  * @brief return the log level - the local one if it set,

  *   otherwise the global value

  */

 int get_debug_level(char *mname, int mnlen) {

-	int mlevel = L_DBG;

+	int mlevel;

 	/*important -- no LOGs inside, because it will loop */

 	if(unlikely(_module_debug_level!=NULL && mnlen>0)) {

 		if(_module_debug_level(mname, mnlen, &mlevel)==0) {

@@ -134,6 +142,23 @@ int get_debug_level(char *mname, int mnlen) {

 				_local_debug_level : cfg_get(core, core_cfg, debug);

 }

+/**

+ * @brief return the log facility - the local one if it set,

+ *   otherwise the global value

+ */

+int get_debug_facility(char *mname, int mnlen) {

+	int mfacility;

+	/*important -- no LOGs inside, because it will loop */

+	if(unlikely(_module_debug_facility!=NULL && mnlen>0)) {

+		if(_module_debug_facility(mname, mnlen, &mfacility)==0) {

+			return mfacility;

+		}

+	}

+	return (_local_debug_facility != UNSET_LOCAL_DEBUG_FACILITY) ?

+				_local_debug_facility : cfg_get(core, core_cfg, log_facility);

+}

+

+

 /**

  * @brief set the local debug log level

  */

@@ -150,6 +175,22 @@ void reset_local_debug_level(void)

 	_local_debug_level = UNSET_LOCAL_DEBUG_LEVEL;

 }

+/**

+ * @brief set the local debug log facility

+ */

+void set_local_debug_facility(int facility)

+{

+	_local_debug_facility = facility;

+}

+

+/**

+ * @brief reset the local debug log facility

+ */

+void reset_local_debug_facility(void)

+{

+	_local_debug_facility = UNSET_LOCAL_DEBUG_FACILITY;

+}

+

 typedef struct log_level_color {

 	char f;

 	char b;

@@ -388,7 +388,7 @@ void log_prefix_set(sip_msg_t *msg)

 {

 	if(log_prefix_pvs == NULL)

 		return;

-	if(msg==NULL || !IS_SIP(msg)) {

+	if(msg==NULL || !(IS_SIP(msg) || IS_SIP_REPLY(msg))) {

 		log_prefix_val = NULL;

 		return;

 	}

@@ -10,11 +10,6 @@

  * the Free Software Foundation; either version 2 of the License, or

  * (at your option) any later version

  *

- * For a license to use the Kamailio software under conditions

- * other than those described here, or to purchase support for this

- * software, please contact iptel.org by e-mail at the following addresses:

- *    info@iptel.org

- *

  * Kamailio is distributed in the hope that it will be useful,

  * but WITHOUT ANY WARRANTY; without even the implied warranty of

  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

@@ -26,7 +21,7 @@

  */

 /*!

  * \file

- * \brief SIP-router core :: Debug print

+ * \brief Kamailio core :: Debug print

  * \ingroup core

  * Module: \ref core

  */

@@ -1,24 +1,21 @@

 /*

- * $Id$

- *

  * debug print 

  *

- *

  * Copyright (C) 2001-2003 FhG Fokus

  *

- * This file is part of ser, a free SIP server.

+ * This file is part of Kamailio, a free SIP server.

  *

- * ser is free software; you can redistribute it and/or modify

+ * Kamailio is free software; you can redistribute it and/or modify

  * it under the terms of the GNU General Public License as published by

  * the Free Software Foundation; either version 2 of the License, or

  * (at your option) any later version

  *

- * For a license to use the ser software under conditions

+ * For a license to use the Kamailio software under conditions

  * other than those described here, or to purchase support for this

  * software, please contact iptel.org by e-mail at the following addresses:

  *    info@iptel.org

  *

- * ser is distributed in the hope that it will be useful,

+ * Kamailio is distributed in the hope that it will be useful,

  * but WITHOUT ANY WARRANTY; without even the implied warranty of

  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

  * GNU General Public License for more details.

@@ -29,7 +26,7 @@

  */

 /*!

  * \file

- * \brief SIP-router core :: 

+ * \brief SIP-router core :: Debug print

  * \ingroup core

  * Module: \ref core

  */

@@ -396,7 +396,7 @@ void log_prefix_set(sip_msg_t *msg)

 {

 	if(log_prefix_pvs == NULL)

 		return;

-	if(msg==NULL) {

+	if(msg==NULL || !IS_SIP(msg)) {

 		log_prefix_val = NULL;

 		return;

 	}

@@ -98,8 +98,7 @@ int log_facility_fixup(void *handle, str *gname, str *name, void **val)

 	int	i;

 	if ((i = str2facility((char *)*val)) == -1) {

-		LOG(L_ERR, "log_facility_fixup: invalid log facility: %s\n",

-			(char *)*val);

+		LM_ERR("invalid log facility: %s\n", (char *)*val);

 		return -1;

 	}

 	*val = (void *)(long)i;

@@ -38,6 +38,7 @@

 #include "globals.h"

 #include "dprint.h"

+#include "pvar.h"

 #include <stdarg.h>

 #include <stdio.h>

@@ -368,3 +369,43 @@ void dprint_color_update(int level, char f, char b)

 	if(f && f!='0') _log_level_colors[level - L_MIN].f = f;

 	if(b && b!='0') _log_level_colors[level - L_MIN].b = b;

 }

+

+

+/* log_prefix functionality */

+str *log_prefix_val = NULL;

+static pv_elem_t *log_prefix_pvs = NULL;

+

+#define LOG_PREFIX_SIZE	128

+static char log_prefix_buf[LOG_PREFIX_SIZE];

+static str log_prefix_str;

+

+void log_prefix_init(void)

+{

+	str s;

+	if(log_prefix_fmt==NULL)

+		return;

+	s.s = log_prefix_fmt; s.len = strlen(s.s);

+

+	if(pv_parse_format(&s, &log_prefix_pvs)<0)

+	{

+		LM_ERR("wrong format[%s]\n", s.s);

+		return;

+	}

+}

+

+void log_prefix_set(sip_msg_t *msg)

+{

+	if(log_prefix_pvs == NULL)

+		return;

+	if(msg==NULL) {

+		log_prefix_val = NULL;

+		return;

+	}

+	log_prefix_str.s = log_prefix_buf;

+	log_prefix_str.len = LOG_PREFIX_SIZE;

+	if(pv_printf(msg, log_prefix_pvs, log_prefix_str.s, &log_prefix_str.len)<0)

+		return;

+	if(log_prefix_str.len<=0)

+		return;

+	log_prefix_val = &log_prefix_str;

+}

@@ -25,7 +25,7 @@

  *

  * You should have received a copy of the GNU General Public License 

  * along with this program; if not, write to the Free Software 

- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

  */

 /*!

  * \file

@@ -115,12 +115,29 @@ int log_facility_fixup(void *handle, str *gname, str *name, void **val)

 /* the local debug log level */

 static int _local_debug_level = UNSET_LOCAL_DEBUG_LEVEL;

+/* callback to get per module debug level */

+static get_module_debug_level_f _module_debug_level = NULL;

+

+/**

+ * @brief set callback function for per module debug level

+ */

+void set_module_debug_level_cb(get_module_debug_level_f f)

+{

+	_module_debug_level = f;

+}

 /**

  * @brief return the log level - the local one if it set,

  *   otherwise the global value

  */

-int get_debug_level(void) {

+int get_debug_level(char *mname, int mnlen) {

+	int mlevel = L_DBG;

+	/*important -- no LOGs inside, because it will loop */

+	if(unlikely(_module_debug_level!=NULL && mnlen>0)) {

+		if(_module_debug_level(mname, mnlen, &mlevel)==0) {

+			return mlevel;

+		}

+	}

 	return (_local_debug_level != UNSET_LOCAL_DEBUG_LEVEL) ?

 				_local_debug_level : cfg_get(core, core_cfg, debug);

 }

@@ -343,3 +343,11 @@ void dprint_color_reset(void)

 	dprint_term_color('x', 'x', &obuf);

 	fprintf(stderr, "%.*s", obuf.len, obuf.s);

 }

+

+void dprint_color_update(int level, char f, char b)

+{

+	if(level<L_MIN || level>L_MAX)

+		return;

+	if(f && f!='0') _log_level_colors[level - L_MIN].f = f;

+	if(b && b!='0') _log_level_colors[level - L_MIN].b = b;

+}

@@ -140,3 +140,206 @@ void reset_local_debug_level(void)

 {

 	_local_debug_level = UNSET_LOCAL_DEBUG_LEVEL;

 }

+

+typedef struct log_level_color {

+	char f;

+	char b;

+} log_level_color_t;

+

+log_level_color_t _log_level_colors[L_MAX - L_MIN + 1];

+

+void dprint_init_colors(void)

+{

+	int i;

+

+	i = 0;

+

+	memset(_log_level_colors, 0,

+			(L_MAX - L_MIN + 1)*sizeof(log_level_color_t));

+

+	/* L_ALERT */

+	_log_level_colors[i].f = 'R'; /* default */

+	_log_level_colors[i].b = 'x'; /* default */

+	i++;

+

+	/* L_BUG */

+	_log_level_colors[i].f = 'P'; /* default */

+	_log_level_colors[i].b = 'x'; /* default */

+	i++;

+

+	/* L_CRIT2 */