-

diff --git a/create-xml b/create-xml
deleted file mode 100755 (executable)
index 81990e1..0000000
--- a/create-xml
+++ /dev/null
@@ -1,104 +0,0 @@
-#!/bin/sh
-
-if [ -z "$1" -o -z "$2" ]; then
-       echo "usage: $0 <name.xml> <metafile>"
-       exit 
-fi
-name=$1 ; file=$2
-
-topic=`grep '^T' $file | awk -F^ '{ print $2 }'`
-desc=`grep '^D' $file | awk -F^ '{ print $2 }'`
-author=`grep '^A' $file | awk -F^ '{ print $2 }'`
-email=`grep '^M' $file | awk -F^ '{ print $2 }'`
-event=`grep '^E' $file | awk -F^ '{ print $2 }'`
-location=`grep '^L' $file | awk -F^ '{ print $2 }'`
-
-# print normal header
-cat > $name << EOF
-<?xml version='1.0'?>
-
-<slides effect="slide top left, blend"
-        bgcolor="#000000" fgcolor="#FFFFFF" 
-        face="../ttf/decker.ttf" size="15" 
-        bgimage="../img/bg1.png" 
-        bullet="../img/bullet.png"
-        screen_width="1024" screen_height="768">
-
-  <slide effect="none">
-    <header size="10"></header>
-    <header fgcolor="#5080FF" size="80">$topic</header>
-    <header size="20"></header>
-    <header fgcolor="#5080FF" size="35">$desc</header>
-    <header size="40"></header>
-    <text>$author</text>
-    <text/>
-    <text>email: $email</text>
-    <text>event: $event</text>
-    <text>location: $location</text>
-  </slide>
-
-EOF
-
-total=`tail -1 $file | awk -F^ '{ print $1 }'`
-((count = 0))
-
-cat >> $name << EOF
-  <slide>
-    <header size="10"></header>
-    <header fgcolor="#8080FF" size="35">Inhalt</header>
-    <header size="20"></header>
-
-EOF
-while [ "1" ]; do
-       ((j = 0))
-       ((count += 1))
-       kapitel=`grep ^${count} $file | awk -F^ '{ print $2 }'`
-       # j_max=`grep ^${count} $file | sed 's/\^/ /g' | wc -w`
-       # ((j_max -= 2))
-       cat >> $name << EOF
-   <text size="20">$kapitel</text>
-       <text/>
-EOF
-       grep ^${count} $file | awk -F^ '{ for(i=3;i<=NF;i++) print "        <listitem size=\"20\">"$i"</listitem>" }' >> $name
-       cat >> $name << EOF
-        <text/>
-EOF
-       [ "$count" = "$total" ] && break
-done
-cat >> $name << EOF
-  </slide>
-
-EOF
-
-
-((count = 0))
-while [ "1" ]; do
-       ((count += 1))
-       kapitel=`grep ^${count} $file | awk -F^ '{ print $2 }'`
-       cat >> $name << EOF
-
-  <slide>
-    <header size="10"></header>
-    <header fgcolor="#8080FF" size="35">$kapitel</header>
-    <header size="20"></header>
-
-EOF
-       ((j = 0))
-       grep ^${count} $file | awk -F^ '{ for(i=3;i<=NF;i++) print "    <text size=\"20\">" $i "</text> \
-        <text/> \
-        <listitem size=\"20\">muster</listitem> \
-        <listitem size=\"20\">muster</listitem> \
-        <listitem size=\"20\">muster</listitem> \
-        <listitem size=\"20\">muster</listitem> \
-        <text/>" }' >> $name
-       cat >> $name << EOF
-  </slide>
-EOF
-       [ "$count" = "$total" ] && break
-done
-
-cat >> $name << EOF
-</slides>
-EOF
-
-echo "done ..."

