[Grapevine-cvs-commits] cvs: grapevine /raisen/grapevine incoming-net-http.xml incoming-untrusted.xml init.xml interface-control.xml interface.xml join-interface.xml join-transaction.xml join.xml negotiate-key.xml transaction.xml transmit.xml

[blackh <gra...@li...>]

blackh		Sun Aug  3 03:54:00 2003 EDT

  Modified files:              
    /grapevine/raisen/grapevine	incoming-net-http.xml 
                               	incoming-untrusted.xml init.xml 
                               	interface-control.xml interface.xml 
                               	join-interface.xml join-transaction.xml 
                               	join.xml negotiate-key.xml 
                               	transaction.xml transmit.xml 
  Log:
  <sys.time.now>'s made more efficient.
  
  
Index: grapevine/raisen/grapevine/transmit.xml
diff -u grapevine/raisen/grapevine/transmit.xml:1.49 grapevine/raisen/grapevine/transmit.xml:1.50
--- grapevine/raisen/grapevine/transmit.xml:1.49	Sat Jun 14 01:27:38 2003
+++ grapevine/raisen/grapevine/transmit.xml	Sun Aug  3 03:54:00 2003
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- $Id: transmit.xml,v 1.49 2003/06/14 08:27:38 blackh Exp $ -->
+<!-- $Id: transmit.xml,v 1.50 2003/08/03 10:54:00 blackh Exp $ -->
 
 <!--
   The tranmission part of the transport layer.
@@ -42,7 +42,7 @@
 ]>
 
 <grapevine>
-  <domain name="grapevine.transmit" author1="Stephen Blackheath" rev="$Revision: 1.49 $">
+  <domain name="grapevine.transmit" author1="Stephen Blackheath" rev="$Revision: 1.50 $">
     
     <facts>
       <flag verbose="false" debug="false"/>
@@ -188,7 +188,7 @@
           msg#session\-key != "",
           msg#state = "timestamp"
         } || {
-          <sys.time.now secs="[now]"/>,
+          now=<sys.time.now/>#secs,
           <obj.address-ref id="[addressRef]" address="[address]"/>,
             <!-- Pick the most recently created session key for this address. -->
             <!-- Only use address-level session keys for routing to addresses -->
@@ -251,7 +251,7 @@
           to be sent to that address. -->
       do_flush:
         flush=<grapevine.transmit.flush/>,
-        nowFact=<sys.time.now secs="[now]"/>,
+        <sys.time.now secs="[now]"/>,
         msg=<msg.to address-ref="[addressRef]" location="[location]" session-key="[keyID]" by="[by]" state="pending"/>,
         <obj.address-ref id="[addressRef]" address="[address]"/>,
         transport=<obj.transport id="[address]"/>,
@@ -333,7 +333,7 @@
               cipher-type="[cipherType]" key-length="[keyLength]" key="[key]"/>,
             cipher = blockEncrypt(cipherType, keyLength, key, compress(msgText)),
             msgText=formatXML(new <encrypted id="[keyID]">[cipher]</encrypted>),
-            msgText=base64encode(<![CDATA["<?xml version=\"1.0\"?>\n"]]>) ## msgText,
+            msgText=base64encode(<![CDATA["<?xml version=\"1.0\"?>\n"]]>) ## msgText
           } ||
             println("transmit: format_and_encrypt - failed to encrypt - missing session key?! id=" ## keyID)
         } || true,