diff options
| author | Teddy <[email protected]> | 2013-08-28 21:57:46 +0800 |
|---|---|---|
| committer | Teddy <[email protected]> | 2013-08-28 21:57:46 +0800 |
| commit | 55640ca3ae84743ffea43ac7854bf9fc37e9ffd8 (patch) | |
| tree | ecc73ba403bf8cc5bdc2c6de7216b043f96ddaab /server | |
| parent | 58bf5fe78b05f2da14ac9ceac7afd90e48b7cb8c (diff) | |
fixed optcode bug
Diffstat (limited to 'server')
| -rw-r--r-- | server/piztor/server.py | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/server/piztor/server.py b/server/piztor/server.py index 70cc13a..6ebdc6f 100644 --- a/server/piztor/server.py +++ b/server/piztor/server.py @@ -430,7 +430,7 @@ class UserLogoutHandler(RequestHandler): if uauth is None: logger.warning("Authentication failure") return struct.pack("!LBB", self._response_size, - _OptCode.location_update, + _OptCode.user_logout, _StatusCode.failure) del RequestHandler.push_tunnels[uauth.uid] uauth.regen_token() @@ -469,7 +469,7 @@ class OpenPushTunnelHandler(RequestHandler): if uauth is None: logger.warning("Authentication failure") return struct.pack("!LBB", self._response_size, - _OptCode.location_update, + _OptCode.open_push_tunnel, _StatusCode.failure) tunnel = RequestHandler.push_tunnels[uauth.uid] @@ -482,7 +482,7 @@ class OpenPushTunnelHandler(RequestHandler): logger.info("Push tunnel opened successfully!") return struct.pack("!LBB", self._response_size, - _OptCode.user_logout, + _OptCode.open_push_tunnel, _StatusCode.sucess) class SendTextMessageHandler(RequestHandler): @@ -517,18 +517,24 @@ class SendTextMessageHandler(RequestHandler): if uauth is None: logger.warning("Authentication failure") return struct.pack("!LBB", self._response_size, - _OptCode.location_update, + _OptCode.send_text_mesg, _StatusCode.failure) pt = RequestHandler.push_tunnels - uid = uauth.uid - if pt.has_key(uid): - tunnel = pt[uid] - tunnel.add(PushTextMesgData(mesg)) - tunnel.push() + u = uauth.user + ulist = self.session.query(UserModel) \ + .filter(and_(UserModel.comp_id == u.comp_id, + UserModel.sec_id == u.sec_id)).all() + + for user in ulist: + uid = user.id + if pt.has_key(uid): + tunnel = pt[uid] + tunnel.add(PushTextMesgData(mesg)) + tunnel.push() logger.info("Sent text mesg successfully!") return struct.pack("!LBB", self._response_size, - _OptCode.user_logout, + _OptCode.send_text_mesg, _StatusCode.sucess) @@ -559,6 +565,7 @@ class PTP(Protocol, TimeoutMixin): def timeoutConnection(self): logger.info("The connection times out") + self.transport.loseConnection() def connectionMade(self): logger.info("A new connection is made") @@ -593,6 +600,7 @@ class PTP(Protocol, TimeoutMixin): logger.info("Blocking the client...") self.buff = bytes() self.length = -1 + self.setTimeout(None) return logger.info("Wrote: %s", get_hex(reply)) self.transport.write(reply) |