X-Git-Url: https://code.delx.au/pymsnt/blobdiff_plain/de5c8c8a1b405698a64870f411f8132f387a3638..ab3667805a3bb1f43d9a3dcbfe74d3d15b0ea0fa:/src/main.py diff --git a/src/main.py b/src/main.py index 35690e5..eb90dd4 100644 --- a/src/main.py +++ b/src/main.py @@ -6,6 +6,31 @@ reload(sys) sys.setdefaultencoding("utf-8") sys.stdout = codecs.lookup('utf-8')[-1](sys.stdout) +# Find the best reactor +selectWarning = "Unable to install any good reactors (kqueue, epoll, poll).\nWe fell back to using select. You may have scalability problems.\nThis reactor will not support more than 1024 connections at a time." +try: + from twisted.internet import epollreactor as bestreactor +except: + try: + from twisted.internet import kqreactor as bestreactor + except: + try: + from twisted.internet import pollreactor as bestreactor + except: + try: + from twisted.internet import selectreactor as bestreactor + print selectWarning + except: + try: + from twisted.internet import default as bestreactor + print selectWarning + except: + print "Unable to find a reactor. Please make sure you have Twisted properly installed.\nExiting..." + sys.exit(1) +bestreactor.install() + + + # Must load config before everything else import config import xmlconfig @@ -16,7 +41,7 @@ for o, v in opts: if o in ("-c", "--config"): configFile = v elif o in ("-b", "--background"): - config.daemonise = True + config.background = True elif o in ("-d", "--debug"): config.debugLevel = "2" elif o in ("-D", "--Debug"): @@ -49,19 +74,20 @@ for o, v in opts: xmlconfig.reloadConfig(configFile, configOptions) -del sys.modules["twisted.internet.reactor"] -# Choose a reactor -if config.reactor == "epoll": - from twisted.internet import epollreactor - epollreactor.install() -elif config.reactor == "poll": - from twisted.internet import pollreactor - pollreactor.install() -elif config.reactor == "kqueue": - from twisted.internet import kqreactor - kqreactor.install() -elif len(config.reactor) > 0: - print "Unknown reactor: ", config.reactor, ". Using default, select(), reactor." +if config.reactor: + # They picked their own reactor. Lets install it. + del sys.modules["twisted.internet.reactor"] + if config.reactor == "epoll": + from twisted.internet import epollreactor + epollreactor.install() + elif config.reactor == "poll": + from twisted.internet import pollreactor + pollreactor.install() + elif config.reactor == "kqueue": + from twisted.internet import kqreactor + kqreactor.install() + elif len(config.reactor) > 0: + print "Unknown reactor: ", config.reactor, ". Using select(), reactor." from twisted.internet import reactor, task @@ -70,6 +96,7 @@ from tlib.xmlw import Element, jid, component from debug import LogEvent, INFO, WARN, ERROR import debug +import svninfo import utils import xdb import avatar @@ -88,13 +115,18 @@ import housekeep class PyTransport(component.Service): def __init__(self): LogEvent(INFO) + try: + LogEvent(INFO, msg="SVN r" + str(svninfo.getSVNVersion())) + except: + pass # Discovery, as well as some builtin features self.discovery = disco.ServerDiscovery(self) - self.discovery.addIdentity("gateway", legacy.id, legacy.name, config.jid) - self.discovery.addIdentity("conference", "text", legacy.name + " Chatrooms", config.jid) + self.discovery.addIdentity("gateway", legacy.id, config.discoName, config.jid) + self.discovery.addIdentity("conference", "text", config.discoName + " Chatrooms", config.jid) self.discovery.addFeature(disco.XCONFERENCE, None, config.jid) # So that clients know you can create groupchat rooms on the server self.discovery.addFeature("jabber:iq:conference", None, config.jid) # We don't actually support this, but Psi has a bug where it looks for this instead of the above + self.discovery.addIdentity("client", "pc", "MSN Messenger", "USER") self.xdb = xdb.XDB(config.jid, legacy.mangle) self.avatarCache = avatar.AvatarCache() @@ -125,8 +157,8 @@ class PyTransport(component.Service): # Message IDs self.messageID = 0 - self.loopCall = task.LoopingCall(self.loopCall) - self.loopCall.start(60.0) + self.loopTask = task.LoopingCall(self.loopFunc) + self.loopTask.start(60.0) def removeMe(self): LogEvent(INFO) @@ -149,7 +181,7 @@ class PyTransport(component.Service): def reserveID(self, ID): self.reservedIDs.append(ID) - def loopCall(self): + def loopFunc(self): numsessions = len(self.sessions) #if config.debugOn and numsessions > 0: @@ -164,12 +196,12 @@ class PyTransport(component.Service): oldDict = self.sessions.copy() self.sessions = {} for key in oldDict: - session = oldDict[key] - if not session.alive: + s = oldDict[key] + if not s.alive: LogEvent(WARN, "", "Ghost session found.") # Don't add it to the new dictionary. Effectively removing it else: - self.sessions[key] = session + self.sessions[key] = s def componentConnected(self, xmlstream): LogEvent(INFO) @@ -213,8 +245,12 @@ class PyTransport(component.Service): LogEvent(WARN, "", "Failed stringprep.") return mtype = el.getAttribute("type") - if self.sessions.has_key(froj.userhost()): - self.sessions[froj.userhost()].onMessage(el) + s = self.sessions.get(froj.userhost(), None) + if mtype == "error" and s: + LogEvent(INFO, s.jabberID, "Removing session because of message type=error") + s.removeMe() + elif s: + s.onMessage(el) elif mtype != "error": to = el.getAttribute("to") ulang = utils.getLang(el) @@ -224,6 +260,7 @@ class PyTransport(component.Service): body = child.__str__() LogEvent(INFO, "", "Sending error response to a message outside of session.") jabw.sendErrorMessage(self, fro, to, "auth", "not-authorized", lang.get(ulang).notLoggedIn, body) + jabw.sendPresence(self, fro, to, ptype="unavailable") def onPresence(self, el): fro = el.getAttribute("from") @@ -235,8 +272,13 @@ class PyTransport(component.Service): LogEvent(WARN, "", "Failed stringprep.") return - if self.sessions.has_key(froj.userhost()): - self.sessions[froj.userhost()].onPresence(el) + ptype = el.getAttribute("type") + s = self.sessions.get(froj.userhost()) + if ptype == "error" and s: + LogEvent(INFO, s.jabberID, "Removing session because of message type=error") + s.removeMe() + elif s: + s.onPresence(el) else: ulang = utils.getLang(el) ptype = el.getAttribute("type") @@ -257,25 +299,24 @@ class PyTransport(component.Service): elif el.getAttribute("type") != "error": LogEvent(INFO, "", "Sending unavailable presence to non-logged in user.") - pres = Element((None, "presence")) - pres.attributes["from"] = to - pres.attributes["to"] = fro - pres.attributes["type"] = "unavailable" - self.send(pres) + jabw.sendPresence(self, fro, to, ptype="unavailable") return elif ptype and (ptype.startswith("subscribe") or ptype.startswith("unsubscribe")): # They haven't logged in, and are trying to change subscription to a user + # No, lets not log them in. Lets send an error :) + jabw.sendPresence(self, fro, to, ptype="error") + # Lets log them in and then do it - LogEvent(INFO, "", "Attempting to create a session to do subscription stuff.") - s = session.makeSession(self, froj.userhost(), ulang) - if s: - self.sessions[froj.userhost()] = s - LogEvent(INFO, "", "New session created.") - # Tell the session there's a new resource - s.handleResourcePresence(froj.userhost(), froj.resource, toj.userhost(), toj.resource, 0, None, None, None) - # Send this subscription - s.onPresence(el) + #LogEvent(INFO, "", "Attempting to create a session to do subscription stuff.") + #s = session.makeSession(self, froj.userhost(), ulang) + #if s: + # self.sessions[froj.userhost()] = s + # LogEvent(INFO, "", "New session created.") + # # Tell the session there's a new resource + # s.handleResourcePresence(froj.userhost(), froj.resource, toj.userhost(), toj.resource, 0, None, None, None) + # # Send this subscription + # s.onPresence(el) class App: