X-Git-Url: http://www.project-moonshot.org/gitweb/?p=libradsec.git;a=blobdiff_plain;f=debug.c;h=903c7931c492578be00411d846571481ce5c57b3;hp=b8c7ed17f4252a8ab88b3e50b00873e69ac0bb5a;hb=HEAD;hpb=eff1f8d633fa2b07396e1d1f82043823d6916ba2

diff --git a/debug.c b/debug.c
index b8c7ed1..903c793 100644
--- a/debug.c
+++ b/debug.c
@@ -1,183 +1,46 @@
-/*
- * Copyright (C) 2007 Stig Venaas <venaas@uninett.no>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- */
+/* Copyright 2011 NORDUnet A/S. All rights reserved.
+   See LICENSE for licensing information. */
 
-#ifndef SYS_SOLARIS9
-#include <stdint.h>
+#if defined HAVE_CONFIG_H
+#include <config.h>
 #endif
+
+#include <sys/types.h>
 #include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <strings.h>
-#include <time.h>
-#include <sys/time.h>
-#include <syslog.h>
-#include <errno.h>
+#include <assert.h>
+#include <radius/client.h>
+#include <radsec/radsec.h>
+#include <radsec/radsec-impl.h>
 #include "debug.h"
-#include "util.h"
-
-static char *debug_ident = NULL;
-static uint8_t debug_level = DBG_INFO;
-static char *debug_filepath = NULL;
-static FILE *debug_file = NULL;
-static int debug_syslogfacility = 0;
-static uint8_t debug_timestamp = 0;
-
-void debug_init(char *ident) {
-    debug_file = stderr;
-    setvbuf(debug_file, NULL, _IONBF, 0);
-    debug_ident = ident;
-}
-
-void debug_set_level(uint8_t level) {
-    switch (level) {
-    case 1:
-	debug_level = DBG_ERR;
-	return;
-    case 2:
-	debug_level = DBG_WARN;
-	return;
-    case 3:
-	debug_level = DBG_INFO;
-	return;
-    case 4:
-	debug_level = DBG_DBG;
-	return;
-    }
-}
 
-void debug_timestamp_on() {
-    debug_timestamp = 1;
-}
+void
+rs_dump_packet (const struct rs_packet *pkt)
+{
+  const RADIUS_PACKET *p = NULL;
 
-uint8_t debug_get_level() {
-    return debug_level;
-}
+  if (!pkt || !pkt->rpkt)
+    return;
+  p = pkt->rpkt;
 
-int debug_set_destination(char *dest) {
-    static const char *facstrings[] = { "LOG_DAEMON", "LOG_MAIL", "LOG_USER", "LOG_LOCAL0",
-					"LOG_LOCAL1", "LOG_LOCAL2", "LOG_LOCAL3", "LOG_LOCAL4",
-					"LOG_LOCAL5", "LOG_LOCAL6", "LOG_LOCAL7", NULL };
-    static const int facvals[] = { LOG_DAEMON, LOG_MAIL, LOG_USER, LOG_LOCAL0,
-				   LOG_LOCAL1, LOG_LOCAL2, LOG_LOCAL3, LOG_LOCAL4,
-				   LOG_LOCAL5, LOG_LOCAL6, LOG_LOCAL7 };
-    extern int errno;
-    int i;
-
-    if (!strncasecmp(dest, "file:///", 8)) {
-	debug_filepath = stringcopy(dest + 7, 0);
-	debug_file = fopen(debug_filepath, "a");
-	if (!debug_file) {
-	    debug_file = stderr;
-	    debugx(1, DBG_ERR, "Failed to open logfile %s\n%s",
-		   debug_filepath, strerror(errno));
-	}
-	setvbuf(debug_file, NULL, _IONBF, 0);
-	return 1;
-    }
-    if (!strncasecmp(dest, "x-syslog://", 11)) {
-	dest += 11;
-	if (*dest == '/')
-	    dest++;
-	if (*dest) {
-	    for (i = 0; facstrings[i]; i++)
-		if (!strcasecmp(dest, facstrings[i]))
-		    break;
-	    if (!facstrings[i])
-		debugx(1, DBG_ERR, "Unknown syslog facility %s", dest);
-	    debug_syslogfacility = facvals[i];
-	} else
-	    debug_syslogfacility = LOG_DAEMON;
-	openlog(debug_ident, LOG_PID, debug_syslogfacility);
-	return 1;
-    }
-    debug(DBG_ERR, "Unknown log destination, exiting %s", dest);
-    exit(1);
+  fprintf (stderr, "\tCode: %u, Identifier: %u, Lenght: %zu\n",
+	   p->code,
+	   p->id,
+	   p->sizeof_data);
+  fflush (stderr);
 }
 
-void debug_reopen_log() {
-    extern int errno;
-
-    /* not a file, noop, return success */
-    if (!debug_filepath) {
-	debug(DBG_ERR, "skipping reopen");
-	return;
-    }
+#if defined DEBUG
+int
+_rs_debug (const char *fmt, ...)
+{
+  int n;
+  va_list args;
 
-    if (debug_file != stderr)
-	fclose(debug_file);
+  va_start (args, fmt);
+  n = vfprintf (stderr, fmt, args);
+  va_end (args);
+  fflush (stderr);
 
-    debug_file = fopen(debug_filepath, "a");
-    if (debug_file)
-	debug(DBG_ERR, "Reopened logfile %s", debug_filepath);
-    else {
-	debug_file = stderr;
-	debug(DBG_ERR, "Failed to open logfile %s, using stderr\n%s",
-	      debug_filepath, strerror(errno));
-    }
-    setvbuf(debug_file, NULL, _IONBF, 0);
+  return n;
 }
-
-void debug_logit(uint8_t level, const char *format, va_list ap) {
-    struct timeval now;
-    char *timebuf;
-    int priority;
-
-    if (debug_syslogfacility) {
-	switch (level) {
-	case DBG_DBG:
-	    priority = LOG_DEBUG;
-	    break;
-	case DBG_INFO:
-	    priority = LOG_INFO;
-	    break;
-	case DBG_WARN:
-	    priority = LOG_WARNING;
-	    break;
-	case DBG_ERR:
-	    priority = LOG_ERR;
-	    break;
-	default:
-	    priority = LOG_DEBUG;
-	}
-	vsyslog(priority, format, ap);
-    } else {
-	if (debug_timestamp && (timebuf = malloc(256))) {
-	    gettimeofday(&now, NULL);
-	    ctime_r(&now.tv_sec, timebuf);
-	    timebuf[strlen(timebuf) - 1] = '\0';
-	    fprintf(debug_file, "%s: ", timebuf + 4);
-	    free(timebuf);
-	}
-	vfprintf(debug_file, format, ap);
-	fprintf(debug_file, "\n");
-    }
-}
-
-void debug(uint8_t level, char *format, ...) {
-    va_list ap;
-    if (level < debug_level)
-	return;
-    va_start(ap, format);
-    debug_logit(level, format, ap);
-    va_end(ap);
-}
-
-void debugx(int status, uint8_t level, char *format, ...) {
-    if (level >= debug_level) {
-	va_list ap;
-	va_start(ap, format);
-	debug_logit(level, format, ap);
-	va_end(ap);
-    }
-    exit(status);
-}
-
-/* Local Variables: */
-/* c-file-style: "stroustrup" */
-/* End: */
+#endif