projects
/
lectures
/
dfb-slides.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ef11053
)
jorr
author
hunz
<hunz>
Sat, 22 Mar 2003 09:49:25 +0000
(09:49 +0000)
committer
hunz
<hunz>
Sat, 22 Mar 2003 09:49:25 +0000
(09:49 +0000)
parse.pl
patch
|
blob
|
history
wlan2/wlan2.xml
patch
|
blob
|
history
diff --git
a/parse.pl
b/parse.pl
index
ff374bc
..
0f07155
100755
(executable)
--- a/
parse.pl
+++ b/
parse.pl
@@
-4,6
+4,7
@@
chomp @content;
@slide=();
chomp @content;
@slide=();
+@topics=();
@actions=( "",
"slide top",
@actions=( "",
"slide top",
@@
-27,8
+28,6
@@
while(<IN>) {
}
close(IN);
}
close(IN);
-@topics=();
-
foreach(@content) {
if((/^\d/) or (/^ \d/)) {
push(@topics,$_);
foreach(@content) {
if((/^\d/) or (/^ \d/)) {
push(@topics,$_);
@@
-55,6
+54,7
@@
push(@content," 23");
foreach(@content) {
s/\#.*//;
foreach(@content) {
s/\#.*//;
+ if(not /^\s+$/) {
s/&/&/g;
s/</</;
s/>/>/;
s/&/&/g;
s/</</;
s/>/>/;
@@
-118,5
+118,6
@@
foreach(@content) {
push(@slide,$_);
}
}
push(@slide,$_);
}
}
+}
print "</slides>\n";
\ No newline at end of file
print "</slides>\n";
\ No newline at end of file
diff --git
a/wlan2/wlan2.xml
b/wlan2/wlan2.xml
index
8d45221
..
3bdfaa3
100644
(file)
--- a/
wlan2/wlan2.xml
+++ b/
wlan2/wlan2.xml
@@
-39,13
+39,7
@@
<text > 3.4 WEP (RC4)</text>
</slide>
<text > 3.4 WEP (RC4)</text>
</slide>
-<slide effect="slide top right, blend">
-<header size="20" fgcolor="#22FF22">1 802.11b Aufbau</header>
-<text></text>
-<text> </text>
-</slide>
-
-<slide>
+<slide effect="blend">
<header size="20" fgcolor="#22FF22"> 1.1 Frame Aufbau</header>
<text></text>
<text></text>
<header size="20" fgcolor="#22FF22"> 1.1 Frame Aufbau</header>
<text></text>
<text></text>
@@
-62,7
+56,7
@@
<listitem fgcolor="#ff00cc" size="20"> Frame Body (nur in Daten Frames)</listitem>
</slide>
<listitem fgcolor="#ff00cc" size="20"> Frame Body (nur in Daten Frames)</listitem>
</slide>
-<slide effect="slide
bottom left
">
+<slide effect="slide
top left, blend
">
<header size="20" fgcolor="#22FF22"> 1.2 Die wichtigsten Frametypen</header>
<text></text>
<text></text>
<header size="20" fgcolor="#22FF22"> 1.2 Die wichtigsten Frametypen</header>
<text></text>
<text></text>
@@
-71,7
+65,6
@@
<listitem size="20"> Beacon Frames (alle 100ms)</listitem>
<text> AP announced sich und seine Capabilities</text>
<text> STAs ermitteln aus Beacon Frames die Signalstaerke </text>
<listitem size="20"> Beacon Frames (alle 100ms)</listitem>
<text> AP announced sich und seine Capabilities</text>
<text> STAs ermitteln aus Beacon Frames die Signalstaerke </text>
-<text> </text>
<text></text>
<listitem size="20"> Probe Request/Response</listitem>
<text> Req: STA sendet Request, dieser enthaelt SSID und unterstuetzte Datenraten</text>
<text></text>
<listitem size="20"> Probe Request/Response</listitem>
<text> Req: STA sendet Request, dieser enthaelt SSID und unterstuetzte Datenraten</text>
@@
-111,19
+104,18
@@
<text> Ethernet -> Ethernet (FT) (WDS)</text>
</slide>
<text> Ethernet -> Ethernet (FT) (WDS)</text>
</slide>
-<slide effect="slide
top left
">
+<slide effect="slide
bottom right, blend
">
<header size="20" fgcolor="#22FF22"> 2.1 Ad-Hoc</header>
<text></text>
<text></text>
<listitem fgcolor="#ff00cc" size="20"> Jede STA sendet Beacons</listitem>
<header size="20" fgcolor="#22FF22"> 2.1 Ad-Hoc</header>
<text></text>
<text></text>
<listitem fgcolor="#ff00cc" size="20"> Jede STA sendet Beacons</listitem>
-<text> </text>
<text></text>
<listitem fgcolor="#ff00cc" size="20"> keine Authentications oder Associations</listitem>
<text></text>
<listitem fgcolor="#ff00cc" size="20"> kein DS (und damit kein bridging) moeglich</listitem>
</slide>
<text></text>
<listitem fgcolor="#ff00cc" size="20"> keine Authentications oder Associations</listitem>
<text></text>
<listitem fgcolor="#ff00cc" size="20"> kein DS (und damit kein bridging) moeglich</listitem>
</slide>
-<slide effect="slide
top left, blend
">
+<slide effect="slide
bottom right
">
<header size="20" fgcolor="#22FF22"> 2.2 Managed</header>
<text></text>
<text> 1: Client erkennt AP via Probe Request / Response</text>
<header size="20" fgcolor="#22FF22"> 2.2 Managed</header>
<text></text>
<text> 1: Client erkennt AP via Probe Request / Response</text>
@@
-132,7
+124,7
@@
<text> 4: AP stellt Verbindung zum DS her</text>
</slide>
<text> 4: AP stellt Verbindung zum DS her</text>
</slide>
-<slide effect="slide
top
">
+<slide effect="slide
bottom
">
<header size="20" fgcolor="#22FF22"> 2.3 Wireless Distribution Systems (WDS)</header>
<text></text>
<text></text>
<header size="20" fgcolor="#22FF22"> 2.3 Wireless Distribution Systems (WDS)</header>
<text></text>
<text></text>
@@
-146,7
+138,7
@@
<listitem fgcolor="#ff00cc" size="20"> Beispiel: Koenigsplatz, IHK (CityWave)</listitem>
</slide>
<listitem fgcolor="#ff00cc" size="20"> Beispiel: Koenigsplatz, IHK (CityWave)</listitem>
</slide>
-<slide effect="slide top">
+<slide effect="slide top
right
">
<header size="20" fgcolor="#22FF22"> 3.1 Wardriven im Monitoring Mode</header>
<text></text>
<text></text>
<header size="20" fgcolor="#22FF22"> 3.1 Wardriven im Monitoring Mode</header>
<text></text>
<text></text>
@@
-157,7
+149,7
@@
<listitem fgcolor="#ff00cc" size="20"> gibt alle empfangenen Pakete ungefiltertert an den Host weiter</listitem>
</slide>
<listitem fgcolor="#ff00cc" size="20"> gibt alle empfangenen Pakete ungefiltertert an den Host weiter</listitem>
</slide>
-<slide effect="slide
top
">
+<slide effect="slide
bottom left, blend
">
<header size="20" fgcolor="#22FF22"> 3.2 Hidden SSIDs</header>
<text></text>
<text></text>
<header size="20" fgcolor="#22FF22"> 3.2 Hidden SSIDs</header>
<text></text>
<text></text>
@@
-173,7
+165,7
@@
<listitem fgcolor="#ff00cc" size="20"> STA durch gespoofte Disassociation zum associaten zwingen </listitem>
</slide>
<listitem fgcolor="#ff00cc" size="20"> STA durch gespoofte Disassociation zum associaten zwingen </listitem>
</slide>
-<slide effect="slide bottom
lef
t">
+<slide effect="slide bottom
righ
t">
<header size="20" fgcolor="#22FF22"> 3.3 Access Control Lists (ACLs)</header>
<text></text>
<text></text>
<header size="20" fgcolor="#22FF22"> 3.3 Access Control Lists (ACLs)</header>
<text></text>
<text></text>
@@
-183,7
+175,7
@@
<listitem fgcolor="#ff00cc" size="20"> Freigeschaltete MAC uebernehmen</listitem>
</slide>
<listitem fgcolor="#ff00cc" size="20"> Freigeschaltete MAC uebernehmen</listitem>
</slide>
-<slide effect="slide left
, blend
">
+<slide effect="slide left">
<header size="20" fgcolor="#22FF22"> 3.4 WEP (RC4)</header>
<text></text>
<text></text>
<header size="20" fgcolor="#22FF22"> 3.4 WEP (RC4)</header>
<text></text>
<text></text>