first shot at mini-receiver and mini-parser java classes (for gui)

6 files changed, 277 insertions, 3 deletions

diff --git a/java/com/rsyslog/diag/DiagTalker.java b/java/com/rsyslog/diag/DiagTalker.java
new file mode 100644
index 00000000..c4e77e95
--- /dev/null
+++ b/java/com/rsyslog/diag/DiagTalker.java
@@ -0,0 +1,70 @@
+/* A yet very simple tool to talk to imdiag.
+ *
+ * Copyright 2009 Rainer Gerhards and Adiscon GmbH.
+ *
+ * This file is part of rsyslog.
+ *
+ * Rsyslog is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Rsyslog is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Rsyslog.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * A copy of the GPL can be found in the file "COPYING" in this distribution.
+ */
+package com.rsyslog.diag;
+import java.io.*;
+import java.net.*;
+
+public class DiagTalker {
+    public static void main(String[] args) throws IOException {
+
+        Socket diagSocket = null;
+        PrintWriter out = null;
+        BufferedReader in = null;
+	final String host = "127.0.0.1";
+	final int port = 13500;
+
+        try {
+            diagSocket = new Socket(host, port);
+	    diagSocket.setSoTimeout(0); /* wait for lenghty operations */
+            out = new PrintWriter(diagSocket.getOutputStream(), true);
+            in = new BufferedReader(new InputStreamReader(
+                                        diagSocket.getInputStream()));
+        } catch (UnknownHostException e) {
+            System.err.println("can not resolve " + host + "!");
+            System.exit(1);
+        } catch (IOException e) {
+            System.err.println("Couldn't get I/O for "
+                               + "the connection to: " + host + ".");
+            System.exit(1);
+        }
+
+	BufferedReader stdIn = new BufferedReader(
+                                   new InputStreamReader(System.in));
+	String userInput;
+
+	try {
+		while ((userInput = stdIn.readLine()) != null) {
+		    out.println(userInput);
+		    System.out.println("imdiag returns: " + in.readLine());
+		}
+        } catch (SocketException e) {
+            System.err.println("We had a socket exception and consider this to be OK: "
+	    			+ e.getMessage());
+	}
+
+	out.close();
+	in.close();
+	stdIn.close();
+	diagSocket.close();
+    }
+}
+
diff --git a/java/com/rsyslog/gui/simpServ/simpServ.java b/java/com/rsyslog/gui/simpServ/simpServ.java
index 56e4aaf1..5d248d90 100644
--- a/java/com/rsyslog/gui/simpServ/simpServ.java
+++ b/java/com/rsyslog/gui/simpServ/simpServ.java
@@ -1,7 +1,20 @@
-package com.rsyslog.gui;
+package com.rsyslog.gui.simpServ;
+import com.rsyslog.lib.*;
+import com.rsyslog.gui.*;
 
 public class simpServ {
-	public static void main(String[] args)  {
-		System.out.println("hello world\n");
+
+	public static void main(String args[]) {
+		try {
+			simpServConsumer cons = new simpServConsumer();
+			System.out.println("Starting server on port " + args[0] + "\n");
+			SyslogServerTCP myServ = new
+				SyslogServerTCP(Integer.parseInt(args[0]), cons);
+			myServ.start();
+			System.out.println("Press ctl-c to terminate\n");
+		}
+		catch(Exception e) {
+			System.out.println("Error: " + e.toString());
+		}
 	}
 }
diff --git a/java/com/rsyslog/gui/simpServ/simpServConsumer.java b/java/com/rsyslog/gui/simpServ/simpServConsumer.java
new file mode 100644
index 00000000..c7c576d7
--- /dev/null
+++ b/java/com/rsyslog/gui/simpServ/simpServConsumer.java
@@ -0,0 +1,10 @@
+/** A syslog message consumer for the simple syslog server. */
+package com.rsyslog.gui.simpServ;
+import com.rsyslog.lib.*;
+
+class simpServConsumer implements SyslogMsgConsumer {
+	public void consumeMsg(String ln) {
+		SyslogMessage msg = new SyslogMessage(ln);
+		System.out.println("Line received '" + msg.getRawMsgAfterPRI() + "'\n");
+	}
+}
diff --git a/java/com/rsyslog/lib/SyslogMessage.java b/java/com/rsyslog/lib/SyslogMessage.java
new file mode 100644
index 00000000..11b51e33
--- /dev/null
+++ b/java/com/rsyslog/lib/SyslogMessage.java
@@ -0,0 +1,76 @@
+/**
+ * Implementation of the syslog message object.
+ *
+ * This is a limited-capability implementation of a syslog message together
+ * with all its properties. It is limit to what is currently needed and may
+ * be extended as further need arises.
+ *
+ * @author Rainer Gerhards
+ * 
+ * Copyright 2009 Rainer Gerhards and Adiscon GmbH.
+ *
+ * This file is part of rsyslog.
+ *
+ * Rsyslog is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Rsyslog is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Rsyslog.  If not, see http://www.gnu.org/licenses/.
+ *
+ * A copy of the GPL can be found in the file "COPYING" in this distribution.
+ */
+package com.rsyslog.lib;
+import com.rsyslog.gui.simpServ.*;
+
+public class SyslogMessage {
+
+	/** message as received from the wire */
+	private String rawmsg;
+	/** the rawmsg without the PRI part */
+	private String rawMsgAfterPRI;
+	/** PRI part */
+	private int pri;
+
+	/** a very simple syslog parser. So far, it only parses out the
+	 * PRI part of the message. May be extended later. Rawmsg must have
+	 * been set before the parser is called. It will populate "all" other
+	 * fields.
+	 */
+	private void parse() {
+		int i;
+		if(rawmsg.charAt(0) == '<') {
+			pri = 0;
+			for(i = 1 ; Character.isDigit(rawmsg.charAt(i)) && i < 4 ; ++i) {
+				pri = pri * 10 + rawmsg.charAt(i) - '0';
+			}
+			if(rawmsg.charAt(i) != '>')
+				/* not a real cure, but sufficient for the current
+				 * mini-parser... */
+				--i;
+			rawMsgAfterPRI = rawmsg.substring(i + 1);
+		} else {
+			pri = 116;
+			rawMsgAfterPRI = rawmsg;
+		}
+	}
+
+	public SyslogMessage(String _rawmsg) {
+		rawmsg = _rawmsg;
+		parse();
+	}
+
+	public String getRawMsg() {
+		return rawmsg;
+	}
+
+	public String getRawMsgAfterPRI() {
+		return rawMsgAfterPRI;
+	}
+}
diff --git a/java/com/rsyslog/lib/SyslogMsgConsumer.java b/java/com/rsyslog/lib/SyslogMsgConsumer.java
new file mode 100644
index 00000000..ceb16ffb
--- /dev/null
+++ b/java/com/rsyslog/lib/SyslogMsgConsumer.java
@@ -0,0 +1,5 @@
+package com.rsyslog.lib;
+
+public interface SyslogMsgConsumer {
+	public void consumeMsg(String msg);
+}
diff --git a/java/com/rsyslog/lib/SyslogServerTCP.java b/java/com/rsyslog/lib/SyslogServerTCP.java
new file mode 100644
index 00000000..09e0449b
--- /dev/null
+++ b/java/com/rsyslog/lib/SyslogServerTCP.java
@@ -0,0 +1,100 @@
+package com.rsyslog.lib;
+
+import com.rsyslog.lib.SyslogMsgConsumer;
+import java.io.*;
+import java.net.*;
+
+
+/** a small test consumer */
+/*
+class TestConsumer implements SyslogMsgConsumer {
+	public void consumeMsg(String ln) {
+		System.out.println("Line received '" + ln + "'\n");
+	}
+}
+*/
+
+public class SyslogServerTCP extends Thread {
+	private ServerSocket lstnSock;
+	private boolean contRun;	/* continue processing requests? */
+	public SyslogMsgConsumer consumer;
+
+	/** Process a single connection */
+	class Session extends Thread {
+		private Socket sock;
+		private SyslogServerTCP srvr;
+
+		public Session(Socket so, SyslogServerTCP _srvr) {
+			sock = so;
+			srvr = _srvr;
+		}
+
+		public void run() {
+			try {
+				BufferedReader data = new BufferedReader(
+					new InputStreamReader(sock.getInputStream()));
+
+				String ln = data.readLine();
+				while(ln != null) {
+					srvr.getConsumer().consumeMsg(ln);
+					ln = data.readLine();
+				}
+				System.out.println("End of Session.\n");
+				sock.close();
+			}
+			catch(Exception e) {
+				/* we ignore any errors we may have... */
+				System.out.println("Session exception " + e.toString());
+			}
+		}
+	}
+
+	/** a small test driver */
+/*
+	public static void main(String args[]) {
+		try {
+			SyslogMsgConsumer cons = new TestConsumer();
+			System.out.println("Starting server on port " + args[0] + "\n");
+			SyslogServerTCP myServ = new
+				SyslogServerTCP(Integer.parseInt(args[0]), cons);
+			myServ.start();
+			System.out.println("Press ctl-c to terminate\n");
+		}
+		catch(Exception e) {
+			System.out.println("Fehler! " + e.toString());
+		}
+	}
+*/
+
+	public SyslogServerTCP(int port, SyslogMsgConsumer cons) throws java.io.IOException {
+		if(lstnSock != null)
+			terminate();
+		lstnSock = new ServerSocket(port);
+		consumer = cons;
+		contRun = true;
+	}
+
+	public void terminate() {
+		contRun = false;
+	}
+
+	public SyslogMsgConsumer getConsumer() {
+		return consumer;
+	}
+
+	public void run() {
+		try {
+			while(contRun) {
+				Socket sock = lstnSock.accept();
+				System.out.println("New connection request! " + sock.toString());
+				Thread sess = new Session(sock, this);
+				sock = null;
+				sess.start();
+			}
+		}
+		catch(Exception e) {
+			System.out.println("Error during server run " + e.toString());
+		}
+			
+	}
+}