summaryrefslogtreecommitdiff
path: root/src/stats.c
diff options
context:
space:
mode:
authorJakub Sławiński2005-06-07 12:06:18 +0200
committerJoshua Judson Rosen2014-07-17 21:14:58 +0200
commit32aff2b27ccc3b3e51fb6f0bd77fe0073827c527 (patch)
treef2fc2530a6960f6fdf4d63eb80c4f61342250bbd /src/stats.c
parentv0.6 (diff)
downloadapf-32aff2b27ccc3b3e51fb6f0bd77fe0073827c527.tar.gz
v0.7
- Added: http proxy tunnels between afserver and afclient - Fixed: sigint interception with threads enabled (in http proxy mode) - Fixed: FATAL ERROR in afclient in some situations after close of afserver when http proxy mode is enabled - Added: afclients can connect directly to afserver with enabled proxy mode - Fixed: timeout routine in http proxy tunnels - Added: 'rshow' command in ra mode displays 'tunneltype' - Fixed: printing IP of clients when http proxy mode is enabled - Added: 'tunneltype' per client in ra mode after 'cshow' command - Fixed: closing connection when http proxy mode is enabled - Fixed: threads initialization - Fixed: afserver closing after sigint - Fixed: afclient threads initialization - Added: 'version' option to display program version number - Modified: establishing afclient<->afserver connection - Added: 'keep-alive' option - Fixed: using 'proxyport' without 'proxyname' - Added: auto-reconnect feature to afclient - Added: 'ar-tries' and 'ar-delay' options - Modified: http proxy logging - Fixed: closing connection with afclient after receiving id - Fixed: thread closing due to wrong initialization sequence - Fixed: small bug in initialization process - Heavily Modified: logging routines - Added: audit option - Modified: default dateformat is now ISO 8601 - Modified: printing usage - Fixed: bug in threads' initialization in afclient - Added: 'timeout' and 'dateformat' options in ra mode - Modified: empty dateformat disables printing '[] ' - Added: 'audit' and 'dnslookups' options in ra mode - Fixed: afserver freeze bug - Added: 'kuser' and 'kclient' options in ra mode - Fixed: bug in starting afclient in ra mode - Added: audit log printed also after kicking the client
Diffstat (limited to 'src/stats.c')
-rw-r--r--src/stats.c96
1 files changed, 16 insertions, 80 deletions
diff --git a/src/stats.c b/src/stats.c
index 82e90aa..4303a7e 100644
--- a/src/stats.c
+++ b/src/stats.c
@@ -18,94 +18,30 @@
*
*/
+#include <config.h>
+
#include "stats.h"
-#include "network.h"
-#include <stdio.h>
-#include <time.h>
-#include <string.h>
-#include <stdarg.h>
-static char verlev;
-static char loglev;
-static char logsocklev;
-static FILE* logfd;
-static FILE* logsockfd;
static signed long compressgained;
-static char* format = "%d.%m.%Y %H:%M:%S";
char*
-datum(void)
+timeperiod(time_t period)
{
- time_t sec;
- struct tm* tm;
- static char timedat[31];
- time(&sec);
- tm = localtime(&sec);
- memset(timedat, 0, 31);
- strftime(timedat, 30, format, tm);
- return timedat;
-}
+ int hours, minutes, seconds;
+ static char timeper[41];
+ memset(timeper, 0, 41);
-int
-loginit(char verl, char logl, char logsl, const char* logfname, const char* port, char* dateformat) {
- int tmpfd;
- verlev = loglev = 0;
- if (logfd)
- fclose(logfd);
- logfd = NULL;
- logsockfd = NULL;
- verlev = verl;
- loglev = logl;
- logsocklev = logsl;
- if (dateformat)
- format = dateformat;
- if (loglev) {
- logfd = fopen(logfname, "a");
- if (logfd == NULL)
- return 1; /* logging to a non-opened file? */
- }
- if (logsocklev) {
- if (ip_connect(&tmpfd, "localhost", port, 1))
- return 2; /* can't connect to localhost:port */
- logsockfd = fdopen(tmpfd, "a");
- if (logsockfd == NULL)
- return 3; /* can't create FILE* to log to */
- }
- return 0;
-}
-
-void
-aflog(char type, const char* format, ...)
-{
- va_list ap;
-
- if ((verlev) || (!type))
- if (type <= verlev) {
- printf("[%s] ", datum());
- va_start(ap, format);
- vfprintf(stdout, format, ap);
- va_end(ap);
- printf("\n");
- }
- if (loglev)
- if (type <= loglev) {
- fprintf(logfd, "[%s] ", datum());
- va_start(ap, format);
- vfprintf(logfd, format, ap);
- va_end(ap);
- fprintf(logfd, "\n");
- fflush(logfd);
- }
- if (logsocklev)
- if (type <= logsocklev) {
- fprintf(logsockfd, "[%s] ", datum());
- va_start(ap, format);
- vfprintf(logsockfd, format, ap);
- va_end(ap);
- fprintf(logsockfd, "\n");
- fflush(logsockfd);
- }
+ hours = period/3600;
+ minutes = (period/60)%60;
+ seconds = period%60;
+ if (hours) {
+ sprintf(timeper, "%d:%02d:%02d", hours, minutes, seconds);
+ }
+ else {
+ sprintf(timeper, "%d:%02d", minutes, seconds);
+ }
+ return timeper;
}
void