X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=doc%2Fstructure.dot;h=2a30c7c17a5c0ca584b6065619d1e4332196d342;hb=44bd35d03db9385e6b93dd8a60c13582709380d1;hp=ec13c93b025c6c4ffa3888435720fbd5a0683eec;hpb=b1702ba0a0bcd2a54bccc6eaa3025f4c002edf88;p=oweals%2Fgnunet.git

diff --git a/doc/structure.dot b/doc/structure.dot
index ec13c93b0..2a30c7c17 100644
--- a/doc/structure.dot
+++ b/doc/structure.dot
@@ -14,7 +14,7 @@ splines = true;
   voting [shape=house];
   voting -> consensus;
   voting -> identity;
-  voting -> mesh;
+  voting -> cadet;
   voting -> secretsharing;
   secretsharing -> consensus;
 
@@ -22,19 +22,19 @@ splines = true;
   fs -> dht;
   fs -> core;
   fs -> datastore;
-  fs -> mesh;
+  fs -> cadet;
   fs -> ats;
   fs -> block [style=dotted,color=blue];
   fs -> identity;
   exit [shape=box];
-  exit -> mesh;
+  exit -> cadet;
   exit -> tun;
   exit -> dnsstub;
-  vpn -> mesh;
+  vpn -> cadet;
   vpn -> regex;
   vpn -> tun;
   pt [shape=house];
-  pt -> mesh;
+  pt -> cadet;
   pt -> vpn;
   pt -> dns;
   pt -> dnsparser;
@@ -68,11 +68,11 @@ splines = true;
   regex -> block [style=dotted,color=blue];
   block [shape=diamond];
   datacache [shape=diamond];
-  mesh -> core [weight=2];
-  mesh -> dht;
-  mesh -> block [style=dotted,color=blue];
+  cadet -> core [weight=2];
+  cadet -> dht;
+  cadet -> block [style=dotted,color=blue];
   conversation [shape=house];
-  conversation -> mesh;
+  conversation -> cadet;
   conversation -> gns;
   conversation -> identity;
   conversation -> speaker;
@@ -100,10 +100,10 @@ splines = true;
   dv -> core;
   dv -> set;
   consensus -> set;
-  consensus -> mesh;
+  consensus -> cadet;
   scalarproduct -> set;
-  scalarproduct -> mesh;
-  set -> mesh;
+  scalarproduct -> cadet;
+  set -> cadet;
   peerinfo -> hello;
   fragmentation [shape=diamond];
   hello [shape=diamond];
@@ -111,128 +111,164 @@ splines = true;
   tun [shape=diamond];
   dnsparser [shape=diamond];
   dnsstub [shape=diamond];
+
+  secushare [shape=house,style=dashed];
+  multicast [style=dashed];
+  psyc [style=dashed];
+  social -> psyc [style=dashed];
+  social -> gns [style=dashed];
+  psyc -> psycstore [style=dashed];
+  psycstore;
+  social [style=dashed];
+  secushare -> social [style=dashed];
+  secushare -> identity [style=dashed];
+  psyc -> multicast [style=dashed];
+  multicast -> cadet [style=dashed];
+
+  reuters [shape=house,style=dashed];
+  reuters -> scalarproduct [style=dashed];
+
+  rps [style=dashed];
+  topology -> rps [style=dashed];
+  rps -> core [style=dashed];
 }
 
 