diff --git a/head2xml b/head2xml
new file mode 100755 (executable)
index 0000000..4f3d5ed
--- /dev/null
+++ b/head2xml
@@ -0,0 +1,40 @@
+#!/bin/sh
+
+if [ -z "$1" ]; then
+       echo "usage: $0 <metafile>"
+       exit 
+fi
+trgfile="header.xml" ; srcfile=$1
+
+# general
+topic=`grep '#\ T' $srcfile | awk -F^ '{ print $2 }'`
+desc=`grep '#\ D' $srcfile | awk -F^ '{ print $2 }'`
+author=`grep '#\ A' $srcfile | awk -F^ '{ print $2 }'`
+email=`grep '#\ M' $srcfile | awk -F^ '{ print $2 }'`
+event=`grep '#\ E' $srcfile | awk -F^ '{ print $2 }'`
+location=`grep '#\ L' $srcfile | awk -F^ '{ print $2 }'`
+xwidth=`grep '#\ X' $srcfile | awk -F^ '{ print $2 }'`
+ywidth=`grep '#\ Y' $srcfile | awk -F^ '{ print $2 }'`
+
+# information needed to parse contents
+total=`grep '^[0-9]' $srcfile | tail -1 | awk '{ print $1 }'`
+((count = 0))
+
+# print normal header
+cat > $trgfile << EOF
+
+<slide effect="none">
+<header size="10"></header>
+<header fgcolor="#5080FF" size="80">$topic</header>
+<header size="20"></header>
+<header fgcolor="#5080FF" size="35">$desc</header>
+<header size="40"></header>
+<text>$author</text>
+<text/>
+<text>email: $email</text>
+<text>event: $event</text>
+<text>location: $location</text>
+</slide>
+
+EOF
+#ende

diff --git a/wlan1/stp b/wlan1/stp
deleted file mode 100644 (file)
index 1d24955..0000000
--- a/wlan1/stp
+++ /dev/null
@@ -1,76 +0,0 @@
-
-    E)
-     - Equipment
-       CARD: ~40E-150E (22: +40E, 54: >100E)
-       AP: 120-800E (auch DSL-Router)
-       Antennen: 360°, 360°/X, Richt (Yagi, Pringels -> URL)
-         - nicht alle Karten / APs haben (gleichen) Antennenanschluss
-    ######
-     - Reichweite
-       100 11M
-       150 5.5M
-       300 2M
-       - mit Antenne besser / Richtantenne bis 20KM
-         wichtig: Sicht
-       - bessere Antenne: Parabolspiegel (nicht erlaubt)
-    ******
-    I) Funktionsweise
-       - Channels: - 1-13(2.412GHz +50MHz),14 (2.484GHz - nur Japan)
-       - Master: AP <-> Clients(Managed)
-       - Ad-Hoc Client <-> Client
-       - WDS: AP <-> AP
-    ******
-   II) WaveLAN unter Linux
-     - Vorr.
-       - pcmcia_cs oder Kernel
-       - wireless_tools
-       - weitere links
-    ******
-     - Config:
-    
-       - Client
-         - kein Channel
-        - (BSS)
-       - Ad-Hoc
-         - Channel
-       - Common
-         - SSID
-        - WEP
-        - short_preamble
-     #######
-     - Master
-         - HostAP Installation
-        - HermesAP
-        - Config
-          - (wie oben)
-          - Channel
-          - SSID (hidden: nur HermesAP aber: Sicherheit)
-           - MAC ACLs
-          - WEP
-          - kein Bridging (Sicherheit) aber: Link zu Doku
-     #######
-    S) Sicherheit
-           - WEP
-             - CRC32: lineare signatur (->manipulation möglich)
-             - cr1 xor cr2 xor pt1 = pt2 (oderso) 
-             - ueberlauf der IVs -> X GB grosse xor-table 
-             - per station extra keys
-            - Shamir: aktuelle Firmware
-            - 40bit brute: 104bit / wordlist: better key
-            - keygen.: just don't use windows /non-rnd keys at all ;)
-    -------------------------------------------------------------------
-    I) 802.11 Aufbau
-      - Frametypen
-        - Mgmt
-       - Ctrl
-       - Data
-      - Netze
-        - Managed
-        - Ad-Hoc
-        - Master
-        - WDS
-     - Funktion
-     - Karten
-     - Monitoring
-   II) Unsicherheit
-