documentation work and a bug fix

dist/config/mnet.cfg.example

@@ -8,7 +8,7 @@ IMHUB FALSE
 UPLINK 1
 
 ; The MnetFTPd Host and port of your uplink
-FTPHOST exoticabbs.com:2121
+FTPHOST cryptopiabbs.com
 
 ; The MnetFTPd Username
 FTPUSER apam
@@ -25,6 +25,8 @@ OUTDIR /home/pi/mys_out
 ; An origin line For your Messages
 ORIGINLINE A Cool Mystic BBS!
 
+; A log file to log all the things
+LOGFILE /home/pi/mnet.log
 
 ; Area definitions AreaNo, HostNo, Jam Path, Exports...
 ; Unless you are a host, this should be filled in by mnetsubunsub

docs/docs/guide/installation.md

@@ -28,8 +28,14 @@ Clone the repo and checkout the branch you want, eg. v0.11-patch.
 
     git clone git://git.magickabbs.com/MagickaBBS
 
+    cd MagickaBBS
+
     git checkout v0.11-patch
 
+    git submodule init
+    git submodule update
+
+
 Build the BBS
 
     make www
@@ -53,4 +59,4 @@ Run BBS
 
     ./magicka config/bbs.ini
 
-The BBS will run by default on telnet only and on port 2023. Magicka must be run on a port over 1024, the port can be configured in bbs.ini. Log on to your new bbs and create your sysop account!
+The BBS will run by default on telnet only and on port 2023. Magicka may be run on a port under 1025, however additional configuration is required and not really recommended, the port can be configured in bbs.ini. Log on to your new bbs and create your sysop account!

docs/docs/guide/msgs/mnet/config.md

@@ -0,0 +1,36 @@
+# Configuring FTN Message Bases
+
+MNet (MagiNet) Message base configuration is similar to Local bases, except they include an extra network section, and networked = true in the main section.
+
+Here is an example included in the default install.
+
+    [main]
+    Visible Sec Level = 10
+    Networked = true
+    Real Names = false
+
+    [network]
+    type = magi
+    magi node = 3
+    domain = happynxt
+
+    [General]
+    Read Sec Level = 10
+    Write Sec Level = 10
+    Path = /home/andrew/MagickaBBS/msgs/hnn_gen
+    Type = Echo 
+    QWK Name = HN_GEN
+
+The network block contains the following:
+
+**Type** This equals magi for maginet style networks.
+
+**Magi Node** This is your maginet node number
+
+**Domain** This is the domain of the maginet network, not currently used with maginet
+
+**Tagline** This is optional and can be used to set network specific taglines.
+
+The area sections are identical to local mail, with the exception that Type should equal "Echo". "Netmail" areas are not supported in maginet.
+
+This is all for setting up maginet networked bases in magicka, however you will still need to configure the scanner/tosser and ftp client.

docs/docs/guide/msgs/mnet/mnetcfg.md

@@ -0,0 +1,71 @@
+# MagiNet Configuration
+
+
+## mnet.cfg
+
+MagiNet is configured via on sentral mnet.cfg file. Here is an example:
+
+    MYNODE 3
+    IMHUB FALSE
+    UPLINK 1
+    FTPHOST cryptopiabbs.com
+    FTPUSER apam
+    FTPPASS secret
+    INDIR /home/pi/MagickaBBS/mnet/in
+    OUTDIR /home/pi/MagickaBBS/mnet/out
+    ORIGINLINE A Cool Mystic BBS!
+    LOGFILE /home/pi/MagickaBBS/mnet/mnet.log
+    HOSTTXT /home/pi/MagickaBBS/mnet/hosttxt.cfg
+    ACCESSFILE /home/pi/MagickaBBS/mnet/access.cfg
+
+    ; Area definitions AreaNo, HostNo, Jam Path, Exports...
+    ; Unless you are a host, this should be filled in by mnetsubunsub
+    ;MSGAREA 1, 1, /home/pi/MagickaBBS/msgs/hnn_gen, 2, 3, 4
+
+**MYNODE** This is the node you are given when signing up to a MagiNet Network
+
+**IMHUB** Usually False, unless you're hosting a MagiNet Network
+
+**UPLINK** Usually 1, unless you have some strange configuration
+
+**FTPHOST** This is the FTP Host with which you send and receive mail.
+
+**FTPUSER** The Username for your FTP sessions.
+
+**FTPPASS** The Password for your FTP sessions.
+
+**INDIR** This directory is where inbound messages are placed.
+
+**OUTDIR** This is the directory in which outbound messages are placed.
+
+**ORIGINLINE** This is unused in Magicka, and exists only for those running other BBS systems.
+
+**LOGFILE** The name and path of a log file to log things.
+
+**HOSTTXT** This is an optional configuration file for area hosts who want to add customized ACCEPT messages.
+
+**ACCESSFILE** This is an optional configuration file for area hosts who want to control who can connect to their area.
+
+**MSGAREA** The message area lines define the message areas you are connected to and hosting. For areas that you are connected to, this is managed by mnetsubunsub. However if you want to host your own message area you will need to fill in the line manually.
+
+ * The AreaNo is the number for the area, conventionally you would chose an area number prefixed with your node number followed by 2 digits, so if you are node 4, you would pick node 400 to 499. This allows you to host up to 100 areas.
+
+ * The Node number is your node number, or the number of the host hosting the area
+
+ * JAM Path is the path and filename (without extension) of the JAM message base to store messages in for this area.
+
+ * Exports, this should not be managed manually, leave it blank and it will fill in itself when people sub/unsub.
+
+## HOSTTXT 
+
+    1, /home/pi/MagickaBBS/mnet/hnn_gen.txt
+    2, /home/pi/MagickaBBS/mnet/hnn_phonebook.txt
+
+Each line in the HOSTTXT config file represents an area and consists of two comma seperated values, first the area number, and second the text file to include in the message.
+
+## ACCESSFILE
+
+   1, BLACKLIST, 2, 3
+   2, WHITELIST, 2, 3
+
+Each line of the ACCESSFILE config file represents an area, the first comma seperated value is the area number, the second is the mode (WHITELIST of BLACKLIST), after that follows the nodes you wish to "WHITELIST" or "BLACKLIST" from your area.

docs/docs/guide/msgs/mnet/routine.md

@@ -0,0 +1,2 @@
+# Typical MagiNet Routine
+

src/bbs.c

@@ -447,7 +447,7 @@ char s_getchar() {
 				}
 				if (c == IAC_WILL || c == IAC_WONT || c == IAC_DO || c == IAC_DONT) {
 					do {
-						len = read(gSocket, &c, 1);
+						len = read(gSocket, &d, 1);
 					} while (len == -1 && errno == EINTR);
 					if (len <= 0) {
 						disconnect("Socket Closed");