From 04ce2dc1f353c2924885016b787f3c8c46f2b26c Mon Sep 17 00:00:00 2001
From: "Gergely Polonkai (W00d5t0ck)" <polesz@w00d5t0ck.info>
Date: Wed, 26 Jan 2011 12:23:40 +0100
Subject: [PATCH] Added TODO file, extended configuration file

Added logging options (global and interfaces)
Added IP address option for interfaces
Removed comments around interface definition

Signed-off-by: Gergely Polonkai (W00d5t0ck) <polesz@w00d5t0ck.info>
---
 TODO               | 66 ++++++++++++++++++++++++++++++++++++++++++++++
 data/wxmppd.xml.in | 37 ++++++++++++++++++++++++--
 2 files changed, 101 insertions(+), 2 deletions(-)
 create mode 100644 TODO

diff --git a/TODO b/TODO
new file mode 100644
index 0000000..afdc00c
--- /dev/null
+++ b/TODO
@@ -0,0 +1,66 @@
+[ ] Modular design
+    [ ] Authentication and authorization
+        [ ] SQLite3
+        [ ] MySQL
+        [ ] PostgreSQL
+        [ ] LDAP
+    [ ] Roster storage
+        [ ] SQLite3
+        [ ] MySQL
+        [ ] PostgreSQL
+        [ ] LDAP?
+    [ ] Group chat
+    [ ] File sending
+    [ ] Server-side chat logging
+
+[ ] GnuTLS
+[X] gLib
+[ ] gNet
+
+Hooks:
+
+[ ] c2s-message
+[ ] s2c-message
+[ ] s2s-message
+[ ] client-authentication
+[ ] client-authorization
+[ ] client-presence-change
+
+Configuration file:
+
+[X] Global logging
+[X] Modules
+    [X] Module directory
+    [X] Modules to load on startup
+[o] Interface
+    [X] IP
+    [X] Port
+    [X] Domain
+    [-] Certificate file
+    [-] Key file
+    [X] Logging
+        [X] Log destination: syslog, file
+        [X] Log options: connection events, etc.
+
+Code flow:
+
+[X] Command line processing (Command line option can override the place of the configuration file)
+[X] Configuration file processing (Command line options override configuration global values like modules directory, log destination)
+[ ] Create logger thread
+    [ ] Start logging according to configuration
+[ ] Load modules
+    [ ] Load module file
+    [ ] Run initialization function to...
+        [ ] Register extensions
+        [ ] Create special interfaces
+        [ ] Register to hooks
+[ ] Create interfaces
+    [ ] Create listener thread and sockets
+    [ ] Create stream processing threads
+    [ ] Associate stream processing threads with sockets
+    [ ] Assign extensions to stream processing threads
+    [ ] Process extension configuration directives
+    [ ] Start socket thread
+        When new connection arrives
+        [ ] Create peer object
+        [ ] Associate with corresponding stream interface
diff --git a/data/wxmppd.xml.in b/data/wxmppd.xml.in
index b2cf69c..ed162d8 100644
--- a/data/wxmppd.xml.in
+++ b/data/wxmppd.xml.in
@@ -1,5 +1,22 @@
 <?xml version="1.0"?>
 <wxmppd>
+	<logging>
+		<info>
+			<syslog>
+				<facility>DAEMON</facility>
+				<loglevel>INFO</loglevel>
+				<options>PID</options>
+			</syslog>
+		</info>
+		<error>
+			<syslog>
+				<facility>DAEMON</facility>
+				<loglevel>ERR</loglevel>
+				<options>PID</loglevel>
+			</syslog>
+		</error>
+		<debug />
+	</logging>
 	<options>
 		<keys-file>@sysconfdir@/wxmppd/keys.xml</keys-file>
 	</options>
@@ -10,10 +27,27 @@
 		<load>mod-users-sqlite3</load>
 		<load>mod-roster-sqlite3</load>
 	</modules>
-	<!--
 	<interface>
 		<domain>chat.example.org</domain>
+		<ip>127.0.0.1</ip>
 		<port>5222</port>
+		<logging>
+			<!-- As error and info tags are not specified, the global options will be used for them -->
+			<connections>
+				<syslog>
+					<facility>DAEMON</facility>
+					<loglevel>INFO</loglevel>
+					<options>PID</options>
+				</syslog>
+			</connections>
+			<authentication>
+				<file>
+					<path>/var/log/wxmppd/auth.log</path>
+					<rotate>1d</rotate>
+					<options>PID</options>
+				</syslog>
+			</authentication>
+		</logging>
 		<extensions>
 			<extension>
 				<name>layer-tls</name>
@@ -34,5 +68,4 @@
 			</extension>
 		</extensions>
 	</interface>
-	-->
 </wxmppd>