Changeset 56 for remote_control

Timestamp:

06/21/10 10:33:40 (12 years ago)

Author:

sc

Message:

client_thinkgear:

• graceful handling of non-JSON replies

configuration:

• NULL byte termination for Flash socket handling

server_thinkgear:

• NULL byte termination for Flash socket policy file request

Location:

remote_control

Files:

• puzzlebox_brainstorms_client_thinkgear.py (modified) (3 diffs)
• puzzlebox_brainstorms_configuration.py (modified) (1 diff)
• puzzlebox_brainstorms_server_thinkgear.py (modified) (3 diffs)

remote_control/puzzlebox_brainstorms_client_thinkgear.py

@@ -9 +9 @@
 # For more information please refer to http://www.gnu.org/copyleft/gpl.html
 #
-# Last Update: 2010.06.18
+# Last Update: 2010.06.21
 #
 #####################################################################
@@ -40 +40 @@
 THINKGEAR_PARAMETERS = {"enableRawOutput": False, "format": "Json"}
 #THINKGEAR_PARAMETERS = {"enableRawOutput": True, "format": "Json"}
+#THINKGEAR_PARAMETERS = configuration.FLASH_POLICY_FILE_REQUEST
 
 #####################################################################
@@ -156 +157 @@
                                 print line
                                 
-
-                if self.DEBUG:
-                        if ('rawEeg' in data.keys()):
-                                if self.DEBUG > 1:
+                else:
+                        if self.DEBUG:
+                                if ('rawEeg' in data.keys()):
+                                        if self.DEBUG > 1:
+                                                print "data:",
+                                                print data
+                                else:
                                         print "data:",
                                         print data
-                        else:
-                                print "data:",
-                                print data
 
 

remote_control/puzzlebox_brainstorms_configuration.py

@@ -190 +190 @@
 #####################################################################
 
-FLASH_POLICY_FILE_REQUEST = '<policy-file-request/>'
+FLASH_POLICY_FILE_REQUEST = \
+        '<policy-file-request/>%c' % 0 # NULL byte termination
 FLASH_SOCKET_POLICY_FILE = '''<?xml version="1.0"?>
 <!DOCTYPE cross-domain-policy SYSTEM "/xml/dtds/cross-domain-policy.dtd">
 <cross-domain-policy>
-   <site-control permitted-cross-domain-policies="master-only" />
+   <site-control permitted-cross-domain-policies="all" />
    <allow-access-from domain="*" to-ports="%i" />
-</cross-domain-policy>
-''' % THINKGEAR_SERVER_PORT
+</cross-domain-policy>%c''' % (THINKGEAR_SERVER_PORT, 0)
 
 #####################################################################

remote_control/puzzlebox_brainstorms_server_thinkgear.py

@@ -110 +110 @@
 
                 # Special socket handling for Flash applications
-                if (data.startswith(FLASH_POLICY_FILE_REQUEST)):
+                if (data == FLASH_POLICY_FILE_REQUEST):
                         response = FLASH_SOCKET_POLICY_FILE
 
@@ -222 +222 @@
 
                         # Special socket handling for Flash applications
-                        if (data_received.startswith( \
-                                FLASH_POLICY_FILE_REQUEST)):
+                        if (data_received == FLASH_POLICY_FILE_REQUEST):
                                 
                                 if self.DEBUG:
@@ -255 +254 @@
                 # Special socket handling for Flash applications
                 if (response == FLASH_SOCKET_POLICY_FILE):
-##                        self.sendLine(response)
-                        self.transport.write(response)
+                        self.sendLine(response)
+##                        self.transport.write(response)
                 else:
                         response = json.dumps(response)