Changeset 1005

Timestamp:

08/08/08 12:57:05 (3 months ago)

Author:

locklainn.linden

Message:

presence started, now to find the av cloud

Files:

• projects/2008/pyogp/pyogp.interop/trunk/pyogp/interop/tests/test_ogp_teleport.py (modified) (4 diffs)
• projects/2008/pyogp/pyogp.lib.base/trunk/pyogp/lib/base/message/message_system.py (modified) (3 diffs)

projects/2008/pyogp/pyogp.interop/trunk/pyogp/interop/tests/test_ogp_teleport.py

@@ -135 +135 @@
-                                MsgType.MVT_U32)
-        self.messenger.send_reliable(self.host, 0)
-
+
-        while True:
-            recv_message = ''
@@ -153 +153 @@
-        avatar = place(tp_region)        
-
+        self.host = Host(avatar.region.details['sim_ip'],
+                    avatar.region.details['sim_port'])
+
+        #SENDS UUIDNameRequest
+        self.messenger.new_message("UUIDNameRequest")
+        self.messenger.next_block("UUIDNameBlock")
+        self.messenger.add_data("ID", \
+                                uuid.UUID(self.agent_id), \
+                                MsgType.MVT_LLUUID)
+        self.messenger.send_message(self.host)
+        
-        print "Entering loop"
+        last_ping = 0
-        while True:
-            recv_message = ''
-            if self.messenger.receive_check() == True:
-                recv_message = self.messenger.reader.current_msg
-
+
+
+
+
+
+
+
+
+
+
+
-            else:
-                print 'No message'
@@ -173 +195 @@
-        self.messenger.next_block("AgentData")
-        self.messenger.add_data('AgentID', \
-
-
-
-avatar.region.details['session_id']
+self.
+
+
+self.session_id
-                                MsgType.MVT_LLUUID)
-        self.messenger.send_message(self.host)
@@ -221 +243 @@
-        self.messenger.send_message(self.host)
-
+    def send_region_handshake_reply(self, agent_id, session_id):
+        self.messenger.new_message("RegionHandshakeReply")
+        self.messenger.next_block("AgentData")
+        self.messenger.add_data('AgentID', \
+                                uuid.UUID(agent_id), \
+                                MsgType.MVT_LLUUID)
+        self.messenger.add_data('SessionID', \
+                                uuid.UUID(session_id), \
+                                MsgType.MVT_LLUUID)
+        self.messenger.next_block("RegionInfo")
+        self.messenger.add_data('Flags', \
+                                0x00, \
+                                MsgType.MVT_U32)
+        self.messenger.send_message(self.host)
-    
+    def send_complete_ping_check(self, ping):
+        self.messenger.new_message("CompletePingCheck")
+        self.messenger.next_block("PingID")
+        self.messenger.add_data('PingID', \
+                                ping, \
+                                MsgType.MVT_U8)
+        self.messenger.send_message(self.host)
+
-def test_suite():
-    from unittest import TestSuite, makeSuite

projects/2008/pyogp/pyogp.lib.base/trunk/pyogp/lib/base/message/message_system.py

@@ -164 +164 @@
-        """ This is a retry because we didn't get acked """
-        #sets up the message so send_message will add the RETRY flag to it
-        print 'Sending retry'
-        self.send_flags |= PackFlags.LL_RESENT_FLAG
-        self.send_message(host, message_buf)                
@@ -218 +217 @@
-            append_ack_count = self.packer.pack_data(ack_count, MsgType.MVT_U8)
-            message_buf += append_ack_count
-
-
-
+#
+
+#
-
-        #now that the pre-message data is added, add the real data to the end
@@ -302 +301 @@
-    def new_message(self, message_name):
-        if self.message_dict[message_name] == None:
-            return
-
-        flavor = self.message_dict.get_message_flavor(message_name)
-        if flavor == 'template':
-            self.builder = self.template_builder
-
-
+
+
+
+
+
+
-
-        self.reliable_msg = False