Changeset 311 for trunk

Timestamp:

05/13/09 13:01:35 (3 years ago)

Author:

ocjhb

Message:

finding out mobile phone ip in a better way

Files:

• trunk/sandbox/jhb/mobile/ocwallet.py (modified) (6 diffs)

trunk/sandbox/jhb/mobile/ocwallet.py

@@ -19 +19 @@
         self.todo = {}
         self.ip = None
+        self.external_ip = None
         self.imagecounter = 0
 
@@ -202 +203 @@
 
         cdd,alreadythere = self.getCurrentCurrency()
-        transport = self.getHTTPTransport(cdd.issuerServiceLocation)
-
         if method ==0:
+            transport = self.getHTTPTransport(cdd.issuerServiceLocation)
             self.receiveCoinsBT(transport)
         else:
-            self.receiveCoinsHTTP(transport)
+            port = int(appuifw.query(u'port','number',9091))
+            transport = self.getHTTPTransport(cdd.issuerServiceLocation)
+            self.receiveCoinsHTTP(transport,port)
 
         coinsound.play() 
@@ -219 +221 @@
         return transport
     
-    def receiveCoinsHTTP(self,transport):
+    def receiveCoinsHTTP(self,transport,port):
         import BaseHTTPServer, urllib
         
@@ -241 +243 @@
                 self.wfile.write(answer.toString(True))
                 
-        port = int(appuifw.query(u'port','number','9091'))
         OCHandler.wallet = self.wallet
         self.startInternet()
@@ -247 +248 @@
         #hack to open internet
         #r = urllib.urlopen('http://google.com')
-        
+        #ip = urllib.urlopen('http://opencoin.org/myownip').read()
         httpd = BaseHTTPServer.HTTPServer(("",port),OCHandler)
-        self.feedback(u'waiting at %s:%s' % ('localhost',port),'conf')
+        self.feedback(u'Receiving coins: waiting at %s:%s' % (self.ip,port))
         httpd.handle_request()
         httpd.handle_request()
@@ -361 +362 @@
 
                 socket.set_default_access_point(aps[apid])
-                self.ip = 'some ip, s60'
+                #one time socket, for just finding out our ip
+                s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+                #anonymity issue here
+                s.connect(('www.google.com',80))
+                self.ip = s.getsockname()[0]
 
             else: