X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=src%2Ffprobe-ulog.c;fp=src%2Ffprobe-ulog.c;h=91a9fd1d8f4906e34c28a76be4a88e8ed0eb70dc;hb=9e2aa473263ccadaf85675cc526df3978fe01e04;hp=cdcf1704d20b797c99bd94e714aa7b75a9d06e87;hpb=4a2a65ece88edbfdfda338e263370f292e311228;p=iptables.git

diff --git a/src/fprobe-ulog.c b/src/fprobe-ulog.c
index cdcf170..91a9fd1 100644
--- a/src/fprobe-ulog.c
+++ b/src/fprobe-ulog.c
@@ -90,6 +90,7 @@ enum {
 	cflag,
 	dflag,
 	eflag,
+	Eflag,
 	fflag,
 	gflag,
 	hflag,
@@ -101,6 +102,7 @@ enum {
 	rflag,
 	sflag,
 	tflag,
+	Tflag,
 	Uflag,
 	uflag,
 	vflag,
@@ -114,6 +116,7 @@ static struct getopt_parms parms[] = {
 	{'c', MY_GETOPT_ARG_REQUIRED, 0, 0},
 	{'d', MY_GETOPT_ARG_REQUIRED, 0, 0},
 	{'e', MY_GETOPT_ARG_REQUIRED, 0, 0},
+	{'E', MY_GETOPT_ARG_REQUIRED, 0, 0},
 	{'f', MY_GETOPT_ARG_REQUIRED, 0, 0},
 	{'g', MY_GETOPT_ARG_REQUIRED, 0, 0},
 	{'h', 0, 0, 0},
@@ -125,6 +128,7 @@ static struct getopt_parms parms[] = {
 	{'r', MY_GETOPT_ARG_REQUIRED, 0, 0},
 	{'s', MY_GETOPT_ARG_REQUIRED, 0, 0},
 	{'t', MY_GETOPT_ARG_REQUIRED, 0, 0},
+	{'T', MY_GETOPT_ARG_REQUIRED, 0, 0},
 	{'U', MY_GETOPT_ARG_REQUIRED, 0, 0},
 	{'u', MY_GETOPT_ARG_REQUIRED, 0, 0},
 	{'v', MY_GETOPT_ARG_REQUIRED, 0, 0},
@@ -152,6 +156,10 @@ static int sockbufsize;
 #else
 #define BULK_QUANTITY 200
 #endif
+
+static unsigned epoch_length=60, log_epochs=1; 
+static unsigned cur_epoch=0,prev_uptime=0;
+
 static unsigned bulk_quantity = BULK_QUANTITY;
 static unsigned pending_queue_length = 100;
 static struct NetFlow *netflow = &NetFlow5;
@@ -243,6 +251,8 @@ void usage()
 		"-l <[dst][:id]>\tLog destination and log/pidfile idetifier [1]\n"
 		"-y <remote:port>\tAddress of the NetFlow collector\n",
 		"-f <writable file>\tFile to write data into\n"
+		"-T <n>\tRotate log file every n epochs\n"
+		"-E <[1..60]>\tSize of an epoch in minutes\n"
 		VERSION, BULK_QUANTITY_MAX, bulk_quantity, sched_min, sched_max);
 	exit(0);
 }
@@ -339,6 +349,30 @@ inline void copy_flow(struct Flow *src, struct Flow *dst)
 	dst->flags = src->flags;
 }
 
+unsigned get_log_fd(char *fname, unsigned cur_fd) {
+	struct Time now;
+	unsigned cur_uptime;
+	int ret_fd;
+	gettime(&now);
+	cur_uptime = getuptime(&now);
+	if ((cur_uptime - prev_uptime) > (1000 * epoch_length)) {
+		char nextname[MAX_PATH_LEN];
+		int write_fd;
+		prev_uptime = cur_uptime;
+		cur_epoch = (cur_epoch + 1) % log_epochs;
+		close(cur_fd);
+		snprintf(nextname,MAX_PATH_LEN,"%s.%d",fname,cur_epoch);
+		if ((write_fd = open(nextname, O_WRONLY|O_CREAT)) < 0) {
+			fprintf(stderr, "open(): %s (%s)\n", nextname, strerror(errno));
+			exit(1);
+		}
+		ret_fd = write_fd;
+	}
+	else
+		ret_fd = cur_fd;
+	return(cur_fd);
+}
+
 struct Flow *find(struct Flow *where, struct Flow *what, struct Flow ***prev)
 {
 	struct Flow **flowpp;
@@ -692,6 +726,7 @@ void *emit_thread()
 						if (netflow->SeqOffset)
 							*((uint32_t *) (emit_packet + netflow->SeqOffset)) = htonl(peers[0].seq);
 #define MESSAGES
+						peers[0].write_fd = get_log_fd(peers[0].fname, peers[0].write_fd);
 						ret = write(peers[0].write_fd, emit_packet, size);
 						if (ret < size) {
 #if ((DEBUG) & DEBUG_E) || defined MESSAGES
@@ -1330,12 +1365,10 @@ bad_collector:
 		// log into a file
 		char *fname;
 		if (!(peers = malloc(npeers * sizeof(struct peer)))) goto err_malloc;
-		fname = parms[fflag].arg;
-		if ((write_fd = open(fname, O_WRONLY|O_CREAT)) < 0) {
-			fprintf(stderr, "open(): %s (%s)\n", fname, strerror(errno));
-			exit(1);
-		}
-		peers[0].write_fd = write_fd;
+		if (!(fname = malloc(strnlen(parms[fflag].arg,MAX_PATH_LEN)))) goto err_malloc;
+		strncpy(peers[0].fname, parms[fflag].arg, MAX_PATH_LEN);
+		
+		peers[0].write_fd = -1;
 		peers[0].type = PEER_FILE;
 		peers[0].seq = 0;
 		npeers++;