reorder package

rdpy/network/type.py

@@ -6,7 +6,7 @@ import struct
 from copy import deepcopy
 from StringIO import StringIO
 from error import InvalidValue
-from rdpy.protocol.network.error import InvalidExpectedDataException
+from rdpy.network.error import InvalidExpectedDataException
 
 def sizeof(element):
     '''

rdpy/protocol/rdp/ber.py

@@ -1,9 +1,9 @@
 '''
 @author: sylvain
 '''
-from rdpy.protocol.network.type import UInt8, UInt16Be, UInt32Be, String
-from rdpy.utils.const import ConstAttributes, TypeAttributes
-from rdpy.protocol.network.error import InvalidExpectedDataException, InvalidSize
+from rdpy.network.type import UInt8, UInt16Be, UInt32Be, String
+from rdpy.network.const import ConstAttributes, TypeAttributes
+from rdpy.network.error import InvalidExpectedDataException, InvalidSize
 
 @ConstAttributes
 @TypeAttributes(UInt8)

rdpy/protocol/rdp/gcc.py

@@ -3,10 +3,10 @@
 @summary gcc language
 @see: http://msdn.microsoft.com/en-us/library/cc240510.aspx
 '''
-from rdpy.utils.const import ConstAttributes, TypeAttributes
-from rdpy.protocol.network.type import UInt8, UInt16Le, UInt32Le, CompositeType, String, UniString, Stream, sizeof
+from rdpy.network.const import ConstAttributes, TypeAttributes
+from rdpy.network.type import UInt8, UInt16Le, UInt32Le, CompositeType, String, UniString, Stream, sizeof
 import per
-from rdpy.protocol.network.error import InvalidExpectedDataException
+from rdpy.network.error import InvalidExpectedDataException
 
 t124_02_98_oid = ( 0, 0, 20, 124, 0, 1 )
 h221_cs_key = "Duca";

rdpy/protocol/rdp/lic.py

@@ -1,8 +1,8 @@
 '''
 @author: sylvain
 '''
-from rdpy.protocol.network.type import CompositeType, UInt8, UInt16Le, UInt32Le, String, sizeof
-from rdpy.utils.const import ConstAttributes, TypeAttributes
+from rdpy.network.type import CompositeType, UInt8, UInt16Le, UInt32Le, String, sizeof
+from rdpy.network.const import ConstAttributes, TypeAttributes
 
 @ConstAttributes
 @TypeAttributes(UInt8)

rdpy/protocol/rdp/mcs.py

@@ -2,11 +2,11 @@
 @author: sylvain
 '''
 
-from rdpy.utils.const import ConstAttributes, TypeAttributes
-from rdpy.protocol.network.layer import LayerAutomata
-from rdpy.protocol.network.type import sizeof, Stream, UInt8, UInt16Be
+from rdpy.network.const import ConstAttributes, TypeAttributes
+from rdpy.network.layer import LayerAutomata
+from rdpy.network.type import sizeof, Stream, UInt8, UInt16Be
+from rdpy.network.error import InvalidExpectedDataException, InvalidValue, InvalidSize
 from rdpy.protocol.rdp.ber import writeLength
-from rdpy.protocol.network.error import InvalidExpectedDataException, InvalidValue, InvalidSize
 
 import ber, gcc, per
 

rdpy/protocol/rdp/per.py

@@ -2,8 +2,8 @@
 @author: sylvain
 '''
 
-from rdpy.protocol.network.type import UInt8, UInt16Be, UInt32Be, String
-from rdpy.protocol.network.error import InvalidValue, InvalidExpectedDataException
+from rdpy.network.type import UInt8, UInt16Be, UInt32Be, String
+from rdpy.network.error import InvalidValue, InvalidExpectedDataException
 
 def readLength(s):
     '''

rdpy/protocol/rdp/sil.py

@@ -2,10 +2,10 @@
 @author: sylvain
 '''
 
-from rdpy.protocol.network.layer import LayerAutomata
-from rdpy.protocol.network.type import CompositeType, UniString, String, UInt8, UInt16Le, UInt16Be, UInt32Le, sizeof, ArrayType
-from rdpy.utils.const import ConstAttributes, TypeAttributes
-from rdpy.protocol.network.error import InvalidExpectedDataException
+from rdpy.network.layer import LayerAutomata
+from rdpy.network.type import CompositeType, UniString, String, UInt8, UInt16Le, UInt16Be, UInt32Le, sizeof, ArrayType
+from rdpy.network.const import ConstAttributes, TypeAttributes
+from rdpy.network.error import InvalidExpectedDataException
 
 import gcc
 import lic

rdpy/protocol/rdp/tpdu.py

@@ -1,10 +1,10 @@
 '''
 @author: sylvain
 '''
-from rdpy.protocol.network.layer import LayerAutomata
-from rdpy.protocol.network.type import UInt8, UInt16Le, UInt16Be, UInt32Le, CompositeType, sizeof
-from rdpy.protocol.network.error import InvalidExpectedDataException
-from rdpy.utils.const import ConstAttributes, TypeAttributes
+from rdpy.network.layer import LayerAutomata
+from rdpy.network.type import UInt8, UInt16Le, UInt16Be, UInt32Le, CompositeType, sizeof
+from rdpy.network.error import InvalidExpectedDataException
+from rdpy.network.const import ConstAttributes, TypeAttributes
 
 @ConstAttributes
 @TypeAttributes(UInt8)

rdpy/protocol/rdp/tpkt.py

@@ -1,8 +1,8 @@
 '''
 @author: sylvain
 '''
-from rdpy.protocol.network.layer import RawLayer
-from rdpy.protocol.network.type import UInt8, UInt16Be, sizeof
+from rdpy.network.layer import RawLayer
+from rdpy.network.type import UInt8, UInt16Be, sizeof
 
 class TPKT(RawLayer):
     '''

rdpy/protocol/rfb/message.py

@@ -2,8 +2,8 @@
 @author: sylvain
 '''
 
-from rdpy.protocol.network.type import UInt8, UInt16Be, UInt32Be, SInt32Be, String, CompositeType
-from rdpy.utils.const import ConstAttributes, TypeAttributes
+from rdpy.network.type import UInt8, UInt16Be, UInt32Be, SInt32Be, String, CompositeType
+from rdpy.network.const import ConstAttributes, TypeAttributes
 
 @ConstAttributes
 @TypeAttributes(String)

rdpy/protocol/rfb/rfb.py

@@ -2,8 +2,8 @@
 @author: sylvain
 '''
 from twisted.internet import protocol
-from rdpy.protocol.network.type import String, UInt8, UInt16Be, UInt32Be
-from rdpy.protocol.network.layer import RawLayer
+from rdpy.network.type import String, UInt8, UInt16Be, UInt32Be
+from rdpy.network.layer import RawLayer
 from message import *
 
 class ProtocolMode(object):

rdpy/rdpclient.py

@@ -11,5 +11,5 @@ if __name__ == '__main__':
     from twisted.internet import reactor
     #reactor.connectTCP("127.0.0.1", 5901, factory.RfbFactory(protocol))
     #reactor.connectTCP("192.168.1.90", 3389, factory.RfbFactory(tpkt.TPKT(tpdu.TPDU(mcs.MCS()))))
-    reactor.connectTCP("192.168.135.182", 3389, rdp.Factory())
+    reactor.connectTCP("192.168.135.198", 3389, rdp.Factory())
     reactor.run()