Article routage inter-VLAN

Version intermédiaire. Section Réseaux locaux virtuels : VLANs Ajout image format de trame Ethernet + balise 802.1q
platu · Nov 14, 2011 · 9cce85f · 9cce85f
1 parent cc1c107
commit 9cce85f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 19 deletions.
diff --git a/articles/inter-vlan-routing/images/ieee8021q-frame.odg b/articles/inter-vlan-routing/images/ieee8021q-frame.odg
diff --git a/articles/inter-vlan-routing/images/ieee8021q-frame.svg b/articles/inter-vlan-routing/images/ieee8021q-frame.svg
diff --git a/articles/inter-vlan-routing/inter-vlan-routing.xml b/articles/inter-vlan-routing/inter-vlan-routing.xml
@@ -133,10 +133,10 @@
       <entry>
       <inlinemediaobject>
         <imageobject role='fo'>
-        <imagedata format='SVG' fileref='images/osi-ethernet.svg' width='8cm' scalefit='1' />
+        <imagedata format='SVG' fileref='images/osi-ethernet.svg' width='8cm' depth='6cm' scalefit='1' />
         </imageobject>
         <imageobject role='html'>
-        <imagedata format='PNG' fileref='images/osi-ethernet.png' width='480px' scalefit='1' />
+        <imagedata format='PNG' fileref='images/osi-ethernet.png' width='480px' depth='360px' scalefit='1' />
         </imageobject>
       </inlinemediaobject>
       </entry>
@@ -210,10 +210,10 @@
 
   <mediaobject>
     <imageobject role='fo'>
-      <imagedata format='SVG' fileref='images/osi-devices.svg' width='11cm' scalefit='1' />
+      <imagedata format='SVG' fileref='images/osi-devices.svg' width='11cm' depth='7cm' scalefit='1' />
     </imageobject>
     <imageobject role='html'>
-      <imagedata format='PNG' fileref='images/osi-devices.png' width='640px' scalefit='1' />
+      <imagedata format='PNG' fileref='images/osi-devices.png' width='640px' depth='400px' scalefit='1' />
     </imageobject>
   </mediaobject>
 
@@ -592,21 +592,14 @@
   l'en-tête de trame Ethernet. Le format de la trame Ethernet modifiée avec les
   4 octets supplémentaires est présenté ci-dessous :</para>
 
-<screen width='80'>+--------------+--------------+------------+---------------------+-----+
-| adresse dst. | adresse src. | long./type | données ...         | FCS |
-+--------------+--------------+------------+---------------------+-----+
-                              |\
-                              | \__________
-                              |            \
-+--------------+--------------+-------+-----+------------+---------------------+-----+
-| adresse dst. | adresse src. | Etype | Tag | long./type | données ...         | FCS |
-+--------------+--------------+-------+-----+------------+---------------------+-----+
-                                     /       \
-                                 ___/         \___
-                                /                 \
-                               +---+-+----+--------+
-                               |pri| |    |vlan id |
-                               +---+-+----+--------+</screen>
+  <mediaobject>
+    <imageobject role='fo'>
+      <imagedata format='SVG' fileref='images/ieee8021q-frame.svg' width='15cm'/>
+    </imageobject>
+    <imageobject role='html'>
+      <imagedata format='PNG' fileref='images/ieee8021q-frame.png' width='640px'/>
+    </imageobject>
+  </mediaobject>
 
   <para>Il faut noter que le champ <literal>FCS</literal> est recalculé après
   l'insertion de la balise de <acronym>VLAN</acronym>.</para>