From 9769a453e9c2cdc47e27d31d164a92b60e97a3e5 Mon Sep 17 00:00:00 2001
From: Neale Pickett <neale@lanl.gov>
Date: Thu, 3 Mar 2011 20:46:50 -0700
Subject: [PATCH] Switch to thttpd + a few fixes

---
 mkpuzzles                               |  2 +-
 packages/mcp/service/httpd/mathopd.conf | 53 -------------------------
 packages/mcp/service/httpd/run          | 10 ++++-
 packages/octopus/solution.sh            |  6 +--
 packages/router/service/dnsmasq/log/run |  4 ++
 packages/router/service/dnsmasq/run     |  2 +-
 6 files changed, 17 insertions(+), 60 deletions(-)
 delete mode 100644 packages/mcp/service/httpd/mathopd.conf
 create mode 100755 packages/router/service/dnsmasq/log/run

diff --git a/mkpuzzles b/mkpuzzles
index 9b38fd0..4e37eec 100755
--- a/mkpuzzles
+++ b/mkpuzzles
@@ -98,7 +98,7 @@ for dn in $indir/[0-9]*; do
     # Append keys 
     if [ -f $dn/key ]; then
         while read answer; do
-            echo $points $answer >> $uanswers
+            [ -n "$answer" ] && echo $points $answer >> $uanswers
         done < $dn/key
     else
         echo "$dn/key: No such file or directory" 1>&2
diff --git a/packages/mcp/service/httpd/mathopd.conf b/packages/mcp/service/httpd/mathopd.conf
deleted file mode 100644
index 00dcb97..0000000
--- a/packages/mcp/service/httpd/mathopd.conf
+++ /dev/null
@@ -1,53 +0,0 @@
-Umask 026
-
-Log /dev/stdout
-ErrorLog /dev/stderr
-
-User nobody
-StayRoot On
-
-LogFormat {
-  RemoteAddress
-  Method
-  URI
-  Status
-  ContentLength
-  Referer
-  UserAgent
-}
-
-Tuning {
-  Timeout 5
-  ScriptTimeout 5
-}
-
-Control {
-  ScriptUser ctf
-
-  Types {
-    "text/html; charset=utf-8" { .html }
-    "text/plain; charset=utf-8" { .txt }
-    text/css { .css }
-    image/png { .png }
-    image/jpeg { .jpg }
-    image/gif { .gif }
-    application/javascript { .js }
-    application/octet-stream { * }
-  }
-  Specials {
-    CGI { .cgi }
-  }
-  IndexNames { index.html }
-}
-
-Server {
-  Address 10.0.0.2
-
-  Virtual {
-    AnyHost
-    Control {
-      Alias /
-      Location /var/www
-    }
-  }
-}
diff --git a/packages/mcp/service/httpd/run b/packages/mcp/service/httpd/run
index cc59040..9319dcb 100755
--- a/packages/mcp/service/httpd/run
+++ b/packages/mcp/service/httpd/run
@@ -14,5 +14,11 @@ for d in /opt/*; do
     fi
 done
 
-exec mathopd -n -f ./mathopd.conf
-
+cd /var/www
+exec thttpd -D \
+    -h 10.0.0.2 \
+    -c "**.cgi" \
+    -u ctf \
+    -l /proc/self/fd/1 \
+    -T UTF-8 \
+    -nos
diff --git a/packages/octopus/solution.sh b/packages/octopus/solution.sh
index a3b938e..a8424e1 100755
--- a/packages/octopus/solution.sh
+++ b/packages/octopus/solution.sh
@@ -1,16 +1,16 @@
 #! /bin/sh
 
 port=8888
-host=10.0.0.10
+host=10.0.0.8
 
 blooper=$(tempfile)
 trap "rm $blooper" 0
 
-echo foo | socat -t 0.01 STDIO UDP:$host:$port | tail -n +4 > $blooper
+echo foo | socat -t 0.01 STDIO UDP:$host:$port | tail -n +5 > $blooper
 
 for i in $(seq 8); do
     result=$(socat -t 0.01 STDIO UDP:$host:$port < $blooper | awk -F': ' '(NF > 1) {print $2; exit;}')
     port=$(echo "ibase=8; $result" | bc)
-    echo $port
+    echo "next port: $port ($result)"
 done
 echo $result
\ No newline at end of file
diff --git a/packages/router/service/dnsmasq/log/run b/packages/router/service/dnsmasq/log/run
new file mode 100755
index 0000000..d9d6355
--- /dev/null
+++ b/packages/router/service/dnsmasq/log/run
@@ -0,0 +1,4 @@
+#! /bin/sh
+
+exec svlogd -tt $PWD
+
diff --git a/packages/router/service/dnsmasq/run b/packages/router/service/dnsmasq/run
index 7616091..1373e45 100755
--- a/packages/router/service/dnsmasq/run
+++ b/packages/router/service/dnsmasq/run
@@ -8,5 +8,5 @@ exec /opt/router/sbin/dnsmasq \
     --keep-in-foreground \
     --conf-file=dnsmasq.conf \
     --pid-file= \
-    --log-facility=/dev/stdout
+    --log-facility=/proc/self/fd/1