Merge pull request #2 from bocianu/usageLog

Usage log

Author: tschak909

tnfs/tnfsd/Makefile

@@ -26,8 +26,12 @@ endif
 ifdef DEBUG
     EXFLAGS = -g -DDEBUG
 endif
+
+ifdef USAGELOG
+    LOGFLAGS = -DUSAGELOG
+endif
 
-CFLAGS=$(FLAGS) $(EXFLAGS)
+CFLAGS=$(FLAGS) $(EXFLAGS) $(LOGFLAGS)
 OBJS=main.o datagram.o log.o session.o endian.o directory.o errortable.o tnfs_file.o chroot.o fileinfo.o $(EXOBJS)
 
 all:	$(OBJS)

tnfs/tnfsd/README.txt

@@ -16,3 +16,6 @@ since I'm not sure chrooting is supported under Cygwin.
 To make a debug version, use 'make OS=osname DEBUG=yes'. This will add
 some extra debugging messages and add the -g flag to the compilation 
 options.
+
+To output basic usage log on stdout, use 'make OS=osname USAGELOG=yes'.
+

tnfs/tnfsd/directory.c

@@ -34,6 +34,7 @@
 #include <stdbool.h>
 
 #include "tnfs.h"
+#include "log.h"
 #include "config.h"
 #include "directory.h"
 #include "tnfs_file.h"
@@ -329,6 +330,7 @@ void tnfs_seekdir(Header *hdr, Session *s, unsigned char *databuf, int datasz)
 #ifdef DEBUG
 	fprintf(stderr, "tnfs_seekdir to pos %u\n", pos);
 #endif
+
 	// We handle this differently depending on whether we've pre-loaded the directory or not
 	if (s->dhandles[*databuf].entry_list == NULL)
 	{
@@ -338,6 +340,12 @@ void tnfs_seekdir(Header *hdr, Session *s, unsigned char *databuf, int datasz)
 	{
 		s->dhandles[*databuf].current_entry = dirlist_get_node_at_index(s->dhandles[*databuf].entry_list, pos);
 	}
+#ifdef USAGELOG
+	if (pos == 0) {
+	        USGLOG(hdr, "Path changed to: %s", s->dhandles[*databuf].path);
+	}
+#endif
+
 
 	hdr->status = TNFS_SUCCESS;
 	tnfs_send(s, hdr, NULL, 0);

tnfs/tnfsd/log.c

@@ -25,6 +25,7 @@
  * */
 
 #include <stdio.h>
+#include <time.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include <sys/types.h>
@@ -56,6 +57,31 @@ void TNFSMSGLOG(Header *hdr, const char *msg, ...)
 #endif
 }
 
+void USGLOG(Header *hdr, const char *msg, ...)
+{
+	unsigned char *ip = (unsigned char *)&hdr->ipaddr;
+	char buff[128];
+	char sdate[20];
+	struct tm *sTm;
+
+	time_t now = time (0);
+	sTm = gmtime (&now);
+
+	strftime (sdate, sizeof(sdate), "%Y-%m-%d %H:%M:%S", sTm);
+
+	va_list vargs;
+	va_start(vargs, msg);
+
+	vsnprintf(buff, sizeof(buff), msg, vargs);
+	va_end(vargs);
+
+	fprintf(stderr, "%s|%d.%d.%d.%d|SID=%02x|%s\n", sdate, ip[0], ip[1], ip[2], ip[3], hdr->sid, buff);
+
+#ifdef WIN32
+	fflush(stderr);
+#endif
+}
+
 void MSGLOG(in_addr_t ipaddr, const char *msg, ...)
 {
 	unsigned char *ip = (unsigned char *)&ipaddr;

tnfs/tnfsd/log.h

@@ -33,6 +33,7 @@
 void die(const char *msg);
 
 void TNFSMSGLOG(Header *hdr, const char *msg, ...);
+void USGLOG(Header *hdr, const char *msg, ...);
 void MSGLOG(in_addr_t ipaddr, const char *msg, ...);
 void LOG(const char *msg, ...);
 

tnfs/tnfsd/session.c

@@ -137,6 +137,9 @@ int tnfs_mount(Header *hdr, unsigned char *buf, int bufsz)
 		tnfs_send(s, hdr, repbuf, 4);
 #ifdef DEBUG
 		TNFSMSGLOG(hdr, "Mounted %s OK, SID=%x", s->root, s->sid);
+#endif
+#ifdef USAGELOG
+		USGLOG(hdr, "Session started at: %s", s->root);
 #endif
 	}
 	else
@@ -162,6 +165,9 @@ void tnfs_umount(Header *hdr, Session *s, int sindex)
 {
 #ifdef DEBUG
 	TNFSMSGLOG(hdr, "Unmounting");
+#endif
+#ifdef USAGELOG
+	USGLOG(hdr, "Unmounting session");
 #endif
 	/* the response must be sent before we deallocate the
 	 * session */

tnfs/tnfsd/tnfs_file.c

@@ -112,6 +112,10 @@ void tnfs_open(Header *hdr, Session *s, unsigned char *buf, int bufsz)
 			fprintf(stderr, "mode: %o\n", mode);
 			fprintf(stderr, "open: fd=%d\n", fd);
 #endif
+#ifdef USAGELOG
+	                USGLOG(hdr, "File mounted: %s", (char *)buf + 4);
+#endif
+
 			if (fd <= 0)
 			{
 				hdr->status = tnfs_error(errno);