Filter log parsing update

* Share filter log parsing code instead of using copy/paste/code duplication.
* Reworked the JavaScript a little so it could also be shared
* Fix a large number of bugs, especially in the AJAX-based dynamic log viewer.
* Picks up some more detail from the logs, and more accurately determines the protocol of a given log entry.
* Adds a CLI log parser (filterparser.php)
* Removed some redundant/unused code
* Code cleanup/style fixes
* Added support for finding logged rdr rules from miniupnpd
NOTE: Due to the dynamic nature of upnp rules, the rule may not be present when checked.

1 files changed, 134 insertions, 0 deletions

diff --git a/usr/local/www/javascript/filter_log.js b/usr/local/www/javascript/filter_log.js
new file mode 100644
index 0000000..b34d7f1
--- /dev/null
+++ b/usr/local/www/javascript/filter_log.js
@@ -0,0 +1,134 @@
+
+if (typeof getURL == 'undefined') {
+	getURL = function(url, callback) {
+		if (!url)
+			throw 'No URL for getURL';
+		try {
+			if (typeof callback.operationComplete == 'function')
+				callback = callback.operationComplete;
+		} catch (e) {}
+			if (typeof callback != 'function')
+				throw 'No callback function for getURL';
+		var http_request = null;
+		if (typeof XMLHttpRequest != 'undefined') {
+		    http_request = new XMLHttpRequest();
+		}
+		else if (typeof ActiveXObject != 'undefined') {
+			try {
+				http_request = new ActiveXObject('Msxml2.XMLHTTP');
+			} catch (e) {
+				try {
+					http_request = new ActiveXObject('Microsoft.XMLHTTP');
+				} catch (e) {}
+			}
+		}
+		if (!http_request)
+			throw 'Both getURL and XMLHttpRequest are undefined';
+		http_request.onreadystatechange = function() {
+			if (http_request.readyState == 4) {
+				callback( { success : true,
+				  content : http_request.responseText,
+				  contentType : http_request.getResponseHeader("Content-Type") } );
+			}
+		}
+		http_request.open('GET', url, true);
+		http_request.send(null);
+	}
+}
+
+function outputrule(req) {
+	alert(req.content);
+}
+function fetch_new_rules() {
+	if(isPaused)
+		return;
+	if(isBusy)
+		return;
+	isBusy = true;
+	getURL('diag_logs_filter_dynamic.php?lastsawtime=' + lastsawtime, fetch_new_rules_callback);
+}
+function fetch_new_rules_callback(callback_data) {
+	if(isPaused)
+		return;
+
+	var data_split;
+	var new_data_to_add = Array();
+	var data = callback_data.content;
+
+	data_split = data.split("\n");
+
+	for(var x=0; x<data_split.length-1; x++) {
+		/* loop through rows */
+		row_split = data_split[x].split("||");
+		lastsawtime = row_split[6];
+		new_data_to_add[new_data_to_add.length] = format_log_line(row_split);
+	}
+	update_div_rows(new_data_to_add);
+	isBusy = false;
+}
+
+function update_div_rows(data) {
+	if(isPaused)
+		return;
+
+	var isIE = navigator.appName.indexOf('Microsoft') != -1;
+	var isSafari = navigator.userAgent.indexOf('Safari') != -1;
+	var isOpera = navigator.userAgent.indexOf('Opera') != -1;
+	var rulestable = document.getElementById('log');
+	var rows = rulestable.getElementsByTagName('div');
+	var showanim = 1;
+	if (isIE) {
+		showanim = 0;
+	}
+	
+	var startat = data.length - nentries;
+	if (startat < 0) {
+		startat = 0;
+	}
+	data = data.slice(startat, data.length);
+	
+	for(var x=0; x<data.length; x++) {
+		var numrows = rows.length;
+		/*    if reverse logging is enabled we need to show the
+		 *    records in a reverse order with new items appearing
+		 *    on the top
+		 */
+		if(isReverse == false) {
+			for (var i = 2; i < numrows; i++) {
+				nextrecord = i + 1;
+				if(nextrecord < numrows)
+					rows[i].innerHTML = rows[nextrecord].innerHTML;
+			}
+		} else {
+			for (var i = numrows; i > 0; i--) {
+				nextrecord = i + 1;
+				if(nextrecord < numrows)
+					rows[nextrecord].innerHTML = rows[i].innerHTML;
+			}
+		}
+		var item = document.getElementById('firstrow');
+		if(x == data.length-1) {
+			/* nothing */
+			showanim = false;
+		} else {
+			showanim = false;
+		}
+		if (showanim) {
+			item.style.display = 'none';
+			item.innerHTML = data[x];
+			new Effect.Appear(item);
+		} else {
+			item.innerHTML = data[x];
+		}
+	}
+}
+function toggle_pause() {
+	if(isPaused) {
+		isPaused = false;
+		fetch_new_rules();
+	} else {
+		isPaused = true;
+	}
+}
+/* start local AJAX engine */
+timer = setInterval('fetch_new_rules()', updateDelay);