diff --git a/Makefile b/Makefile
index d4f86bd..f51fd72 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@ all: $(SVG_PDFTEXS) $(SVG_PDF) $(AUTOGEN_SVGS) $(TARGET)
%.pdf: %.tex
latexmk -pdfxe $<
-imgs/_autogen/%: imgs/%.svg
+imgs/_autogen/%: imgs/%.svg imgs/split_layers.py
imgs/split_layers.py "$*.svg"
cd "$@" ; inkscape --export-type=pdf *.svg
@@ -29,3 +29,6 @@ clean:
latexmk -C
rm -rf "imgs/pdf_tex" "imgs/pdf"
rm -rf imgs/_autogen
+
+upload:
+ scp slides.pdf www.tobast:~/files/ietf108-v40v6.pdf
diff --git a/imgs/mac.svg b/imgs/mac.svg
index 7e38ddb..567e0e4 100644
--- a/imgs/mac.svg
+++ b/imgs/mac.svg
@@ -322,7 +322,7 @@
id="path3157" />
+ style="display:none">
+
+ transform="translate(0,0.34224089)"
+ id="g8115">
+ y="11.454397"
+ x="395.68088"
+ height="9.9659071"
+ width="9.9659071"
+ id="rect8072"
+ style="fill:#0700ff;fill-opacity:1;stroke:#4b4b4b;stroke-width:0.617426;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ IPv4 addr
+
+
+
+ MAC addr
+
+
+
+
+
IPv4 addr
+
+
+
+ MAC addr
+
+
-
IPv6 addr
- MAC addr
-
-
-
-
-
-
- Routing table
- Dest. prefix
- Next hop
-
-
-
-
-
-
-
-
+
+
+
+
+
+ Routing table
+ Dest. prefix
+ Next hop
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -826,7 +953,7 @@
style="fill:none;fill-opacity:0.479438;stroke:#ff0009;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
@@ -954,76 +1081,95 @@
id="path6998"
d="m 165.84999,93.439097 c 0,0 11.9266,-20.931873 61.67536,-20.931873 49.74876,0 55.96178,14.703118 61.67536,20.931873"
style="fill:none;stroke:#000000;stroke-width:1.5875;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker7582)" />
-
-
-
- Hey
- , what's your MAC address?
-
-
-
-
-
+
+ Hey
+ , what's your MAC address?
+
+
+
+
+
+
+
+
-
-
-
-
- Hey
- , it's
-
- . Cheers!
-
-
+ id="g8037">
+
+ Hey
+ , it's
+ . Cheers!
+
+
+
+
+
+
+
+
+
+
+ WAIT, but then…
+ Why can't we havea v6 next hop?
diff --git a/imgs/split_layers.py b/imgs/split_layers.py
index f2cc9e2..0328f1a 100755
--- a/imgs/split_layers.py
+++ b/imgs/split_layers.py
@@ -14,14 +14,32 @@ namespaces = {
splits = {
"mac.svg": {
- "_always": ["Base", "Key"],
- "0": [],
- "1": ["Routing table"],
- "2": ["Routing table", "Routing table - select"],
- "3": ["Yellow router"],
- "4": ["Yellow router", "ARP query"],
- "5": ["Yellow router", "ARP query", "ARP answer"],
- "6": ["Yellow router", "Outbound packet"],
+ "_always": ["Base"],
+ "01": ["Key"],
+ "02": ["Key", "Routing table", "Routing table v4"],
+ "03": ["Key", "Routing table", "Routing table v4", "Routing table - select"],
+ "04": ["Key", "Yellow router"],
+ "05": ["Key", "Yellow router", "ARP query", "ARP query v4"],
+ "06": [
+ "Key",
+ "Yellow router",
+ "ARP query",
+ "ARP query v4",
+ "ARP answer",
+ "ARP answer v4",
+ ],
+ "07": ["Key", "Yellow router", "Outbound packet"],
+ "08": ["Key", "Yellow router", "Outbound packet", "Waitbutthen"],
+ "09": ["Key v6", "Routing table", "Routing table v6", "Routing table - select"],
+ "10": [
+ "Key v6",
+ "Yellow router",
+ "ARP query",
+ "ARP query v6",
+ "ARP answer",
+ "ARP answer v6",
+ ],
+ "11": ["Key v6", "Yellow router", "Outbound packet"],
}
}
diff --git a/slides.tex b/slides.tex
index bf359eb..8ddfd2c 100644
--- a/slides.tex
+++ b/slides.tex
@@ -68,13 +68,17 @@ routing protocol}
\begin{frame}{What's under the hull?}
\begin{figure}
\centering
- \only<0>{\includegraphics[width=\columnwidth]{imgs/_autogen/mac/0.pdf}}
- \only<1>{\includegraphics[width=\columnwidth]{imgs/_autogen/mac/1.pdf}}
- \only<2>{\includegraphics[width=\columnwidth]{imgs/_autogen/mac/2.pdf}}
- \only<3>{\includegraphics[width=\columnwidth]{imgs/_autogen/mac/3.pdf}}
- \only<4>{\includegraphics[width=\columnwidth]{imgs/_autogen/mac/4.pdf}}
- \only<5>{\includegraphics[width=\columnwidth]{imgs/_autogen/mac/5.pdf}}
- \only<6>{\includegraphics[width=\columnwidth]{imgs/_autogen/mac/6.pdf}}
+ \only<1>{\includegraphics[width=\columnwidth]{imgs/_autogen/mac/01.pdf}}
+ \only<2>{\includegraphics[width=\columnwidth]{imgs/_autogen/mac/02.pdf}}
+ \only<3>{\includegraphics[width=\columnwidth]{imgs/_autogen/mac/03.pdf}}
+ \only<4>{\includegraphics[width=\columnwidth]{imgs/_autogen/mac/04.pdf}}
+ \only<5>{\includegraphics[width=\columnwidth]{imgs/_autogen/mac/05.pdf}}
+ \only<6>{\includegraphics[width=\columnwidth]{imgs/_autogen/mac/06.pdf}}
+ \only<7>{\includegraphics[width=\columnwidth]{imgs/_autogen/mac/07.pdf}}
+ \only<8>{\includegraphics[width=\columnwidth]{imgs/_autogen/mac/08.pdf}}
+ \only<9>{\includegraphics[width=\columnwidth]{imgs/_autogen/mac/09.pdf}}
+ \only<10>{\includegraphics[width=\columnwidth]{imgs/_autogen/mac/10.pdf}}
+ \only<11>{\includegraphics[width=\columnwidth]{imgs/_autogen/mac/11.pdf}}
\end{figure}
\end{frame}