Some message type numbers changed. Parse connect message.

3 files changed, 19 insertions, 6 deletions

diff --git a/src/main/clojure/org/gnu/clojure/gnunet/core.clj b/src/main/clojure/org/gnu/clojure/gnunet/core.clj
index b7bf839..2017121 100644
--- a/src/main/clojure/org/gnu/clojure/gnunet/core.clj
+++ b/src/main/clojure/org/gnu/clojure/gnunet/core.clj
@@ -3,10 +3,10 @@
     clojure.contrib.monads)
   (:import (java.util Date Calendar)))
 
-(def message-type-core-set-key 80)
-(def message-type-core-encrypted-message 81)
-(def message-type-core-ping 82)
-(def message-type-core-pong 83)
+(def message-type-core-set-key 81)
+(def message-type-core-encrypted-message 82)
+(def message-type-core-ping 83)
+(def message-type-core-pong 84)
 
 (def signature-purpose-set-key 3)
 
diff --git a/src/main/clojure/org/gnu/clojure/gnunet/tcp.clj b/src/main/clojure/org/gnu/clojure/gnunet/tcp.clj
index f4e77af..d5b3d29 100644
--- a/src/main/clojure/org/gnu/clojure/gnunet/tcp.clj
+++ b/src/main/clojure/org/gnu/clojure/gnunet/tcp.clj
@@ -7,7 +7,7 @@
     java.nio.ByteBuffer
     java.util.concurrent.ConcurrentLinkedQueue))
 
-(def message-type-tcp-welcome 60)
+(def message-type-tcp-welcome 61)
 
 (defn encode-welcome
   [peer]
@@ -239,7 +239,7 @@
                       :send-queue (ConcurrentLinkedQueue.)
                       :received-bytes-atom (atom nil)
                       :remote-peer-id-atom (atom nil)
-                      :incoming true}]
+                      :incoming true}] ;; :incoming not used?
       (update-selection-key!
         selection-key
         SelectionKey/OP_READ
diff --git a/src/main/clojure/org/gnu/clojure/gnunet/transport.clj b/src/main/clojure/org/gnu/clojure/gnunet/transport.clj
index 58b9424..ec9c386 100644
--- a/src/main/clojure/org/gnu/clojure/gnunet/transport.clj
+++ b/src/main/clojure/org/gnu/clojure/gnunet/transport.clj
@@ -126,6 +126,19 @@
            :signed-material (:signed-material signed)}
       (:parsed signed))))
 
+(defn encode-connect
+  [connect]
+  (concat
+    (encode-int32 0)
+    (encode-date (:timestamp connect))))
+
+(def parse-connect
+  (domonad
+    parser-m
+    [reserved parse-uint32
+     timestamp parse-date]
+    {:timestamp timestamp}))
+
 (defn list-transport-addresses
   "Generate a list of transport addresses."
   [addresses-map]