TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 18:31:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

use new panda-level python spec decoding

Browse Source
This commit is contained in:
David Rose 2003-05-29 22:48:26 +00:00
parent 2eaf4b99db
commit a59a6d7571
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
direct/src/distributed/ClientRepository.py
View File

@ -97,7 +97,7 @@ class ClientRepository(DirectObject.DirectObject):
self.name2cdc[dcClass.getName()]=clientDistClass self.name2cdc[dcClass.getName()]=clientDistClass
return None return None
def connect(self, serverList, def connect(self, serverList, allowProxy,
successCallback = None, successArgs = [], successCallback = None, successArgs = [],
failureCallback = None, failureArgs = []): failureCallback = None, failureArgs = []):
""" """
@ -110,8 +110,13 @@ class ClientRepository(DirectObject.DirectObject):
known. known.
""" """
if self.hasProxy: hasProxy = 0
self.notify.info("Connecting to gameserver via proxy: %s" % (self.proxy.cStr())) if allowProxy:
proxies = self.http.getProxiesForUrl(serverList[0])
hasProxy = (proxies != '')
if hasProxy:
self.notify.info("Connecting to gameserver via proxy: %s" % (proxies))
else: else:
self.notify.info("Connecting to gameserver directly (no proxy)."); self.notify.info("Connecting to gameserver directly (no proxy).");
@ -120,7 +125,7 @@ class ClientRepository(DirectObject.DirectObject):
elif self.connectMethod == 'nspr': elif self.connectMethod == 'nspr':
self.connectHttp = 0 self.connectHttp = 0
else: else:
self.connectHttp = (self.hasProxy or serverList[0].getScheme() == 'https') self.connectHttp = (hasProxy or serverList[0].isSsl())
self.bootedIndex = None self.bootedIndex = None
self.bootedText = None self.bootedText = None
@ -134,7 +139,7 @@ class ClientRepository(DirectObject.DirectObject):
# run out of servers). # run out of servers).
ch = self.http.makeChannel(0) ch = self.http.makeChannel(0)
self.httpConnectCallback(ch, serverList, 0, self.httpConnectCallback(ch, serverList, 0, hasProxy,
successCallback, successArgs, successCallback, successArgs,
failureCallback, failureArgs) failureCallback, failureArgs)
@ -169,7 +174,7 @@ class ClientRepository(DirectObject.DirectObject):
# Failed to connect. # Failed to connect.
if failureCallback: if failureCallback:
failureCallback(0, *failureArgs) failureCallback(hasProxy, 0, *failureArgs)
def disconnect(self): def disconnect(self):
"""Closes the previously-established connection. """Closes the previously-established connection.
@ -183,7 +188,7 @@ class ClientRepository(DirectObject.DirectObject):
self.tcpConn = None self.tcpConn = None
self.stopReaderPollTask() self.stopReaderPollTask()
def httpConnectCallback(self, ch, serverList, serverIndex, def httpConnectCallback(self, ch, serverList, serverIndex, hasProxy,
successCallback, successArgs, successCallback, successArgs,
failureCallback, failureArgs): failureCallback, failureArgs):
if ch.isConnectionReady(): if ch.isConnectionReady():
@ -202,12 +207,13 @@ class ClientRepository(DirectObject.DirectObject):
ch.spawnTask(name = 'connect-to-server', ch.spawnTask(name = 'connect-to-server',
callback = self.httpConnectCallback, callback = self.httpConnectCallback,
extraArgs = [ch, serverList, serverIndex + 1, extraArgs = [ch, serverList, serverIndex + 1,
hasProxy,
successCallback, successArgs, successCallback, successArgs,
failureCallback, failureArgs]) failureCallback, failureArgs])
else: else:
# No more servers to try; we have to give up now. # No more servers to try; we have to give up now.
if failureCallback: if failureCallback:
failureCallback(ch.getStatusCode(), *failureArgs) failureCallback(hasProxy, ch.getStatusCode(), *failureArgs)
def startReaderPollTask(self): def startReaderPollTask(self):
# Stop any tasks we are running now # Stop any tasks we are running now