Changeset 301 for trunk

Timestamp:

05/07/09 19:38:01 (3 years ago)

Author:

ocjhb

Message:

first bluetooth transfer working, only on mobile phones so far

Location:

trunk/sandbox/jhb

Files:

• mobile/btsocket.py (deleted)
• mobile/ocwallet.py (modified) (3 diffs)
• oc2/transports.py (modified) (1 diff)

trunk/sandbox/jhb/mobile/ocwallet.py

@@ -200 +200 @@
         methodlist = [u'internet',u'bluetooth']
         method = appuifw.popup_menu(methodlist)
+
+        cdd,alreadythere = self.getCurrentCurrency()
+        transport = transports.HTTPTransport(cdd.issuerServiceLocation)
+
         if method ==1:
-            appuifw.note(u'bt not implemented yet','conf')
-        else:
-            cdd,alreadythere = self.getCurrentCurrency()
-            transport = transports.HTTPTransport(cdd.issuerServiceLocation)
+            self.receiveCoinsBT(transport)
+        else:
             self.receiveCoinsHTTP(transport)
         
         self.makeWalletMenu()
         self.displayWalletMenu()
-
+    
+
+    
+    
     def receiveCoinsBT(self,transport):
-        import btsocket
-        server_socket = btsocket.socket(btsocket.AF_BT, btsocket.SOCK_STREAM)
-        port = btsocket.bt_rfcomm_get_available_server_channel(server_socket)
-        server_socket.bind(("", port))
-        server_socket.listen(1)
-        btsocket.bt_advertise_service( u"opencoin", server_socket, True, btsocket.RFCOMM)
-        btsocket.set_security(server_socket, btsocket.AUTH)
-        (sock,peer_addr) = server_socket.accept()
-        def receive(sock):
-            received = ''
-            try:
-                while True:
-                    data = sock.recv(1024)
-                    if len(data) == 0: break
-                    received += data    
-            except IOError:
-                pass
-            return transports.createMessage(received)
-
+        if sys.platform == 'symbian_s60':
+            import btsocket
+            server_socket = btsocket.socket(btsocket.AF_BT, btsocket.SOCK_STREAM)
+            port = btsocket.bt_rfcomm_get_available_server_channel(server_socket)
+            server_socket.bind(("", port))
+            server_socket.listen(1)
+            btsocket.bt_advertise_service( u"opencoin", server_socket, True, btsocket.RFCOMM)
+            btsocket.set_security(server_socket, btsocket.AUTH)
+            appuifw.note(u'waiting for connection')
+            (sock,peer_addr) = server_socket.accept()
+
+        else:
+            import bluetooth as bt
+            server_sock=bt.BluetoothSocket(bt.RFCOMM)
+            server_sock.bind(("",bt.PORT_ANY))
+            server_sock.listen(1)
+            port = server_sock.getsockname()[1]
+
+            uuid = "9e72d9d8-e06d-41cb-bbd4-89cd052cccb8"
+            
+            bt.advertise_service( server_sock, u"opencoin",)
+                               
+            sock, client_info = server_sock.accept()
+
+        
+        bt = transports.BTTransport(sock)
         self.wallet.getApproval = self.getApproval 
-        reply(self.wallet.listenSum(receive(sock))
-        reply(self.wallet.listenSum(receive(sock))
-        
-
-
+        bt.send(self.wallet.listenSum(bt.receive()))
+        bt.send(self.wallet.listenSpend(bt.receive(),transport))
+        
 
     def receiveCoinsHTTP(self,transport):
@@ -273 +283 @@
         self.stopInternet()
 
+
+    def getBTTransport(self):
+        
+        import btsocket
+        sock=btsocket.socket(btsocket.AF_BT,btsocket.SOCK_STREAM)
+        addr,services=btsocket.bt_discover()
+        if len(services)>0:
+            choices=services.keys()
+            choices.sort()
+            choice=appuifw.popup_menu([unicode(services[x])+": "+x for x in choices],u'Choose port:')
+            port=services[choices[choice]]
+        else:
+            port=services[services.keys()[0]]
+        address=(addr,port)
+        sock.connect(address)
+        return transports.BTTransport(sock)
+
     def spendCoins(self):
 
@@ -282 +309 @@
         if not target:
             return
-        cdd,alreadythere = self.getCurrentCurrency()
-        url = appuifw.query(u'url','text',u'http://192.168.2.105:9091')
-        transport = transports.HTTPTransport(url)
+            
+        methodlist = [u'internet',u'bluetooth']
+        method = appuifw.popup_menu(methodlist)
+
+
+        cdd,alreadythere = self.getCurrentCurrency()
+        if method == 0:
+            url = appuifw.query(u'url','text',u'http://192.168.2.105:9091')
+            transport = self.getHTTPTransport(url)
+        else:
+            transport = self.getBTTransport() 
 
         self.wallet.spendCoins(transport,cdd.currencyId,amount,target)

trunk/sandbox/jhb/oc2/transports.py

@@ -19 +19 @@
      
     def __call__(self,message):
-        import urllib2, urllib
-        response = urllib2.urlopen(self.url,message.toString(True))
+        import  urllib
+        response = urllib.urlopen(self.url,message.toString(True))
         return createMessage(response.read())
+
+import sys
+
+class BTTransport(object):
+
+    def __init__(self,socket):
+        self.stop = '\r\r+++STOP+++\r\r'
+        self.lenstop = len(self.stop)
+        self.socket = socket
         
+    def __call__(self,message):
+        self.send(message)
+        return self.receive()
+   
+    def send(self,message):
+        self.socket.send(message.toString(True)+self.stop)
+
+    def receive(self):
+        line=''
+        while not line.endswith(self.stop):
+            ch=self.socket.recv(1)
+            line += ch
+
+        received = line[:-self.lenstop]
+        return createMessage(received)
+
+    
+
 class YieldTransport(object):