/* Set TRUE/FALSE to enable/disable debugging */
int silc_debug = FALSE;
+char *silc_debug_string = NULL;
/* SILC Log name strings. These strings are printed to the log file. */
const SilcLogTypeName silc_log_types[] =
char *log_warning_file;
char *log_error_file;
char *log_fatal_file;
-unsigned int log_info_size;
-unsigned int log_warning_size;
-unsigned int log_error_size;
-unsigned int log_fatal_size;
+uint32 log_info_size;
+uint32 log_warning_size;
+uint32 log_error_size;
+uint32 log_fatal_size;
/* Log callbacks. If these are set by the application these are used
instead of the default functions in this file. */
/* Outputs the log message to what ever log file selected. */
-void silc_log_output(const char *filename, unsigned int maxsize,
+void silc_log_output(const char *filename, uint32 maxsize,
SilcLogType type, char *string)
{
FILE *fp;
break;
}
- /* Purge the log file if the max size is defined. */
- if (maxsize) {
- fp = fopen(filename, "r");
- if (fp) {
- int filelen;
-
- filelen = fseek(fp, (off_t)0L, SEEK_END);
- fseek(fp, (off_t)0L, SEEK_SET);
-
- /* Purge? */
- if (filelen >= maxsize)
- unlink(filename);
+ if (!filename)
+ fp = stderr;
+ else {
+ /* Purge the log file if the max size is defined. */
+ if (maxsize) {
+ fp = fopen(filename, "r");
+ if (fp) {
+ int filelen;
+
+ filelen = fseek(fp, (off_t)0L, SEEK_END);
+ fseek(fp, (off_t)0L, SEEK_SET);
+
+ /* Purge? */
+ if (filelen >= maxsize)
+ unlink(filename);
+
+ fclose(fp);
+ }
+ }
+
+ /* Open the log file */
+ if ((fp = fopen(filename, "a+")) == NULL) {
+ fprintf(stderr, "warning: could not open log file "
+ "%s: %s\n", filename, strerror(errno));
+ fprintf(stderr, "warning: log messages will be displayed on "
+ "the screen\n");
+ fp = stderr;
}
}
- /* Open the log file */
- if ((fp = fopen(filename, "a+")) == NULL) {
- fprintf(stderr, "warning: could not open log file "
- "%s: %s\n", filename, strerror(errno));
- fprintf(stderr, "warning: log messages will be displayed on the screen\n");
- fp = stderr;
- }
-
/* Get the log type name */
- for(np = silc_log_types; np->name; np++) {
+ for (np = silc_log_types; np->name; np++) {
if (np->type == type)
break;
}
fprintf(fp, "[%s] [%s] %s\n", silc_get_time(), np->name, string);
fflush(fp);
- fclose(fp);
+ if (fp != stderr)
+ fclose(fp);
silc_free(string);
}
return;
}
+ if (silc_debug_string &&
+ (!silc_string_regex_match(silc_debug_string, file) &&
+ !silc_string_regex_match(silc_debug_string, function))) {
+ silc_free(string);
+ return;
+ }
+
if (debug_cb)
{
(*debug_cb)(file, function, line, string);
void silc_log_output_hexdump(char *file, char *function,
int line, void *data_in,
- unsigned int len, char *string)
+ uint32 len, char *string)
{
int i, k;
int off, pos, count;
return;
}
+ if (silc_debug_string &&
+ (!silc_string_regex_match(silc_debug_string, file) &&
+ !silc_string_regex_match(silc_debug_string, function))) {
+ silc_free(string);
+ return;
+ }
+
if (debug_hexdump_cb)
{
(*debug_hexdump_cb)(file, function, line, data_in, len, string);
/* Sets log files */
-void silc_log_set_files(char *info, unsigned int info_size,
- char *warning, unsigned int warning_size,
- char *error, unsigned int error_size,
- char *fatal, unsigned int fatal_size)
+void silc_log_set_files(char *info, uint32 info_size,
+ char *warning, uint32 warning_size,
+ char *error, uint32 error_size,
+ char *fatal, uint32 fatal_size)
{
log_info_file = info;
log_warning_file = warning;
debug_cb = NULL;
debug_hexdump_cb = NULL;
}
+
+/* Set current debug string */
+
+void silc_log_set_debug_string(const char *debug_string)
+{
+ silc_free(silc_debug_string);
+ silc_debug_string = silc_string_regexify(debug_string);
+}