pascal-ize the error string

fix error check in mlisten

README.md

@@ -21,10 +21,10 @@ Installation:
 
 2. copy the `etc/services` file to `/etc/services` (if it does not exist).
 
-3. edit and copy the `etc/resolve.conf` file to `/etc/resolve.conf` (if it does 
-not exist). This file is your DNS server
+3. edit and copy the `etc/resolv.conf` file to `/etc/resolv.conf` (if it does 
+not exist). This file points to your DNS server; update it as needed.
 
-4. If you don not have a DNS server, edit `/etc/hosts` to include your favorite 
+4. If you do not have a DNS server, edit `/etc/hosts` to include your favorite 
 sites.
 
 
@@ -81,12 +81,19 @@ of `sendto`.
 `ioctl` -- support for `FIONREAD` (bytes available to read) and `FIONBIO` 
 (set/clear non-blocking).
 
+`setsockopt` --  `SO_SNDLOWAT`, `SO_RCVLOWAT`, `SO_SNDTIMEO`, and `SO_RCVTIMEO` are supported.
+`SO_OOBINLINE` errors unless it's true. 
+`SO_DEBUG`, `SO_REUSEADDR`, `SO_REUSEPORT`, `SO_KEEPALIVE` set a flag but have no other effect.
+
+
+
+`getsockopt` -- support for `SO_TYPE`, `SO_DEBUG`, `SO_REUSEADDR`, `SO_REUSEPORT`, `SO_KEEPALIVE`, 
+`SO_OOBINLINE`, `SO_SNDLOWAT`, `SO_RCVLOWAT`, `SO_SNDTIMEO`, `SO_RCVTIMEO`, `SO_NREAD`, `SO_NWRITE`
+
 `getsockopt` -- support for `SO_OOBINLINE`, `SO_SNDLOWAT`, `SO_RCVLOWAT`, 
 `SO_SNDTIMEO`, `SO_RCVTIMEO`, `SNDLOWAT` and `SNDTIMEO` set flags but don not have any 
 other effect.  `OOBINLINE` is only be supported when true.
 
-`getsockopt` -- support for `SO_TYPE`, `SO_OOBINLINE`, `SO_SNDLOWAT`, `SO_RCVLOWAT`, 
-`SO_SNDTIMEO`
 
 Not (yet) supported:
 --------------------

README.text

@@ -23,10 +23,10 @@ sic -h irc.a2central.com -p 6667 -n myname
 
 
 2. copy the etc/services file to /etc/services (if it does not exist).
-3. edit and copy the etc/resolve.conf file to /etc/resolve.conf (if it does 
-not exist). This file is your DNS server
+3. edit and copy the etc/resolv.conf file to /etc/resolv.conf (if it does 
+not exist). This file points to your DNS server; update it as needed.
 
-4. If you don't have a DNS server, edit /etc/hosts to include your favorite 
+4. If you do not have a DNS server, edit /etc/hosts to include your favorite 
 sites.
 
 

etc/services

@@ -25,7 +25,7 @@ msp		18/udp		# message send protocol
 chargen		19/tcp		ttytst source
 chargen		19/udp		ttytst source
 ftp		21/tcp
-# 22 - unassigned
+ssh		22/tcp
 telnet		23/tcp
 # 24 - private
 smtp		25/tcp		mail

maccept.c

@@ -104,4 +104,4 @@ int maccept(Entry *e, void *p1, void *p2, void *p3, void *p4, void *p5)
 
 
     return 0;
-}
+}

main.c

@@ -63,7 +63,7 @@ Word StartUp(displayPtr fx)
   // require 3.0b3
   if (TCPIPLongVersion() < 0x03006003)
   {
-    if (fx) fx("Marinetti 3.0b3 is required.");
+    if (fx) fx("\pMarinetti 3.0b3 is required.");
     if (flags & kLoaded)
       UnloadOneTool(54);
     return -1;      
@@ -105,7 +105,7 @@ void ShutDown(word flags, Boolean force, displayPtr fx)
     }
 }
 
-#define VERSION "0.2"
+#define VERSION "0.4"
 static void version(void)
 {
     fputs("Marignotti " VERSION "\n", stdout);

mbind.c

@@ -71,4 +71,4 @@ int mbind(Entry *e, void *p1, void *p2, void *p3, void *p4, void *p5)
     }
     return 0;
 
-}
+}

mdetach.c

@@ -27,4 +27,4 @@ int mdetach(Entry *e, void *p1, void *p2, void *p3, void *p4, void *p5)
     DecBusy();
     
     return 0; 
-}
+}

mgetpeername.c

@@ -38,4 +38,4 @@ int mgetpeername(Entry *e, void *p1, void *p2, void *p3, void *p4, void *p5)
     copy_addr(&tmp, addr, addrlen);
 
     return 0;
-}
+}

mgetsockname.c

@@ -39,4 +39,4 @@ int mgetsockname(Entry *e, void *p1, void *p2, void *p3, void *p4, void *p5)
     copy_addr(&tmp, addr, addrlen);
     
     return 0;
-}
+}

mioctl.c

@@ -43,4 +43,4 @@ int mioctl(Entry *e, void *p1, void *p2, void *p3, void *p4, void *p5)
     // SIOCSLOWAT / SIOCGLOWAT ?
     
     return EINVAL;
-}
+}

mlisten.c

@@ -37,8 +37,8 @@ int mlisten(Entry *e, void *p1, void *p2, void *p3, void *p4, void *p5)
     if (t) return ENETDOWN;
     
     // not in TCPSCLOSED state.
-    if (terr = tcperrConExists) return EINVAL;
+    if (terr == tcperrConExists) return EINVAL;
     if (terr) return EINVAL; // other errors?
     
     return 0;
-}
+}

mread.c

@@ -243,4 +243,3 @@ int mread(Entry *e, void *p1, void *p2, void *p3, void *p4, void *p5)
     // should not hit...
     return 0;
 }
-

mselect.c

@@ -172,4 +172,4 @@ int mselect(Entry *e, void *p1, void *p2, void *p3, void *p4, void *p5)
     CLI();
     
     return 0;
-}
+}

msetsockopt.c

@@ -168,4 +168,4 @@ int msetsockopt(Entry *e, void *p1, void *p2, void *p3, void *p4, void *p5)
     }
     
     return EINVAL;   
-}
+}

mshutdown.c

@@ -26,4 +26,4 @@ int mshutdown(Entry *e, void *p1, void *p2, void *p3, void *p4, void *p5)
         return EINVAL;
     }
     return 0;
-}
+}

mwrite.c

@@ -95,4 +95,4 @@ int mwrite(Entry *e, void *p1, void *p2, void *p3, void *p4, void *p5)
     *outbytes = nbytes;
         
     return 0;
-}
+}

net.h

@@ -32,4 +32,3 @@
 #define PRU_CO_GETOPT	18
 #define PRU_CO_SETOPT	19
 #define PRU_SELECT	20
-

s16debug.c

@@ -204,4 +204,3 @@ void s16_debug_tcp(unsigned ipid)
     s16_debug_printf("          uwUDPCount: $%08lx", ur->uwUDPCount);
 
 }
-

table.c

@@ -332,4 +332,4 @@ void process_table(void)
         e = next;
     }
 
-}
+}