fix issue 13

This commit is contained in:
speyrefitte
2015-01-23 17:13:14 +01:00
parent 8b159e668f
commit 02dfe8f46e
3 changed files with 12 additions and 12 deletions

View File

@@ -7,10 +7,10 @@ RDPY is a pure Python implementation of the Microsoft RDP (Remote Desktop Protoc
RDPY provides the following RDP and VNC binaries : RDPY provides the following RDP and VNC binaries :
* RDP Man In The Middle proxy which record session * RDP Man In The Middle proxy which record session
* RDP Honeypot * RDP Honeypot
* RDP screen shooter * RDP screenshoter
* RDP client * RDP client
* VNC client * VNC client
* VNC screen shooter * VNC screenshoter
* RSS Player * RSS Player
## Build ## Build

View File

@@ -121,7 +121,7 @@ class RDPScreenShotFactory(rdp.ClientFactory):
""" """
@summary: callback use when bitmap is received @summary: callback use when bitmap is received
""" """
image = RDPBitmapToQtImage(destLeft, width, height, bitsPerPixel, isCompress, data); image = RDPBitmapToQtImage(width, height, bitsPerPixel, isCompress, data);
with QtGui.QPainter(self._buffer) as qp: with QtGui.QPainter(self._buffer) as qp:
#draw image #draw image
qp.drawImage(destLeft, destTop, image, 0, 0, destRight - destLeft + 1, destBottom - destTop + 1) qp.drawImage(destLeft, destTop, image, 0, 0, destRight - destLeft + 1, destBottom - destTop + 1)

View File

@@ -463,7 +463,7 @@ class ChannelDef(CompositeType):
class ClientNetworkData(CompositeType): class ClientNetworkData(CompositeType):
""" """
GCC client network block @summary: GCC client network block
All channels asked by client are listed here All channels asked by client are listed here
@see: http://msdn.microsoft.com/en-us/library/cc240512.aspx @see: http://msdn.microsoft.com/en-us/library/cc240512.aspx
""" """
@@ -476,7 +476,7 @@ class ClientNetworkData(CompositeType):
class ServerNetworkData(CompositeType): class ServerNetworkData(CompositeType):
""" """
GCC server network block @summary: GCC server network block
All channels asked by client are listed here All channels asked by client are listed here
@see: All channels asked by client are listed here @see: All channels asked by client are listed here
""" """
@@ -491,7 +491,7 @@ class ServerNetworkData(CompositeType):
class Settings(CompositeType): class Settings(CompositeType):
""" """
Class which group all clients settings supported by RDPY @summary: Class which group all clients settings supported by RDPY
""" """
def __init__(self, init = [], readLen = None): def __init__(self, init = [], readLen = None):
CompositeType.__init__(self, readLen = readLen) CompositeType.__init__(self, readLen = readLen)
@@ -518,21 +518,21 @@ class Settings(CompositeType):
def clientSettings(): def clientSettings():
""" """
Build settings for client @summary: Build settings for client
@return: Settings @return: Settings
""" """
return Settings([ClientCoreData(), ClientNetworkData(), ClientSecurityData()]) return Settings([ClientCoreData(), ClientNetworkData(), ClientSecurityData()])
def serverSettings(): def serverSettings():
""" """
Build settings for server @summary: Build settings for server
@return Settings @return Settings
""" """
return Settings([ServerCoreData(), ServerSecurityData(), ServerNetworkData()]) return Settings([ServerCoreData(), ServerSecurityData(), ServerNetworkData()])
def readConferenceCreateRequest(s): def readConferenceCreateRequest(s):
""" """
Read a response from client @summary: Read a response from client
GCC create request GCC create request
@param s: Stream @param s: Stream
@param client settings (Settings) @param client settings (Settings)
@@ -559,7 +559,7 @@ def readConferenceCreateRequest(s):
def readConferenceCreateResponse(s): def readConferenceCreateResponse(s):
""" """
Read response from server @summary: Read response from server
and return server settings read from this response and return server settings read from this response
@param s: Stream @param s: Stream
@return: ServerSettings @return: ServerSettings
@@ -583,7 +583,7 @@ def readConferenceCreateResponse(s):
def writeConferenceCreateRequest(userData): def writeConferenceCreateRequest(userData):
""" """
Write conference create request structure @summary: Write conference create request structure
@param userData: Settings for client @param userData: Settings for client
@return: GCC packet @return: GCC packet
""" """
@@ -598,7 +598,7 @@ def writeConferenceCreateRequest(userData):
def writeConferenceCreateResponse(serverData): def writeConferenceCreateResponse(serverData):
""" """
Write a conference create response packet @summary: Write a conference create response packet
@param serverData: Settings for server @param serverData: Settings for server
@return: gcc packet @return: gcc packet
""" """