-// this is what we have, excluding libs
+// this is what we have, excluding libs and stores
 digraph dependencies_no_libs {
 splines = true;
 
   voting [shape=house];
   voting -> consensus;
   voting -> identity;
-  voting -> mesh;
+  voting -> cadet;
   voting -> secretsharing;
   secretsharing -> consensus;
 
   fs [shape=house];
   fs -> dht;
   fs -> core;
-  fs -> datastore;
-  fs -> mesh;
+  fs -> cadet;
   fs -> ats;
   fs -> identity;
   exit [shape=box];
-  exit -> mesh;
-  vpn -> mesh;
+  exit -> cadet;
+  vpn -> cadet;
   vpn -> regex;
   pt [shape=house];
-  pt -> mesh;
+  pt -> cadet;
   pt -> vpn;
   pt -> dns;
   dv -> ats;
   gns [shape=house];
-  gns -> namestore;
   gns -> dns;
   gns -> dht;
   gns -> revocation;
   gns -> vpn;
   gns -> identity;
-  gns -> gnsrecord;
   revocation -> core;
   revocation -> set;
-  namestore -> identity;
   dht -> core;
   dht -> nse;
-  dht -> peerinfo;
   nse -> core;
-  mesh -> core [weight=2];
-  mesh -> dht;
+  cadet -> core [weight=2];
+  cadet -> dht;
   conversation [shape=house];
-  conversation -> mesh;
+  conversation -> cadet;
   conversation -> gns;
   conversation -> identity;
   regex -> dht;
   core -> transport;
   topology [shape=box];
-  topology -> peerinfo;
   topology -> transport;
   topology -> core;
   hostlist [shape=box];
   hostlist -> core;
-  hostlist -> peerinfo;
   transport -> ats;
-  transport -> peerinfo;
   dv [shape=egg];
   dv -> transport [color=blue,style=dotted];
   dv -> core;
   dv -> set;
   consensus -> set;
-  consensus -> mesh;
+  consensus -> cadet;
   scalarproduct -> set;
-  scalarproduct -> mesh;
-  set -> mesh;
-}
+  scalarproduct -> cadet;
+  set -> cadet;
 
 
-// this is what might happen...
-digraph plan {
-splines = true;
-
-// // secushare roadmap:
   secushare [shape=house,style=dashed];
+  multicast [style=dashed];
   psyc [style=dashed];
   social -> psyc [style=dashed];
-  psyc -> psycstore [style=dashed];
-  psycstore;
+  social -> gns [style=dashed];
   social [style=dashed];
   secushare -> social [style=dashed];
-  secushare -> voting [style=dashed,color=red];
-  secushare -> gns [style=dashed];
-  secushare -> fs [style=dashed,color=red];
-  secushare -> reuters [style=dashed,color=red];
-  secushare -> identity [style=dashed,color=red];
-  secushare -> messaging [style=dashed,color=red];
-  secushare -> conversation [style=dashed,color=red];
+  secushare -> identity [style=dashed];
   psyc -> multicast [style=dashed];
+  multicast -> cadet [style=dashed];
 
-// // reuters roadmap:
   reuters [shape=house,style=dashed];
-  scalarproduct [style=dashed];
   reuters -> scalarproduct [style=dashed];
-  reuters -> identity [style=dashed];
-  scalarproduct -> set [style=dashed];
-  scalarproduct -> mesh [style=dashed];
-  messaging [style=dashed];
-  messaging -> regex [style=dashed];
-  messaging -> mesh [style=dashed];
-  messaging -> dht [style=dashed];
-  reuters -> messaging [style=dashed,color=red];
-  reuters -> multicast [style=dashed,color=red];
-  reuters -> mesh [style=dashed,color=red];
-  reuters -> core [style=dashed,color=red];
-
-
-// // core roadmap:
-  dht -> ats [style=dashed,color=red];
-  mesh -> ats [style=dashed,color=red];
-  vpn -> multicast [style=dashed,color=red];
-  exit -> multicast [style=dashed,color=red];
-  multicast [style=dashed];
-  multicast -> mesh [style=dashed];
+
+  rps [style=dashed];
+  topology -> rps [style=dashed];
+  rps -> core [style=dashed];
+}
+
+
+// this is what we have, excluding and details
+digraph dependencies_no_details {
+splines = true;
+
+  voting [shape=house];
+  voting -> consensus;
+  voting -> cadet;
+  voting -> secretsharing;
+  secretsharing -> consensus;
 
   fs [shape=house];
+  fs -> dht;
+  fs -> core;
+  fs -> cadet;
+  vpn -> cadet;
+  vpn -> dht;
+  pt [shape=house];
+  pt -> cadet;
+  pt -> vpn;
   gns [shape=house];
+  gns -> dht;
+  gns -> revocation;
+  gns -> vpn;
+  revocation -> core;
+  revocation -> set;
+  dht -> core;
+  dht -> nse;
+  nse -> core;
+  cadet -> core [weight=2];
+  cadet -> dht;
   conversation [shape=house];
-  exit [shape=box];
-}
\ No newline at end of file
+  conversation -> cadet;
+  conversation -> gns;
+  core -> transport;
+  consensus -> set;
+  consensus -> cadet;
+  scalarproduct -> set;
+  scalarproduct -> cadet;
+  set -> cadet;
+
+
+  secushare [shape=house,style=dashed];
+  multicast [style=dashed];
+  psyc [style=dashed];
+  social -> psyc [style=dashed];
+  social -> gns [style=dashed];
+  social [style=dashed];
+  secushare -> social [style=dashed];
+  psyc -> multicast [style=dashed];
+  multicast -> cadet [style=dashed];
+
+  reuters [shape=house,style=dashed];
+  reuters -> scalarproduct [style=dashed];
+}
+
+