33c3: Copyright + Name cosmetic fix

2 files changed, 569 insertions, 2 deletions

diff --git a/2016/33c3/33c3-modems.adoc b/2016/33c3/33c3-modems.adoc
index bf37f4d..f7cc365 100644
--- a/2016/33c3/33c3-modems.adoc
+++ b/2016/33c3/33c3-modems.adoc
@@ -1,8 +1,8 @@
 
 Dissecting modern (3G/4G) cellular modems
 =========================================
-:author:	Harald Welte <laforge@gpl-violations.org>, Holger Hans Peter Freyther
-#:copyright:	sysmocom - s.f.m.c. GmbH (License: CC-BY-SA)
+:author:	Harald Welte, Holger Hans Peter Freyther
+:copyright:	Harald Welte, Holger Hans Peter Freyther (License: CC-BY-SA)
 :backend:	slidy
 :max-width:	45em
 
diff --git a/2016/33c3/images/qmi_smd_qmuxd.svg b/2016/33c3/images/qmi_smd_qmuxd.svg
new file mode 100644
index 0000000..57fee42
--- /dev/null
+++ b/2016/33c3/images/qmi_smd_qmuxd.svg
@@ -0,0 +1,567 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generated by graphviz version 2.38.0 (20140413.2041)
+ -->
+
+<!-- Title: G Pages: 1 -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="526.20099pt"
+   height="243.74985pt"
+   viewBox="0 0 757.29959 351.38867"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="qmi_smd_qmuxd.svg">
+  <metadata
+     id="metadata204">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs202" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1080"
+     id="namedview200"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="0.4057971"
+     inkscape:cx="168.00978"
+     inkscape:cy="85.312309"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2" />
+  <g
+     id="graph0"
+     class="graph"
+     transform="matrix(0.694444,0,0,0.694444,1.8623136,348.61089)">
+    <title
+       id="title5">G</title>
+    <polygon
+       points="1088.34,4 -4,4 -4,4 -4,-502 1088.34,-502 "
+       id="polygon7"
+       style="fill:#ffffff;stroke:none" />
+    <g
+       id="clust1"
+       class="cluster">
+      <title
+         id="title10">cluster_kernel</title>
+      <polygon
+         points="1013.29,-415 144.69,-415 144.69,-415 144.69,-490 1013.29,-490 "
+         id="polygon12"
+         style="fill:none;stroke:#000000" />
+      <text
+         x="578.98999"
+         y="-474.79999"
+         font-size="14.00"
+         id="text14"
+         style="font-size:14px;font-family:Times, serif;text-anchor:middle">Linux Kenrnel</text>
+    </g>
+    <g
+       id="clust2"
+       class="cluster">
+      <title
+         id="title17">cluster_userspace</title>
+      <polygon
+         points="1076.34,-8 517.268,-8 517.268,-8 517.268,-407 1076.34,-407 "
+         id="polygon19"
+         style="fill:none;stroke:#000000" />
+      <text
+         x="796.802"
+         y="-391.79999"
+         font-size="14.00"
+         id="text21"
+         style="font-size:14px;font-family:Times, serif;text-anchor:middle">Linux Userspace</text>
+    </g>
+    <!-- MDSP -->
+    <g
+       id="node1"
+       class="node">
+      <title
+         id="title24">MDSP</title>
+      <ellipse
+         cx="57.844898"
+         cy="-441"
+         rx="57.690102"
+         ry="18"
+         id="ellipse26"
+         style="fill:none;stroke:#000000" />
+      <text
+         x="57.844898"
+         y="-437.29999"
+         font-size="14.00"
+         id="text28"
+         style="font-size:14px;font-family:Times, serif;text-anchor:middle">Modem DSP</text>
+    </g>
+    <!-- SMD -->
+    <g
+       id="node2"
+       class="node">
+      <title
+         id="title31">SMD</title>
+      <ellipse
+         cx="252.131"
+         cy="-441"
+         rx="99.382401"
+         ry="18"
+         id="ellipse33"
+         style="fill:none;stroke:#000000" />
+      <text
+         x="252.131"
+         y="-437.29999"
+         font-size="14.00"
+         id="text35"
+         style="font-size:14px;font-family:Times, serif;text-anchor:middle">Shared Memory Devices</text>
+    </g>
+    <!-- SMD&#45;&gt;MDSP -->
+    <g
+       id="edge1"
+       class="edge">
+      <title
+         id="title38">SMD-&gt;MDSP</title>
+      <path
+         d="m 152.453,-441 c -8.915,0 -17.802,0 -26.353,0"
+         id="path40"
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#000000" />
+      <polygon
+         points="125.858,-437.5 125.858,-437.5 115.858,-441 125.858,-444.5 "
+         id="polygon42"
+         style="fill:#000000;stroke:#000000" />
+    </g>
+    <!-- frmnet -->
+    <g
+       id="node3"
+       class="node">
+      <title
+         id="title45">frmnet</title>
+      <ellipse
+         cx="561.01398"
+         cy="-441"
+         rx="86.384697"
+         ry="18"
+         id="ellipse47"
+         style="fill:none;stroke:#000000" />
+      <text
+         x="561.01398"
+         y="-437.29999"
+         font-size="14.00"
+         id="text49"
+         style="font-size:14px;font-family:Times, serif;text-anchor:middle">f_rmnet USB Gadget</text>
+    </g>
+    <!-- frmnet&#45;&gt;SMD -->
+    <g
+       id="edge2"
+       class="edge">
+      <title
+         id="title52">frmnet-&gt;SMD</title>
+      <path
+         d="m 474.53,-441 c -34.854,0 -75.57,0 -112.513,0"
+         id="path54"
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#000000" />
+      <polygon
+         points="361.705,-437.5 361.705,-437.5 351.705,-441 361.705,-444.5 "
+         id="polygon56"
+         style="fill:#000000;stroke:#000000" />
+    </g>
+    <!-- USB -->
+    <g
+       id="node4"
+       class="node">
+      <title
+         id="title59">USB</title>
+      <ellipse
+         cx="949.396"
+         cy="-441"
+         rx="55.790298"
+         ry="18"
+         id="ellipse61"
+         style="fill:none;stroke:#000000" />
+      <text
+         x="949.396"
+         y="-437.29999"
+         font-size="14.00"
+         id="text63"
+         style="font-size:14px;font-family:Times, serif;text-anchor:middle">USB to Host</text>
+    </g>
+    <!-- USB&#45;&gt;frmnet -->
+    <g
+       id="edge3"
+       class="edge">
+      <title
+         id="title66">USB-&gt;frmnet</title>
+      <path
+         d="m 893.447,-441 c -61.188,0 -161.23,0 -235.419,0"
+         id="path68"
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#000000" />
+      <polygon
+         points="657.737,-437.5 657.737,-437.5 647.737,-441 657.737,-444.5 "
+         id="polygon70"
+         style="fill:#000000;stroke:#000000" />
+    </g>
+    <!-- qmuxd -->
+    <g
+       id="node5"
+       class="node">
+      <title
+         id="title73">qmuxd</title>
+      <ellipse
+         cx="561.01398"
+         cy="-223"
+         rx="35.995399"
+         ry="18"
+         id="ellipse75"
+         style="fill:none;stroke:#000000" />
+      <text
+         x="561.01398"
+         y="-219.3"
+         font-size="14.00"
+         id="text77"
+         style="font-size:14px;font-family:Times, serif;text-anchor:middle">qmuxd</text>
+    </g>
+    <!-- qmuxd&#45;&gt;SMD -->
+    <g
+       id="edge4"
+       class="edge">
+      <title
+         id="title80">qmuxd-&gt;SMD</title>
+      <path
+         d="M 539.402,-237.642 C 487.292,-274.66 349.915,-372.248 286.313,-417.428"
+         id="path82"
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#000000" />
+      <polygon
+         points="283.97,-414.799 283.97,-414.799 277.845,-423.444 288.024,-420.506 "
+         id="polygon84"
+         style="fill:#000000;stroke:#000000" />
+      <text
+         x="413.07199"
+         y="-361.79999"
+         font-size="14.00"
+         id="text86"
+         style="font-size:14px;font-family:Times, serif;text-anchor:middle">/dev/smdccntlN</text>
+    </g>
+    <!-- atfwd_daemon -->
+    <g
+       id="node6"
+       class="node">
+      <title
+         id="title89">atfwd_daemon</title>
+      <ellipse
+         cx="949.396"
+         cy="-358"
+         rx="63.889301"
+         ry="18"
+         id="ellipse91"
+         style="fill:none;stroke:#000000" />
+      <text
+         x="949.396"
+         y="-354.29999"
+         font-size="14.00"
+         id="text93"
+         style="font-size:14px;font-family:Times, serif;text-anchor:middle">atfwd_daemon</text>
+    </g>
+    <!-- atfwd_daemon&#45;&gt;qmuxd -->
+    <g
+       id="edge5"
+       class="edge">
+      <title
+         id="title96">atfwd_daemon-&gt;qmuxd</title>
+      <path
+         d="m 886.136,-355.68 c -59.175,4.222 -149.456,15.999 -220.679,48.68 -31.742,14.565 -62.019,41.162 -81.52,60.536"
+         id="path98"
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#000000" />
+      <polygon
+         points="586.271,-243.847 586.271,-243.847 576.762,-239.176 581.283,-248.757 "
+         id="polygon100"
+         style="fill:#000000;stroke:#000000" />
+      <text
+         x="738.95697"
+         y="-350.79999"
+         font-size="14.00"
+         id="text102"
+         style="font-size:14px;font-family:Times, serif;text-anchor:middle">/var/qmux_connect_socket</text>
+    </g>
+    <!-- quectel_daemon -->
+    <g
+       id="node7"
+       class="node">
+      <title
+         id="title105">quectel_daemon</title>
+      <ellipse
+         cx="949.396"
+         cy="-304"
+         rx="68.787903"
+         ry="18"
+         id="ellipse107"
+         style="fill:none;stroke:#000000" />
+      <text
+         x="949.396"
+         y="-300.29999"
+         font-size="14.00"
+         id="text109"
+         style="font-size:14px;font-family:Times, serif;text-anchor:middle">quectel_daemon</text>
+    </g>
+    <!-- quectel_daemon&#45;&gt;qmuxd -->
+    <g
+       id="edge7"
+       class="edge">
+      <title
+         id="title112">quectel_daemon-&gt;qmuxd</title>
+      <path
+         d="m 884.775,-297.592 c -57.803,6.642 -145.121,18.734 -219.318,37.592 -22.614,5.747 -47.236,14.451 -66.784,21.973"
+         id="path114"
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#000000" />
+      <polygon
+         points="599.822,-234.718 599.822,-234.718 589.234,-234.336 597.273,-241.238 "
+         id="polygon116"
+         style="fill:#000000;stroke:#000000" />
+      <text
+         x="738.95697"
+         y="-291.79999"
+         font-size="14.00"
+         id="text118"
+         style="font-size:14px;font-family:Times, serif;text-anchor:middle">/var/qmux_connect_socket</text>
+    </g>
+    <!-- mbimd -->
+    <g
+       id="node8"
+       class="node">
+      <title
+         id="title121">mbimd</title>
+      <ellipse
+         cx="949.396"
+         cy="-250"
+         rx="36.2938"
+         ry="18"
+         id="ellipse123"
+         style="fill:none;stroke:#000000" />
+      <text
+         x="949.396"
+         y="-246.3"
+         font-size="14.00"
+         id="text125"
+         style="font-size:14px;font-family:Times, serif;text-anchor:middle">mbimd</text>
+    </g>
+    <!-- mbimd&#45;&gt;qmuxd -->
+    <g
+       id="edge8"
+       class="edge">
+      <title
+         id="title128">mbimd-&gt;qmuxd</title>
+      <path
+         d="m 913.083,-247.532 c -70.459,4.923 -228.389,15.959 -306.115,21.391"
+         id="path130"
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#000000" />
+      <polygon
+         points="606.77,-222.619 606.77,-222.619 596.55,-225.413 606.282,-229.602 "
+         id="polygon132"
+         style="fill:#000000;stroke:#000000" />
+      <text
+         x="738.95697"
+         y="-244.8"
+         font-size="14.00"
+         id="text134"
+         style="font-size:14px;font-family:Times, serif;text-anchor:middle">/var/qmux_connect_socket</text>
+    </g>
+    <!-- ipth_dme -->
+    <g
+       id="node9"
+       class="node">
+      <title
+         id="title137">ipth_dme</title>
+      <ellipse
+         cx="949.396"
+         cy="-196"
+         rx="44.393002"
+         ry="18"
+         id="ellipse139"
+         style="fill:none;stroke:#000000" />
+      <text
+         x="949.396"
+         y="-192.3"
+         font-size="14.00"
+         id="text141"
+         style="font-size:14px;font-family:Times, serif;text-anchor:middle">ipth_dme</text>
+    </g>
+    <!-- ipth_dme&#45;&gt;qmuxd -->
+    <g
+       id="edge9"
+       class="edge">
+      <title
+         id="title144">ipth_dme-&gt;qmuxd</title>
+      <path
+         d="m 905.209,-197.778 c -55.529,-2.438 -154.917,-7.317 -239.752,-14.222 -19.502,-1.587 -41.024,-3.801 -59.363,-5.827"
+         id="path146"
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#000000" />
+      <polygon
+         points="605.533,-214.368 605.533,-214.368 595.985,-218.96 606.313,-221.324 "
+         id="polygon148"
+         style="fill:#000000;stroke:#000000" />
+      <text
+         x="738.95697"
+         y="-215.8"
+         font-size="14.00"
+         id="text150"
+         style="font-size:14px;font-family:Times, serif;text-anchor:middle">/var/qmux_connect_socket</text>
+    </g>
+    <!-- qti -->
+    <g
+       id="node10"
+       class="node">
+      <title
+         id="title153">qti</title>
+      <ellipse
+         cx="949.396"
+         cy="-142"
+         rx="27"
+         ry="18"
+         id="ellipse155"
+         style="fill:none;stroke:#000000" />
+      <text
+         x="949.396"
+         y="-138.3"
+         font-size="14.00"
+         id="text157"
+         style="font-size:14px;font-family:Times, serif;text-anchor:middle">qti</text>
+    </g>
+    <!-- qti&#45;&gt;qmuxd -->
+    <g
+       id="edge10"
+       class="edge">
+      <title
+         id="title160">qti-&gt;qmuxd</title>
+      <path
+         d="m 922.279,-144.004 c -50.347,-4.273 -164.053,-15.917 -256.822,-39.996 -23.044,-5.981 -48.043,-15.323 -67.692,-23.364"
+         id="path162"
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#000000" />
+      <polygon
+         points="596.186,-204.23 596.186,-204.23 588.3,-211.305 598.877,-210.692 "
+         id="polygon164"
+         style="fill:#000000;stroke:#000000" />
+      <text
+         x="738.95697"
+         y="-187.8"
+         font-size="14.00"
+         id="text166"
+         style="font-size:14px;font-family:Times, serif;text-anchor:middle">/var/qmux_connect_socket</text>
+    </g>
+    <!-- qxmapp -->
+    <g
+       id="node11"
+       class="node">
+      <title
+         id="title169">qxmapp</title>
+      <ellipse
+         cx="949.396"
+         cy="-88"
+         rx="39.793499"
+         ry="18"
+         id="ellipse171"
+         style="fill:none;stroke:#000000" />
+      <text
+         x="949.396"
+         y="-84.300003"
+         font-size="14.00"
+         id="text173"
+         style="font-size:14px;font-family:Times, serif;text-anchor:middle">qxmapp</text>
+    </g>
+    <!-- qxmapp&#45;&gt;qmuxd -->
+    <g
+       id="edge11"
+       class="edge">
+      <title
+         id="title176">qxmapp-&gt;qmuxd</title>
+      <path
+         d="M 909.488,-88.6968 C 853.173,-91.0427 746.793,-100.562 665.457,-138 c -31.875,-14.672 -62.128,-41.597 -81.588,-61.223"
+         id="path178"
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#000000" />
+      <polygon
+         points="581.159,-196.991 581.159,-196.991 576.712,-206.607 586.185,-201.863 "
+         id="polygon180"
+         style="fill:#000000;stroke:#000000" />
+      <text
+         x="738.95697"
+         y="-141.8"
+         font-size="14.00"
+         id="text182"
+         style="font-size:14px;font-family:Times, serif;text-anchor:middle">/var/qmux_connect_socket</text>
+    </g>
+    <!-- QCMAP -->
+    <g
+       id="node12"
+       class="node">
+      <title
+         id="title185">QCMAP</title>
+      <ellipse
+         cx="949.396"
+         cy="-34"
+         rx="118.879"
+         ry="18"
+         id="ellipse187"
+         style="fill:none;stroke:#000000" />
+      <text
+         x="949.396"
+         y="-30.299999"
+         font-size="14.00"
+         id="text189"
+         style="font-size:14px;font-family:Times, serif;text-anchor:middle">QCMAP_ConnectionManager</text>
+    </g>
+    <!-- QCMAP&#45;&gt;qmuxd -->
+    <g
+       id="edge6"
+       class="edge">
+      <title
+         id="title192">QCMAP-&gt;qmuxd</title>
+      <path
+         d="M 830.473,-33.0828 C 776.745,-37.5045 714.374,-49.8157 665.457,-80 c -44.856,-27.678 -76.136,-82.727 -91.832,-115.865"
+         id="path194"
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#000000" />
+      <polygon
+         points="570.427,-194.443 570.427,-194.443 569.435,-204.991 576.788,-197.364 "
+         id="polygon196"
+         style="fill:#000000;stroke:#000000" />
+      <text
+         x="738.95697"
+         y="-83.800003"
+         font-size="14.00"
+         id="text198"
+         style="font-size:14px;font-family:Times, serif;text-anchor:middle">/var/qmux_connect_socket</text>
+    </g>
+  </g>
+</svg>