doc/routeserver: Remove needless figures, centre and tweak other figs
* routeserver.texi: The full-mesh v RS topology diagrammes are fairly obvious
and don't deserve so much space. As smaller wrap-floats they might be
acceptable, but there seems no way to access that TeX feature from
Texinfo. So nuke them.
Centre the 2 other figures. Tweak size to avoid bbox overflow messages.
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 4caa462..af71262 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -20,8 +20,7 @@
EPSTOPDF = epstopdf
# The figure sources
-figures_names_parts = -normal-processing -rs-processing \
- _topologies_full _topologies_rs
+figures_names_parts = -normal-processing -rs-processing
figures_sources = $(figures_names_parts:%=fig%.dia)
figures_png = $(figures_names_parts:%=fig%.png)
figures_pdf = $(figures_names_parts:%=fig%.pdf)
diff --git a/doc/fig_topologies_full.dia b/doc/fig_topologies_full.dia
deleted file mode 100644
index 7ec3398..0000000
--- a/doc/fig_topologies_full.dia
+++ /dev/null
@@ -1,533 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<dia:diagram xmlns:dia="http://www.lysator.liu.se/~alla/dia/">
- <dia:diagramdata>
- <dia:attribute name="background">
- <dia:color val="#ffffff"/>
- </dia:attribute>
- <dia:attribute name="pagebreak">
- <dia:color val="#000099"/>
- </dia:attribute>
- <dia:attribute name="paper">
- <dia:composite type="paper">
- <dia:attribute name="name">
- <dia:string>#A4#</dia:string>
- </dia:attribute>
- <dia:attribute name="tmargin">
- <dia:real val="2.8222000598907471"/>
- </dia:attribute>
- <dia:attribute name="bmargin">
- <dia:real val="2.8222000598907471"/>
- </dia:attribute>
- <dia:attribute name="lmargin">
- <dia:real val="2.8222000598907471"/>
- </dia:attribute>
- <dia:attribute name="rmargin">
- <dia:real val="2.8222000598907471"/>
- </dia:attribute>
- <dia:attribute name="is_portrait">
- <dia:boolean val="true"/>
- </dia:attribute>
- <dia:attribute name="scaling">
- <dia:real val="1"/>
- </dia:attribute>
- <dia:attribute name="fitto">
- <dia:boolean val="false"/>
- </dia:attribute>
- </dia:composite>
- </dia:attribute>
- <dia:attribute name="grid">
- <dia:composite type="grid">
- <dia:attribute name="width_x">
- <dia:real val="1"/>
- </dia:attribute>
- <dia:attribute name="width_y">
- <dia:real val="1"/>
- </dia:attribute>
- <dia:attribute name="visible_x">
- <dia:int val="1"/>
- </dia:attribute>
- <dia:attribute name="visible_y">
- <dia:int val="1"/>
- </dia:attribute>
- <dia:composite type="color"/>
- </dia:composite>
- </dia:attribute>
- <dia:attribute name="color">
- <dia:color val="#d8e5e5"/>
- </dia:attribute>
- <dia:attribute name="guides">
- <dia:composite type="guides">
- <dia:attribute name="hguides"/>
- <dia:attribute name="vguides"/>
- </dia:composite>
- </dia:attribute>
- </dia:diagramdata>
- <dia:layer name="Background" visible="true">
- <dia:object type="Standard - Line" version="0" id="O0">
- <dia:attribute name="obj_pos">
- <dia:point val="8,11.5"/>
- </dia:attribute>
- <dia:attribute name="obj_bb">
- <dia:rectangle val="2.9,11;8.1,12"/>
- </dia:attribute>
- <dia:attribute name="conn_endpoints">
- <dia:point val="8,11.5"/>
- <dia:point val="3,11.5"/>
- </dia:attribute>
- <dia:attribute name="numcp">
- <dia:int val="1"/>
- </dia:attribute>
- <dia:attribute name="line_color">
- <dia:color val="#ff0000"/>
- </dia:attribute>
- <dia:attribute name="line_width">
- <dia:real val="0.20000000000000001"/>
- </dia:attribute>
- <dia:attribute name="start_arrow">
- <dia:enum val="22"/>
- </dia:attribute>
- <dia:attribute name="start_arrow_length">
- <dia:real val="0.5"/>
- </dia:attribute>
- <dia:attribute name="start_arrow_width">
- <dia:real val="0.5"/>
- </dia:attribute>
- <dia:attribute name="end_arrow">
- <dia:enum val="22"/>
- </dia:attribute>
- <dia:attribute name="end_arrow_length">
- <dia:real val="0.5"/>
- </dia:attribute>
- <dia:attribute name="end_arrow_width">
- <dia:real val="0.5"/>
- </dia:attribute>
- <dia:connections>
- <dia:connection handle="0" to="O6" connection="3"/>
- <dia:connection handle="1" to="O8" connection="4"/>
- </dia:connections>
- </dia:object>
- <dia:object type="Standard - Line" version="0" id="O1">
- <dia:attribute name="obj_pos">
- <dia:point val="1.5,10"/>
- </dia:attribute>
- <dia:attribute name="obj_bb">
- <dia:rectangle val="1,4.9;2,10.1"/>
- </dia:attribute>
- <dia:attribute name="conn_endpoints">
- <dia:point val="1.5,10"/>
- <dia:point val="1.5,5"/>
- </dia:attribute>
- <dia:attribute name="numcp">
- <dia:int val="1"/>
- </dia:attribute>
- <dia:attribute name="line_color">
- <dia:color val="#ff0000"/>
- </dia:attribute>
- <dia:attribute name="line_width">
- <dia:real val="0.20000000000000001"/>
- </dia:attribute>
- <dia:attribute name="start_arrow">
- <dia:enum val="22"/>
- </dia:attribute>
- <dia:attribute name="start_arrow_length">
- <dia:real val="0.5"/>
- </dia:attribute>
- <dia:attribute name="start_arrow_width">
- <dia:real val="0.5"/>
- </dia:attribute>
- <dia:attribute name="end_arrow">
- <dia:enum val="22"/>
- </dia:attribute>
- <dia:attribute name="end_arrow_length">
- <dia:real val="0.5"/>
- </dia:attribute>
- <dia:attribute name="end_arrow_width">
- <dia:real val="0.5"/>
- </dia:attribute>
- <dia:connections>
- <dia:connection handle="0" to="O8" connection="1"/>
- <dia:connection handle="1" to="O10" connection="6"/>
- </dia:connections>
- </dia:object>
- <dia:object type="Standard - Line" version="0" id="O2">
- <dia:attribute name="obj_pos">
- <dia:point val="2.56066,4.56066"/>
- </dia:attribute>
- <dia:attribute name="obj_bb">
- <dia:rectangle val="2.1364,4.1364;8.8636,10.8636"/>
- </dia:attribute>
- <dia:attribute name="conn_endpoints">
- <dia:point val="2.56066,4.56066"/>
- <dia:point val="8.43934,10.4393"/>
- </dia:attribute>
- <dia:attribute name="numcp">
- <dia:int val="1"/>
- </dia:attribute>
- <dia:attribute name="line_color">
- <dia:color val="#ff0000"/>
- </dia:attribute>
- <dia:attribute name="line_width">
- <dia:real val="0.20000000000000001"/>
- </dia:attribute>
- <dia:attribute name="start_arrow">
- <dia:enum val="22"/>
- </dia:attribute>
- <dia:attribute name="start_arrow_length">
- <dia:real val="0.5"/>
- </dia:attribute>
- <dia:attribute name="start_arrow_width">
- <dia:real val="0.5"/>
- </dia:attribute>
- <dia:attribute name="end_arrow">
- <dia:enum val="22"/>
- </dia:attribute>
- <dia:attribute name="end_arrow_length">
- <dia:real val="0.5"/>
- </dia:attribute>
- <dia:attribute name="end_arrow_width">
- <dia:real val="0.5"/>
- </dia:attribute>
- <dia:connections>
- <dia:connection handle="0" to="O10" connection="7"/>
- <dia:connection handle="1" to="O6" connection="0"/>
- </dia:connections>
- </dia:object>
- <dia:object type="Standard - Line" version="0" id="O3">
- <dia:attribute name="obj_pos">
- <dia:point val="8.43934,4.56066"/>
- </dia:attribute>
- <dia:attribute name="obj_bb">
- <dia:rectangle val="2.1364,4.1364;8.8636,10.8636"/>
- </dia:attribute>
- <dia:attribute name="conn_endpoints">
- <dia:point val="8.43934,4.56066"/>
- <dia:point val="2.56066,10.4393"/>
- </dia:attribute>
- <dia:attribute name="numcp">
- <dia:int val="1"/>
- </dia:attribute>
- <dia:attribute name="line_color">
- <dia:color val="#ff0000"/>
- </dia:attribute>
- <dia:attribute name="line_width">
- <dia:real val="0.20000000000000001"/>
- </dia:attribute>
- <dia:attribute name="start_arrow">
- <dia:enum val="22"/>
- </dia:attribute>
- <dia:attribute name="start_arrow_length">
- <dia:real val="0.5"/>
- </dia:attribute>
- <dia:attribute name="start_arrow_width">
- <dia:real val="0.5"/>
- </dia:attribute>
- <dia:attribute name="end_arrow">
- <dia:enum val="22"/>
- </dia:attribute>
- <dia:attribute name="end_arrow_length">
- <dia:real val="0.5"/>
- </dia:attribute>
- <dia:attribute name="end_arrow_width">
- <dia:real val="0.5"/>
- </dia:attribute>
- <dia:connections>
- <dia:connection handle="0" to="O4" connection="5"/>
- <dia:connection handle="1" to="O8" connection="2"/>
- </dia:connections>
- </dia:object>
- <dia:group>
- <dia:object type="Standard - Ellipse" version="0" id="O4">
- <dia:attribute name="obj_pos">
- <dia:point val="8,2"/>
- </dia:attribute>
- <dia:attribute name="obj_bb">
- <dia:rectangle val="7.95,1.95;11.05,5.05"/>
- </dia:attribute>
- <dia:attribute name="elem_corner">
- <dia:point val="8,2"/>
- </dia:attribute>
- <dia:attribute name="elem_width">
- <dia:real val="3"/>
- </dia:attribute>
- <dia:attribute name="elem_height">
- <dia:real val="3"/>
- </dia:attribute>
- <dia:attribute name="aspect">
- <dia:enum val="2"/>
- </dia:attribute>
- </dia:object>
- <dia:object type="Standard - Text" version="0" id="O5">
- <dia:attribute name="obj_pos">
- <dia:point val="8.15,4.05"/>
- </dia:attribute>
- <dia:attribute name="obj_bb">
- <dia:rectangle val="8.15,2.555;10.945,5.04"/>
- </dia:attribute>
- <dia:attribute name="text">
- <dia:composite type="text">
- <dia:attribute name="string">
- <dia:string>#RF2#</dia:string>
- </dia:attribute>
- <dia:attribute name="font">
- <dia:font family="sans" style="0" name="Helvetica"/>
- </dia:attribute>
- <dia:attribute name="height">
- <dia:real val="2"/>
- </dia:attribute>
- <dia:attribute name="pos">
- <dia:point val="8.15,4.05"/>
- </dia:attribute>
- <dia:attribute name="color">
- <dia:color val="#000000"/>
- </dia:attribute>
- <dia:attribute name="alignment">
- <dia:enum val="0"/>
- </dia:attribute>
- </dia:composite>
- </dia:attribute>
- </dia:object>
- </dia:group>
- <dia:group>
- <dia:object type="Standard - Ellipse" version="0" id="O6">
- <dia:attribute name="obj_pos">
- <dia:point val="8,10"/>
- </dia:attribute>
- <dia:attribute name="obj_bb">
- <dia:rectangle val="7.95,9.95;11.05,13.05"/>
- </dia:attribute>
- <dia:attribute name="elem_corner">
- <dia:point val="8,10"/>
- </dia:attribute>
- <dia:attribute name="elem_width">
- <dia:real val="3"/>
- </dia:attribute>
- <dia:attribute name="elem_height">
- <dia:real val="3"/>
- </dia:attribute>
- <dia:attribute name="aspect">
- <dia:enum val="2"/>
- </dia:attribute>
- </dia:object>
- <dia:object type="Standard - Text" version="0" id="O7">
- <dia:attribute name="obj_pos">
- <dia:point val="8.15,12.05"/>
- </dia:attribute>
- <dia:attribute name="obj_bb">
- <dia:rectangle val="8.105,10.555;10.9,13.04"/>
- </dia:attribute>
- <dia:attribute name="text">
- <dia:composite type="text">
- <dia:attribute name="string">
- <dia:string>#RF4#</dia:string>
- </dia:attribute>
- <dia:attribute name="font">
- <dia:font family="sans" style="0" name="Helvetica"/>
- </dia:attribute>
- <dia:attribute name="height">
- <dia:real val="2"/>
- </dia:attribute>
- <dia:attribute name="pos">
- <dia:point val="8.15,12.05"/>
- </dia:attribute>
- <dia:attribute name="color">
- <dia:color val="#000000"/>
- </dia:attribute>
- <dia:attribute name="alignment">
- <dia:enum val="0"/>
- </dia:attribute>
- </dia:composite>
- </dia:attribute>
- </dia:object>
- </dia:group>
- <dia:group>
- <dia:object type="Standard - Ellipse" version="0" id="O8">
- <dia:attribute name="obj_pos">
- <dia:point val="0,10"/>
- </dia:attribute>
- <dia:attribute name="obj_bb">
- <dia:rectangle val="-0.05,9.95;3.05,13.05"/>
- </dia:attribute>
- <dia:attribute name="elem_corner">
- <dia:point val="0,10"/>
- </dia:attribute>
- <dia:attribute name="elem_width">
- <dia:real val="3"/>
- </dia:attribute>
- <dia:attribute name="elem_height">
- <dia:real val="3"/>
- </dia:attribute>
- <dia:attribute name="aspect">
- <dia:enum val="2"/>
- </dia:attribute>
- </dia:object>
- <dia:object type="Standard - Text" version="0" id="O9">
- <dia:attribute name="obj_pos">
- <dia:point val="0.2,12.05"/>
- </dia:attribute>
- <dia:attribute name="obj_bb">
- <dia:rectangle val="0.2,10.555;2.995,13.04"/>
- </dia:attribute>
- <dia:attribute name="text">
- <dia:composite type="text">
- <dia:attribute name="string">
- <dia:string>#RF3#</dia:string>
- </dia:attribute>
- <dia:attribute name="font">
- <dia:font family="sans" style="0" name="Helvetica"/>
- </dia:attribute>
- <dia:attribute name="height">
- <dia:real val="2"/>
- </dia:attribute>
- <dia:attribute name="pos">
- <dia:point val="0.2,12.05"/>
- </dia:attribute>
- <dia:attribute name="color">
- <dia:color val="#000000"/>
- </dia:attribute>
- <dia:attribute name="alignment">
- <dia:enum val="0"/>
- </dia:attribute>
- </dia:composite>
- </dia:attribute>
- </dia:object>
- </dia:group>
- <dia:group>
- <dia:object type="Standard - Ellipse" version="0" id="O10">
- <dia:attribute name="obj_pos">
- <dia:point val="0,2"/>
- </dia:attribute>
- <dia:attribute name="obj_bb">
- <dia:rectangle val="-0.05,1.95;3.05,5.05"/>
- </dia:attribute>
- <dia:attribute name="elem_corner">
- <dia:point val="0,2"/>
- </dia:attribute>
- <dia:attribute name="elem_width">
- <dia:real val="3"/>
- </dia:attribute>
- <dia:attribute name="elem_height">
- <dia:real val="3"/>
- </dia:attribute>
- <dia:attribute name="aspect">
- <dia:enum val="2"/>
- </dia:attribute>
- </dia:object>
- <dia:object type="Standard - Text" version="0" id="O11">
- <dia:attribute name="obj_pos">
- <dia:point val="0.2,4.05"/>
- </dia:attribute>
- <dia:attribute name="obj_bb">
- <dia:rectangle val="0.155,2.555;2.95,5.04"/>
- </dia:attribute>
- <dia:attribute name="text">
- <dia:composite type="text">
- <dia:attribute name="string">
- <dia:string>#RF1#</dia:string>
- </dia:attribute>
- <dia:attribute name="font">
- <dia:font family="sans" style="0" name="Helvetica"/>
- </dia:attribute>
- <dia:attribute name="height">
- <dia:real val="2"/>
- </dia:attribute>
- <dia:attribute name="pos">
- <dia:point val="0.2,4.05"/>
- </dia:attribute>
- <dia:attribute name="color">
- <dia:color val="#000000"/>
- </dia:attribute>
- <dia:attribute name="alignment">
- <dia:enum val="0"/>
- </dia:attribute>
- </dia:composite>
- </dia:attribute>
- </dia:object>
- </dia:group>
- <dia:object type="Standard - Line" version="0" id="O12">
- <dia:attribute name="obj_pos">
- <dia:point val="8,3.5"/>
- </dia:attribute>
- <dia:attribute name="obj_bb">
- <dia:rectangle val="2.9,3;8.1,4"/>
- </dia:attribute>
- <dia:attribute name="conn_endpoints">
- <dia:point val="8,3.5"/>
- <dia:point val="3,3.5"/>
- </dia:attribute>
- <dia:attribute name="numcp">
- <dia:int val="1"/>
- </dia:attribute>
- <dia:attribute name="line_color">
- <dia:color val="#ff0000"/>
- </dia:attribute>
- <dia:attribute name="line_width">
- <dia:real val="0.20000000000000001"/>
- </dia:attribute>
- <dia:attribute name="start_arrow">
- <dia:enum val="22"/>
- </dia:attribute>
- <dia:attribute name="start_arrow_length">
- <dia:real val="0.5"/>
- </dia:attribute>
- <dia:attribute name="start_arrow_width">
- <dia:real val="0.5"/>
- </dia:attribute>
- <dia:attribute name="end_arrow">
- <dia:enum val="22"/>
- </dia:attribute>
- <dia:attribute name="end_arrow_length">
- <dia:real val="0.5"/>
- </dia:attribute>
- <dia:attribute name="end_arrow_width">
- <dia:real val="0.5"/>
- </dia:attribute>
- <dia:connections>
- <dia:connection handle="0" to="O4" connection="3"/>
- <dia:connection handle="1" to="O10" connection="4"/>
- </dia:connections>
- </dia:object>
- <dia:object type="Standard - Line" version="0" id="O13">
- <dia:attribute name="obj_pos">
- <dia:point val="9.5,5"/>
- </dia:attribute>
- <dia:attribute name="obj_bb">
- <dia:rectangle val="9,4.9;10,10.1"/>
- </dia:attribute>
- <dia:attribute name="conn_endpoints">
- <dia:point val="9.5,5"/>
- <dia:point val="9.5,10"/>
- </dia:attribute>
- <dia:attribute name="numcp">
- <dia:int val="1"/>
- </dia:attribute>
- <dia:attribute name="line_color">
- <dia:color val="#ff0000"/>
- </dia:attribute>
- <dia:attribute name="line_width">
- <dia:real val="0.20000000000000001"/>
- </dia:attribute>
- <dia:attribute name="start_arrow">
- <dia:enum val="22"/>
- </dia:attribute>
- <dia:attribute name="start_arrow_length">
- <dia:real val="0.5"/>
- </dia:attribute>
- <dia:attribute name="start_arrow_width">
- <dia:real val="0.5"/>
- </dia:attribute>
- <dia:attribute name="end_arrow">
- <dia:enum val="22"/>
- </dia:attribute>
- <dia:attribute name="end_arrow_length">
- <dia:real val="0.5"/>
- </dia:attribute>
- <dia:attribute name="end_arrow_width">
- <dia:real val="0.5"/>
- </dia:attribute>
- <dia:connections>
- <dia:connection handle="0" to="O4" connection="6"/>
- <dia:connection handle="1" to="O6" connection="1"/>
- </dia:connections>
- </dia:object>
- </dia:layer>
-</dia:diagram>
diff --git a/doc/fig_topologies_full.png b/doc/fig_topologies_full.png
deleted file mode 100644
index d39e5e2..0000000
--- a/doc/fig_topologies_full.png
+++ /dev/null
Binary files differ
diff --git a/doc/fig_topologies_rs.dia b/doc/fig_topologies_rs.dia
deleted file mode 100644
index f8aa18d..0000000
--- a/doc/fig_topologies_rs.dia
+++ /dev/null
@@ -1,499 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<dia:diagram xmlns:dia="http://www.lysator.liu.se/~alla/dia/">
- <dia:diagramdata>
- <dia:attribute name="background">
- <dia:color val="#ffffff"/>
- </dia:attribute>
- <dia:attribute name="pagebreak">
- <dia:color val="#000099"/>
- </dia:attribute>
- <dia:attribute name="paper">
- <dia:composite type="paper">
- <dia:attribute name="name">
- <dia:string>#A4#</dia:string>
- </dia:attribute>
- <dia:attribute name="tmargin">
- <dia:real val="2.8222000598907471"/>
- </dia:attribute>
- <dia:attribute name="bmargin">
- <dia:real val="2.8222000598907471"/>
- </dia:attribute>
- <dia:attribute name="lmargin">
- <dia:real val="2.8222000598907471"/>
- </dia:attribute>
- <dia:attribute name="rmargin">
- <dia:real val="2.8222000598907471"/>
- </dia:attribute>
- <dia:attribute name="is_portrait">
- <dia:boolean val="true"/>
- </dia:attribute>
- <dia:attribute name="scaling">
- <dia:real val="1"/>
- </dia:attribute>
- <dia:attribute name="fitto">
- <dia:boolean val="false"/>
- </dia:attribute>
- </dia:composite>
- </dia:attribute>
- <dia:attribute name="grid">
- <dia:composite type="grid">
- <dia:attribute name="width_x">
- <dia:real val="1"/>
- </dia:attribute>
- <dia:attribute name="width_y">
- <dia:real val="1"/>
- </dia:attribute>
- <dia:attribute name="visible_x">
- <dia:int val="1"/>
- </dia:attribute>
- <dia:attribute name="visible_y">
- <dia:int val="1"/>
- </dia:attribute>
- <dia:composite type="color"/>
- </dia:composite>
- </dia:attribute>
- <dia:attribute name="color">
- <dia:color val="#d8e5e5"/>
- </dia:attribute>
- <dia:attribute name="guides">
- <dia:composite type="guides">
- <dia:attribute name="hguides"/>
- <dia:attribute name="vguides"/>
- </dia:composite>
- </dia:attribute>
- </dia:diagramdata>
- <dia:layer name="Background" visible="true">
- <dia:object type="Standard - Line" version="0" id="O0">
- <dia:attribute name="obj_pos">
- <dia:point val="4,8.45"/>
- </dia:attribute>
- <dia:attribute name="obj_bb">
- <dia:rectangle val="2.09695,8.07589;4.46371,10.8134"/>
- </dia:attribute>
- <dia:attribute name="conn_endpoints">
- <dia:point val="4,8.45"/>
- <dia:point val="2.56066,10.4393"/>
- </dia:attribute>
- <dia:attribute name="numcp">
- <dia:int val="1"/>
- </dia:attribute>
- <dia:attribute name="line_color">
- <dia:color val="#ff0000"/>
- </dia:attribute>
- <dia:attribute name="line_width">
- <dia:real val="0.20000000000000001"/>
- </dia:attribute>
- <dia:attribute name="start_arrow">
- <dia:enum val="22"/>
- </dia:attribute>
- <dia:attribute name="start_arrow_length">
- <dia:real val="0.5"/>
- </dia:attribute>
- <dia:attribute name="start_arrow_width">
- <dia:real val="0.5"/>
- </dia:attribute>
- <dia:attribute name="end_arrow">
- <dia:enum val="22"/>
- </dia:attribute>
- <dia:attribute name="end_arrow_length">
- <dia:real val="0.5"/>
- </dia:attribute>
- <dia:attribute name="end_arrow_width">
- <dia:real val="0.5"/>
- </dia:attribute>
- <dia:connections>
- <dia:connection handle="0" to="O4" connection="5"/>
- <dia:connection handle="1" to="O10" connection="2"/>
- </dia:connections>
- </dia:object>
- <dia:object type="Standard - Line" version="0" id="O1">
- <dia:attribute name="obj_pos">
- <dia:point val="4,6.6"/>
- </dia:attribute>
- <dia:attribute name="obj_bb">
- <dia:rectangle val="2.09449,4.19064;4.46617,6.97002"/>
- </dia:attribute>
- <dia:attribute name="conn_endpoints">
- <dia:point val="4,6.6"/>
- <dia:point val="2.56066,4.56066"/>
- </dia:attribute>
- <dia:attribute name="numcp">
- <dia:int val="1"/>
- </dia:attribute>
- <dia:attribute name="line_color">
- <dia:color val="#ff0000"/>
- </dia:attribute>
- <dia:attribute name="line_width">
- <dia:real val="0.20000000000000001"/>
- </dia:attribute>
- <dia:attribute name="start_arrow">
- <dia:enum val="22"/>
- </dia:attribute>
- <dia:attribute name="start_arrow_length">
- <dia:real val="0.5"/>
- </dia:attribute>
- <dia:attribute name="start_arrow_width">
- <dia:real val="0.5"/>
- </dia:attribute>
- <dia:attribute name="end_arrow">
- <dia:enum val="22"/>
- </dia:attribute>
- <dia:attribute name="end_arrow_length">
- <dia:real val="0.5"/>
- </dia:attribute>
- <dia:attribute name="end_arrow_width">
- <dia:real val="0.5"/>
- </dia:attribute>
- <dia:connections>
- <dia:connection handle="0" to="O4" connection="0"/>
- <dia:connection handle="1" to="O12" connection="7"/>
- </dia:connections>
- </dia:object>
- <dia:object type="Standard - Line" version="0" id="O2">
- <dia:attribute name="obj_pos">
- <dia:point val="7,8.45"/>
- </dia:attribute>
- <dia:attribute name="obj_bb">
- <dia:rectangle val="6.53629,8.07589;8.90305,10.8134"/>
- </dia:attribute>
- <dia:attribute name="conn_endpoints">
- <dia:point val="7,8.45"/>
- <dia:point val="8.43934,10.4393"/>
- </dia:attribute>
- <dia:attribute name="numcp">
- <dia:int val="1"/>
- </dia:attribute>
- <dia:attribute name="line_color">
- <dia:color val="#ff0000"/>
- </dia:attribute>
- <dia:attribute name="line_width">
- <dia:real val="0.20000000000000001"/>
- </dia:attribute>
- <dia:attribute name="start_arrow">
- <dia:enum val="22"/>
- </dia:attribute>
- <dia:attribute name="start_arrow_length">
- <dia:real val="0.5"/>
- </dia:attribute>
- <dia:attribute name="start_arrow_width">
- <dia:real val="0.5"/>
- </dia:attribute>
- <dia:attribute name="end_arrow">
- <dia:enum val="22"/>
- </dia:attribute>
- <dia:attribute name="end_arrow_length">
- <dia:real val="0.5"/>
- </dia:attribute>
- <dia:attribute name="end_arrow_width">
- <dia:real val="0.5"/>
- </dia:attribute>
- <dia:connections>
- <dia:connection handle="0" to="O4" connection="7"/>
- <dia:connection handle="1" to="O8" connection="0"/>
- </dia:connections>
- </dia:object>
- <dia:object type="Standard - Line" version="0" id="O3">
- <dia:attribute name="obj_pos">
- <dia:point val="8.43934,4.56066"/>
- </dia:attribute>
- <dia:attribute name="obj_bb">
- <dia:rectangle val="6.53383,4.19064;8.90551,6.97002"/>
- </dia:attribute>
- <dia:attribute name="conn_endpoints">
- <dia:point val="8.43934,4.56066"/>
- <dia:point val="7,6.6"/>
- </dia:attribute>
- <dia:attribute name="numcp">
- <dia:int val="1"/>
- </dia:attribute>
- <dia:attribute name="line_color">
- <dia:color val="#ff0000"/>
- </dia:attribute>
- <dia:attribute name="line_width">
- <dia:real val="0.20000000000000001"/>
- </dia:attribute>
- <dia:attribute name="start_arrow">
- <dia:enum val="22"/>
- </dia:attribute>
- <dia:attribute name="start_arrow_length">
- <dia:real val="0.5"/>
- </dia:attribute>
- <dia:attribute name="start_arrow_width">
- <dia:real val="0.5"/>
- </dia:attribute>
- <dia:attribute name="end_arrow">
- <dia:enum val="22"/>
- </dia:attribute>
- <dia:attribute name="end_arrow_length">
- <dia:real val="0.5"/>
- </dia:attribute>
- <dia:attribute name="end_arrow_width">
- <dia:real val="0.5"/>
- </dia:attribute>
- <dia:connections>
- <dia:connection handle="0" to="O6" connection="5"/>
- <dia:connection handle="1" to="O4" connection="2"/>
- </dia:connections>
- </dia:object>
- <dia:group>
- <dia:object type="Standard - Box" version="0" id="O4">
- <dia:attribute name="obj_pos">
- <dia:point val="4,6.6"/>
- </dia:attribute>
- <dia:attribute name="obj_bb">
- <dia:rectangle val="3.95,6.55;7.05,8.5"/>
- </dia:attribute>
- <dia:attribute name="elem_corner">
- <dia:point val="4,6.6"/>
- </dia:attribute>
- <dia:attribute name="elem_width">
- <dia:real val="3"/>
- </dia:attribute>
- <dia:attribute name="elem_height">
- <dia:real val="1.8500000000000014"/>
- </dia:attribute>
- <dia:attribute name="show_background">
- <dia:boolean val="true"/>
- </dia:attribute>
- </dia:object>
- <dia:object type="Standard - Text" version="0" id="O5">
- <dia:attribute name="obj_pos">
- <dia:point val="4.55,8"/>
- </dia:attribute>
- <dia:attribute name="obj_bb">
- <dia:rectangle val="4.55,6.55;6.55,8.9"/>
- </dia:attribute>
- <dia:attribute name="text">
- <dia:composite type="text">
- <dia:attribute name="string">
- <dia:string>#RS#</dia:string>
- </dia:attribute>
- <dia:attribute name="font">
- <dia:font family="sans" style="0" name="Helvetica"/>
- </dia:attribute>
- <dia:attribute name="height">
- <dia:real val="2"/>
- </dia:attribute>
- <dia:attribute name="pos">
- <dia:point val="4.55,8"/>
- </dia:attribute>
- <dia:attribute name="color">
- <dia:color val="#000000"/>
- </dia:attribute>
- <dia:attribute name="alignment">
- <dia:enum val="0"/>
- </dia:attribute>
- </dia:composite>
- </dia:attribute>
- </dia:object>
- </dia:group>
- <dia:group>
- <dia:object type="Standard - Ellipse" version="0" id="O6">
- <dia:attribute name="obj_pos">
- <dia:point val="8,2"/>
- </dia:attribute>
- <dia:attribute name="obj_bb">
- <dia:rectangle val="7.95,1.95;11.05,5.05"/>
- </dia:attribute>
- <dia:attribute name="elem_corner">
- <dia:point val="8,2"/>
- </dia:attribute>
- <dia:attribute name="elem_width">
- <dia:real val="3"/>
- </dia:attribute>
- <dia:attribute name="elem_height">
- <dia:real val="3"/>
- </dia:attribute>
- <dia:attribute name="aspect">
- <dia:enum val="2"/>
- </dia:attribute>
- </dia:object>
- <dia:object type="Standard - Text" version="0" id="O7">
- <dia:attribute name="obj_pos">
- <dia:point val="8.15,4.05"/>
- </dia:attribute>
- <dia:attribute name="obj_bb">
- <dia:rectangle val="8.15,2.6;10.9,4.95"/>
- </dia:attribute>
- <dia:attribute name="text">
- <dia:composite type="text">
- <dia:attribute name="string">
- <dia:string>#RF2#</dia:string>
- </dia:attribute>
- <dia:attribute name="font">
- <dia:font family="sans" style="0" name="Helvetica"/>
- </dia:attribute>
- <dia:attribute name="height">
- <dia:real val="2"/>
- </dia:attribute>
- <dia:attribute name="pos">
- <dia:point val="8.15,4.05"/>
- </dia:attribute>
- <dia:attribute name="color">
- <dia:color val="#000000"/>
- </dia:attribute>
- <dia:attribute name="alignment">
- <dia:enum val="0"/>
- </dia:attribute>
- </dia:composite>
- </dia:attribute>
- </dia:object>
- </dia:group>
- <dia:group>
- <dia:object type="Standard - Ellipse" version="0" id="O8">
- <dia:attribute name="obj_pos">
- <dia:point val="8,10"/>
- </dia:attribute>
- <dia:attribute name="obj_bb">
- <dia:rectangle val="7.95,9.95;11.05,13.05"/>
- </dia:attribute>
- <dia:attribute name="elem_corner">
- <dia:point val="8,10"/>
- </dia:attribute>
- <dia:attribute name="elem_width">
- <dia:real val="3"/>
- </dia:attribute>
- <dia:attribute name="elem_height">
- <dia:real val="3"/>
- </dia:attribute>
- <dia:attribute name="aspect">
- <dia:enum val="2"/>
- </dia:attribute>
- </dia:object>
- <dia:object type="Standard - Text" version="0" id="O9">
- <dia:attribute name="obj_pos">
- <dia:point val="8.15,12.05"/>
- </dia:attribute>
- <dia:attribute name="obj_bb">
- <dia:rectangle val="8.15,10.6;10.9,12.95"/>
- </dia:attribute>
- <dia:attribute name="text">
- <dia:composite type="text">
- <dia:attribute name="string">
- <dia:string>#RF4#</dia:string>
- </dia:attribute>
- <dia:attribute name="font">
- <dia:font family="sans" style="0" name="Helvetica"/>
- </dia:attribute>
- <dia:attribute name="height">
- <dia:real val="2"/>
- </dia:attribute>
- <dia:attribute name="pos">
- <dia:point val="8.15,12.05"/>
- </dia:attribute>
- <dia:attribute name="color">
- <dia:color val="#000000"/>
- </dia:attribute>
- <dia:attribute name="alignment">
- <dia:enum val="0"/>
- </dia:attribute>
- </dia:composite>
- </dia:attribute>
- </dia:object>
- </dia:group>
- <dia:group>
- <dia:object type="Standard - Ellipse" version="0" id="O10">
- <dia:attribute name="obj_pos">
- <dia:point val="0,10"/>
- </dia:attribute>
- <dia:attribute name="obj_bb">
- <dia:rectangle val="-0.05,9.95;3.05,13.05"/>
- </dia:attribute>
- <dia:attribute name="elem_corner">
- <dia:point val="0,10"/>
- </dia:attribute>
- <dia:attribute name="elem_width">
- <dia:real val="3"/>
- </dia:attribute>
- <dia:attribute name="elem_height">
- <dia:real val="3"/>
- </dia:attribute>
- <dia:attribute name="aspect">
- <dia:enum val="2"/>
- </dia:attribute>
- </dia:object>
- <dia:object type="Standard - Text" version="0" id="O11">
- <dia:attribute name="obj_pos">
- <dia:point val="0.2,12.05"/>
- </dia:attribute>
- <dia:attribute name="obj_bb">
- <dia:rectangle val="0.2,10.6;2.95,12.95"/>
- </dia:attribute>
- <dia:attribute name="text">
- <dia:composite type="text">
- <dia:attribute name="string">
- <dia:string>#RF3#</dia:string>
- </dia:attribute>
- <dia:attribute name="font">
- <dia:font family="sans" style="0" name="Helvetica"/>
- </dia:attribute>
- <dia:attribute name="height">
- <dia:real val="2"/>
- </dia:attribute>
- <dia:attribute name="pos">
- <dia:point val="0.2,12.05"/>
- </dia:attribute>
- <dia:attribute name="color">
- <dia:color val="#000000"/>
- </dia:attribute>
- <dia:attribute name="alignment">
- <dia:enum val="0"/>
- </dia:attribute>
- </dia:composite>
- </dia:attribute>
- </dia:object>
- </dia:group>
- <dia:group>
- <dia:object type="Standard - Ellipse" version="0" id="O12">
- <dia:attribute name="obj_pos">
- <dia:point val="0,2"/>
- </dia:attribute>
- <dia:attribute name="obj_bb">
- <dia:rectangle val="-0.05,1.95;3.05,5.05"/>
- </dia:attribute>
- <dia:attribute name="elem_corner">
- <dia:point val="0,2"/>
- </dia:attribute>
- <dia:attribute name="elem_width">
- <dia:real val="3"/>
- </dia:attribute>
- <dia:attribute name="elem_height">
- <dia:real val="3"/>
- </dia:attribute>
- <dia:attribute name="aspect">
- <dia:enum val="2"/>
- </dia:attribute>
- </dia:object>
- <dia:object type="Standard - Text" version="0" id="O13">
- <dia:attribute name="obj_pos">
- <dia:point val="0.2,4.05"/>
- </dia:attribute>
- <dia:attribute name="obj_bb">
- <dia:rectangle val="0.2,2.6;2.95,4.95"/>
- </dia:attribute>
- <dia:attribute name="text">
- <dia:composite type="text">
- <dia:attribute name="string">
- <dia:string>#RF1#</dia:string>
- </dia:attribute>
- <dia:attribute name="font">
- <dia:font family="sans" style="0" name="Helvetica"/>
- </dia:attribute>
- <dia:attribute name="height">
- <dia:real val="2"/>
- </dia:attribute>
- <dia:attribute name="pos">
- <dia:point val="0.2,4.05"/>
- </dia:attribute>
- <dia:attribute name="color">
- <dia:color val="#000000"/>
- </dia:attribute>
- <dia:attribute name="alignment">
- <dia:enum val="0"/>
- </dia:attribute>
- </dia:composite>
- </dia:attribute>
- </dia:object>
- </dia:group>
- </dia:layer>
-</dia:diagram>
diff --git a/doc/fig_topologies_rs.png b/doc/fig_topologies_rs.png
deleted file mode 100644
index 014225c..0000000
--- a/doc/fig_topologies_rs.png
+++ /dev/null
Binary files differ
diff --git a/doc/routeserver.texi b/doc/routeserver.texi
index f4a4546..5fb8cba 100644
--- a/doc/routeserver.texi
+++ b/doc/routeserver.texi
@@ -60,20 +60,10 @@
@end itemize
@float Figure,fig:normal-processing
-@image{fig-normal-processing,400pt,,Normal announcement processing}
+@center @image{fig-normal-processing,400pt,,Normal announcement processing}
@caption{Announcement processing inside a ``normal'' BGP speaker}
@end float
-@float Figure,fig:full-mesh
-@image{fig_topologies_full,120pt,,Full Mesh BGP Topology}
-@caption{Full Mesh}
-@end float
-
-@float Figure,fig:route-server
-@image{fig_topologies_rs,120pt,,Route Server BGP Topology}
-@caption{Route Server and clients}
-@end float
-
Of course we want that the routing tables obtained in each of the routers
are the same when using the route server than when not. But as a consequence
of having a single BGP peering (against the route server), the BGP speakers
@@ -173,7 +163,7 @@
@end itemize
@float Figure,fig:rs-processing
-@image{fig-rs-processing,450pt,,Route Server Processing Model}
+@center @image{fig-rs-processing,430pt,,Route Server Processing Model}
@caption{Announcement processing model implemented by the Route Server}
@end float
