From d725d2b0e29a0e0fd6b480da8060b312ad790ac8 Mon Sep 17 00:00:00 2001 From: speyrefitte Date: Wed, 18 Jun 2014 18:26:53 +0200 Subject: [PATCH] bug fixing --- rdpy/protocol/rdp/rdp.py | 2 +- rdpy/protocol/rdp/tpdu.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rdpy/protocol/rdp/rdp.py b/rdpy/protocol/rdp/rdp.py index fb63951..fe6abbf 100644 --- a/rdpy/protocol/rdp/rdp.py +++ b/rdpy/protocol/rdp/rdp.py @@ -31,7 +31,7 @@ class RDP(object): for observer in self._observers: #for each rectangle in update PDU for rectangle in bitmapUpdateData.rectangles._array: - observer.notifyBitmapUpdate(rectangle.destLeft.value, rectangle.destTop.value, rectangle.destRight.value, rectangle.destBottom.value, rectangle.width.value, rectangle.height.value, rectangle.bitsPerPixel.value, rectangle.flags | pdu.BitmapFlag.BITMAP_COMPRESSION, rectangle.bitmapDataStream.value) + observer.notifyBitmapUpdate(rectangle.destLeft.value, rectangle.destTop.value, rectangle.destRight.value, rectangle.destBottom.value, rectangle.width.value, rectangle.height.value, rectangle.bitsPerPixel.value, (rectangle.flags & pdu.BitmapFlag.BITMAP_COMPRESSION).value, rectangle.bitmapDataStream.value) class Factory(protocol.Factory): ''' diff --git a/rdpy/protocol/rdp/tpdu.py b/rdpy/protocol/rdp/tpdu.py index 331b143..f02c3dd 100644 --- a/rdpy/protocol/rdp/tpdu.py +++ b/rdpy/protocol/rdp/tpdu.py @@ -164,7 +164,7 @@ class TPDU(LayerAutomata): self._requestedProtocol = message.protocolNeg.selectedProtocol - if not self._requestedProtocol | Protocols.PROTOCOL_SSL: + if not self._requestedProtocol & Protocols.PROTOCOL_SSL: #send error message and quit message = TPDUConnectMessage() message.code = MessageType.X224_TPDU_CONNECTION_CONFIRM