updates

2 files changed, 16 insertions, 0 deletions

diff --git a/TODO b/TODO
index 03b0a70..4ef7eb4 100644
--- a/TODO
+++ b/TODO
@@ -1,3 +1,13 @@
+* Under heavy lag, typing a lot results in a graph that splits into many
+  branches, and never re-joins. While this works, it's ugly. Find a way to
+  add in explicit join points, so the graph re-joins.
+  Probably this entails making a Activity Entered be able to point to
+  the previous Activity Entered. Then in eg:
+  Entered: A B C D E F G 
+  Seen:                  A
+  An "H" entered can point to the "A" seen, but also point to the "G"
+  entered.
+  This should only be ugly, not a security hole.
 * Improve JSON, removing use of "tag"
 * potential DOS where developer sends Activity Entered that all
   refer back to the first Activity Seen. This requires the user
diff --git a/protocol.txt b/protocol.txt
index 7699e2a..06c9454 100644
--- a/protocol.txt
+++ b/protocol.txt
@@ -48,4 +48,10 @@ allowed.
 
 The developer also checks the prevActivity of messages it receives
 from the user, to make sure that it's receiving a valid chain of messages.
+The developer accepts a new Activity Seen when either:
 
+1. The Activity Seen has a prevActivity that points to the last
+   Activity Seen that the developer accepted.
+2. The Activity Seen has as its prevActivity an Activity Entered
+   that the developer generated, after the last Activity Seen
+   that the developer accepted.