#include "silcincludes.h"
/* Set TRUE/FALSE to enable/disable debugging */
-int silc_debug = FALSE;
+bool silc_debug = FALSE;
+bool silc_debug_hexdump = FALSE;
+char *silc_debug_string = NULL;
/* SILC Log name strings. These strings are printed to the log file. */
const SilcLogTypeName silc_log_types[] =
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);
-
- fclose(fp);
+ 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;
}
return;
}
- if (debug_cb)
- {
- (*debug_cb)(file, function, line, string);
- 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);
+ silc_free(string);
+ return;
+ }
fprintf(stderr, "%s:%d: %s\n", function, line, string);
fflush(stderr);
int off, pos, count;
unsigned char *data = (unsigned char *)data_in;
- if (!silc_debug) {
+ if (!silc_debug_hexdump) {
silc_free(string);
return;
}
- if (debug_hexdump_cb)
- {
- (*debug_hexdump_cb)(file, function, line, data_in, len, string);
- 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_hexdump_cb) {
+ (*debug_hexdump_cb)(file, function, line, data_in, len, string);
+ silc_free(string);
+ return;
+ }
fprintf(stderr, "%s:%d: %s\n", function, line, string);
silc_free(string);
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);
+ if ((strchr(debug_string, '(') &&
+ strchr(debug_string, ')')) ||
+ strchr(debug_string, '$'))
+ silc_debug_string = strdup(debug_string);
+ else
+ silc_debug_string = silc_string_regexify(debug_string);
+}