[Pkg-privacy-commits] [obfsproxy] 04/353: Renamed pyptlib to obfsproxy
Ximin Luo
infinity0 at moszumanska.debian.org
Sat Aug 22 13:01:31 UTC 2015
This is an automated email from the git hooks/post-receive script.
infinity0 pushed a commit to branch master
in repository obfsproxy.
commit 8bcc72f0d0f29bbc19ddbee920fc4d19b346e064
Author: Brandon Wiley <brandon at blanu.net>
Date: Mon Jun 25 13:54:01 2012 -0500
Renamed pyptlib to obfsproxy
---
py-obfsproxy.xcodeproj/project.pbxproj | 162 +++++++++------------
src/{pyptlib => obfsproxy}/__init__.py | 0
src/{pyptlib => obfsproxy}/cli/obfsproxy.py | 0
.../config => obfsproxy/framework}/__init__.py | 0
src/{pyptlib => obfsproxy}/framework/daemon.py | 0
.../framework/external}/__init__.py | 0
.../framework/external/client.py | 0
.../framework/external/server.py | 0
src/{pyptlib => obfsproxy}/framework/loopback.py | 0
.../framework/managed}/__init__.py | 0
.../framework/managed/client.py | 0
.../framework/managed/server.py | 0
src/{pyptlib => obfsproxy}/framework/proxy.py | 0
src/{pyptlib => obfsproxy}/framework/shared.py | 0
src/{pyptlib => obfsproxy}/framework/socks.py | 0
.../managed => obfsproxy/manager}/__init__.py | 0
src/{pyptlib => obfsproxy}/manager/__init__.pyc | Bin
.../manager/clientManager.py | 0
src/{pyptlib => obfsproxy}/manager/manager.py | 0
src/{pyptlib => obfsproxy}/manager/manager.pyc | Bin
.../manager/serverManager.py | 0
.../manager => obfsproxy/transports}/__init__.py | 0
src/{pyptlib => obfsproxy}/transports/__init__.pyc | Bin
src/{pyptlib => obfsproxy}/transports/dummy.py | 0
src/{pyptlib => obfsproxy}/transports/dummy.pyc | Bin
src/{pyptlib => obfsproxy}/transports/rot13.py | 0
src/{pyptlib => obfsproxy}/util.py | 0
src/pyptlib/__init__.pyc | Bin 137 -> 0 bytes
src/pyptlib/config/__init__.pyc | Bin 144 -> 0 bytes
src/pyptlib/config/client.py | 43 ------
src/pyptlib/config/client.pyc | Bin 1911 -> 0 bytes
src/pyptlib/config/config.py | 70 ---------
src/pyptlib/config/config.pyc | Bin 3069 -> 0 bytes
src/pyptlib/config/server.py | 115 ---------------
src/pyptlib/config/server.pyc | Bin 4442 -> 0 bytes
src/pyptlib/transports/__init__.py | 0
src/pyptlib/util.pyc | Bin 4877 -> 0 bytes
37 files changed, 67 insertions(+), 323 deletions(-)
diff --git a/py-obfsproxy.xcodeproj/project.pbxproj b/py-obfsproxy.xcodeproj/project.pbxproj
index 73bda22..2f5fd2f 100644
--- a/py-obfsproxy.xcodeproj/project.pbxproj
+++ b/py-obfsproxy.xcodeproj/project.pbxproj
@@ -11,42 +11,32 @@
89C39C6E1598EA2600271216 /* README */ = {isa = PBXFileReference; lastKnownFileType = text; path = README; sourceTree = "<group>"; };
89C39C6F1598EA2600271216 /* setup.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; path = setup.py; sourceTree = "<group>"; };
89C39C711598EA2600271216 /* __init__.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; path = __init__.py; sourceTree = "<group>"; };
- 89C39C731598EA2600271216 /* __init__.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; path = __init__.py; sourceTree = "<group>"; };
- 89C39C741598EA2600271216 /* __init__.pyc */ = {isa = PBXFileReference; lastKnownFileType = file; path = __init__.pyc; sourceTree = "<group>"; };
- 89C39C761598EA2600271216 /* obfsproxy.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; path = obfsproxy.py; sourceTree = "<group>"; };
- 89C39C781598EA2600271216 /* __init__.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; path = __init__.py; sourceTree = "<group>"; };
- 89C39C791598EA2600271216 /* __init__.pyc */ = {isa = PBXFileReference; lastKnownFileType = file; path = __init__.pyc; sourceTree = "<group>"; };
- 89C39C7A1598EA2600271216 /* client.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; path = client.py; sourceTree = "<group>"; };
- 89C39C7B1598EA2600271216 /* client.pyc */ = {isa = PBXFileReference; lastKnownFileType = file; path = client.pyc; sourceTree = "<group>"; };
- 89C39C7C1598EA2600271216 /* config.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; path = config.py; sourceTree = "<group>"; };
- 89C39C7D1598EA2600271216 /* config.pyc */ = {isa = PBXFileReference; lastKnownFileType = file; path = config.pyc; sourceTree = "<group>"; };
- 89C39C7E1598EA2600271216 /* server.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; path = server.py; sourceTree = "<group>"; };
- 89C39C7F1598EA2600271216 /* server.pyc */ = {isa = PBXFileReference; lastKnownFileType = file; path = server.pyc; sourceTree = "<group>"; };
- 89C39C811598EA2600271216 /* __init__.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; path = __init__.py; sourceTree = "<group>"; };
- 89C39C821598EA2600271216 /* daemon.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; path = daemon.py; sourceTree = "<group>"; };
- 89C39C841598EA2600271216 /* __init__.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; path = __init__.py; sourceTree = "<group>"; };
- 89C39C851598EA2600271216 /* client.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; path = client.py; sourceTree = "<group>"; };
- 89C39C861598EA2600271216 /* server.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; path = server.py; sourceTree = "<group>"; };
- 89C39C871598EA2600271216 /* loopback.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; path = loopback.py; sourceTree = "<group>"; };
- 89C39C891598EA2600271216 /* __init__.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; path = __init__.py; sourceTree = "<group>"; };
- 89C39C8A1598EA2600271216 /* client.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; path = client.py; sourceTree = "<group>"; };
- 89C39C8B1598EA2600271216 /* server.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; path = server.py; sourceTree = "<group>"; };
- 89C39C8C1598EA2600271216 /* proxy.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; path = proxy.py; sourceTree = "<group>"; };
- 89C39C8D1598EA2600271216 /* shared.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; path = shared.py; sourceTree = "<group>"; };
- 89C39C8E1598EA2600271216 /* socks.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; path = socks.py; sourceTree = "<group>"; };
- 89C39C901598EA2600271216 /* __init__.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; path = __init__.py; sourceTree = "<group>"; };
- 89C39C911598EA2600271216 /* __init__.pyc */ = {isa = PBXFileReference; lastKnownFileType = file; path = __init__.pyc; sourceTree = "<group>"; };
- 89C39C921598EA2600271216 /* clientManager.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; path = clientManager.py; sourceTree = "<group>"; };
- 89C39C931598EA2600271216 /* manager.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; path = manager.py; sourceTree = "<group>"; };
- 89C39C941598EA2600271216 /* manager.pyc */ = {isa = PBXFileReference; lastKnownFileType = file; path = manager.pyc; sourceTree = "<group>"; };
- 89C39C951598EA2600271216 /* serverManager.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; path = serverManager.py; sourceTree = "<group>"; };
- 89C39C971598EA2600271216 /* __init__.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; path = __init__.py; sourceTree = "<group>"; };
- 89C39C981598EA2600271216 /* __init__.pyc */ = {isa = PBXFileReference; lastKnownFileType = file; path = __init__.pyc; sourceTree = "<group>"; };
- 89C39C991598EA2600271216 /* dummy.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; path = dummy.py; sourceTree = "<group>"; };
- 89C39C9A1598EA2600271216 /* dummy.pyc */ = {isa = PBXFileReference; lastKnownFileType = file; path = dummy.pyc; sourceTree = "<group>"; };
- 89C39C9B1598EA2600271216 /* rot13.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; path = rot13.py; sourceTree = "<group>"; };
- 89C39C9C1598EA2600271216 /* util.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; path = util.py; sourceTree = "<group>"; };
- 89C39C9D1598EA2600271216 /* util.pyc */ = {isa = PBXFileReference; lastKnownFileType = file; path = util.pyc; sourceTree = "<group>"; };
+ 89C39C9F1598EB1200271216 /* __init__.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; path = __init__.py; sourceTree = "<group>"; };
+ 89C39CA11598EB1200271216 /* obfsproxy.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; path = obfsproxy.py; sourceTree = "<group>"; };
+ 89C39CA31598EB1200271216 /* __init__.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; path = __init__.py; sourceTree = "<group>"; };
+ 89C39CA41598EB1200271216 /* daemon.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; path = daemon.py; sourceTree = "<group>"; };
+ 89C39CA61598EB1200271216 /* __init__.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; path = __init__.py; sourceTree = "<group>"; };
+ 89C39CA71598EB1200271216 /* client.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; path = client.py; sourceTree = "<group>"; };
+ 89C39CA81598EB1200271216 /* server.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; path = server.py; sourceTree = "<group>"; };
+ 89C39CA91598EB1200271216 /* loopback.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; path = loopback.py; sourceTree = "<group>"; };
+ 89C39CAB1598EB1200271216 /* __init__.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; path = __init__.py; sourceTree = "<group>"; };
+ 89C39CAC1598EB1200271216 /* client.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; path = client.py; sourceTree = "<group>"; };
+ 89C39CAD1598EB1200271216 /* server.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; path = server.py; sourceTree = "<group>"; };
+ 89C39CAE1598EB1200271216 /* proxy.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; path = proxy.py; sourceTree = "<group>"; };
+ 89C39CAF1598EB1200271216 /* shared.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; path = shared.py; sourceTree = "<group>"; };
+ 89C39CB01598EB1200271216 /* socks.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; path = socks.py; sourceTree = "<group>"; };
+ 89C39CB21598EB1200271216 /* __init__.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; path = __init__.py; sourceTree = "<group>"; };
+ 89C39CB31598EB1200271216 /* __init__.pyc */ = {isa = PBXFileReference; lastKnownFileType = file; path = __init__.pyc; sourceTree = "<group>"; };
+ 89C39CB41598EB1200271216 /* clientManager.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; path = clientManager.py; sourceTree = "<group>"; };
+ 89C39CB51598EB1200271216 /* manager.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; path = manager.py; sourceTree = "<group>"; };
+ 89C39CB61598EB1200271216 /* manager.pyc */ = {isa = PBXFileReference; lastKnownFileType = file; path = manager.pyc; sourceTree = "<group>"; };
+ 89C39CB71598EB1200271216 /* serverManager.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; path = serverManager.py; sourceTree = "<group>"; };
+ 89C39CB91598EB1200271216 /* __init__.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; path = __init__.py; sourceTree = "<group>"; };
+ 89C39CBA1598EB1200271216 /* __init__.pyc */ = {isa = PBXFileReference; lastKnownFileType = file; path = __init__.pyc; sourceTree = "<group>"; };
+ 89C39CBB1598EB1200271216 /* dummy.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; path = dummy.py; sourceTree = "<group>"; };
+ 89C39CBC1598EB1200271216 /* dummy.pyc */ = {isa = PBXFileReference; lastKnownFileType = file; path = dummy.pyc; sourceTree = "<group>"; };
+ 89C39CBD1598EB1200271216 /* rot13.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; path = rot13.py; sourceTree = "<group>"; };
+ 89C39CBE1598EB1200271216 /* util.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; path = util.py; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXGroup section */
@@ -63,107 +53,89 @@
89C39C701598EA2600271216 /* src */ = {
isa = PBXGroup;
children = (
+ 89C39C9E1598EB1200271216 /* obfsproxy */,
89C39C711598EA2600271216 /* __init__.py */,
- 89C39C721598EA2600271216 /* pyptlib */,
);
path = src;
sourceTree = "<group>";
};
- 89C39C721598EA2600271216 /* pyptlib */ = {
+ 89C39C9E1598EB1200271216 /* obfsproxy */ = {
isa = PBXGroup;
children = (
- 89C39C731598EA2600271216 /* __init__.py */,
- 89C39C741598EA2600271216 /* __init__.pyc */,
- 89C39C751598EA2600271216 /* cli */,
- 89C39C771598EA2600271216 /* config */,
- 89C39C801598EA2600271216 /* framework */,
- 89C39C8F1598EA2600271216 /* manager */,
- 89C39C961598EA2600271216 /* transports */,
- 89C39C9C1598EA2600271216 /* util.py */,
- 89C39C9D1598EA2600271216 /* util.pyc */,
+ 89C39C9F1598EB1200271216 /* __init__.py */,
+ 89C39CA01598EB1200271216 /* cli */,
+ 89C39CA21598EB1200271216 /* framework */,
+ 89C39CB11598EB1200271216 /* manager */,
+ 89C39CB81598EB1200271216 /* transports */,
+ 89C39CBE1598EB1200271216 /* util.py */,
);
- path = pyptlib;
+ path = obfsproxy;
sourceTree = "<group>";
};
- 89C39C751598EA2600271216 /* cli */ = {
+ 89C39CA01598EB1200271216 /* cli */ = {
isa = PBXGroup;
children = (
- 89C39C761598EA2600271216 /* obfsproxy.py */,
+ 89C39CA11598EB1200271216 /* obfsproxy.py */,
);
path = cli;
sourceTree = "<group>";
};
- 89C39C771598EA2600271216 /* config */ = {
+ 89C39CA21598EB1200271216 /* framework */ = {
isa = PBXGroup;
children = (
- 89C39C781598EA2600271216 /* __init__.py */,
- 89C39C791598EA2600271216 /* __init__.pyc */,
- 89C39C7A1598EA2600271216 /* client.py */,
- 89C39C7B1598EA2600271216 /* client.pyc */,
- 89C39C7C1598EA2600271216 /* config.py */,
- 89C39C7D1598EA2600271216 /* config.pyc */,
- 89C39C7E1598EA2600271216 /* server.py */,
- 89C39C7F1598EA2600271216 /* server.pyc */,
- );
- path = config;
- sourceTree = "<group>";
- };
- 89C39C801598EA2600271216 /* framework */ = {
- isa = PBXGroup;
- children = (
- 89C39C811598EA2600271216 /* __init__.py */,
- 89C39C821598EA2600271216 /* daemon.py */,
- 89C39C831598EA2600271216 /* external */,
- 89C39C871598EA2600271216 /* loopback.py */,
- 89C39C881598EA2600271216 /* managed */,
- 89C39C8C1598EA2600271216 /* proxy.py */,
- 89C39C8D1598EA2600271216 /* shared.py */,
- 89C39C8E1598EA2600271216 /* socks.py */,
+ 89C39CA31598EB1200271216 /* __init__.py */,
+ 89C39CA41598EB1200271216 /* daemon.py */,
+ 89C39CA51598EB1200271216 /* external */,
+ 89C39CA91598EB1200271216 /* loopback.py */,
+ 89C39CAA1598EB1200271216 /* managed */,
+ 89C39CAE1598EB1200271216 /* proxy.py */,
+ 89C39CAF1598EB1200271216 /* shared.py */,
+ 89C39CB01598EB1200271216 /* socks.py */,
);
path = framework;
sourceTree = "<group>";
};
- 89C39C831598EA2600271216 /* external */ = {
+ 89C39CA51598EB1200271216 /* external */ = {
isa = PBXGroup;
children = (
- 89C39C841598EA2600271216 /* __init__.py */,
- 89C39C851598EA2600271216 /* client.py */,
- 89C39C861598EA2600271216 /* server.py */,
+ 89C39CA61598EB1200271216 /* __init__.py */,
+ 89C39CA71598EB1200271216 /* client.py */,
+ 89C39CA81598EB1200271216 /* server.py */,
);
path = external;
sourceTree = "<group>";
};
- 89C39C881598EA2600271216 /* managed */ = {
+ 89C39CAA1598EB1200271216 /* managed */ = {
isa = PBXGroup;
children = (
- 89C39C891598EA2600271216 /* __init__.py */,
- 89C39C8A1598EA2600271216 /* client.py */,
- 89C39C8B1598EA2600271216 /* server.py */,
+ 89C39CAB1598EB1200271216 /* __init__.py */,
+ 89C39CAC1598EB1200271216 /* client.py */,
+ 89C39CAD1598EB1200271216 /* server.py */,
);
path = managed;
sourceTree = "<group>";
};
- 89C39C8F1598EA2600271216 /* manager */ = {
+ 89C39CB11598EB1200271216 /* manager */ = {
isa = PBXGroup;
children = (
- 89C39C901598EA2600271216 /* __init__.py */,
- 89C39C911598EA2600271216 /* __init__.pyc */,
- 89C39C921598EA2600271216 /* clientManager.py */,
- 89C39C931598EA2600271216 /* manager.py */,
- 89C39C941598EA2600271216 /* manager.pyc */,
- 89C39C951598EA2600271216 /* serverManager.py */,
+ 89C39CB21598EB1200271216 /* __init__.py */,
+ 89C39CB31598EB1200271216 /* __init__.pyc */,
+ 89C39CB41598EB1200271216 /* clientManager.py */,
+ 89C39CB51598EB1200271216 /* manager.py */,
+ 89C39CB61598EB1200271216 /* manager.pyc */,
+ 89C39CB71598EB1200271216 /* serverManager.py */,
);
path = manager;
sourceTree = "<group>";
};
- 89C39C961598EA2600271216 /* transports */ = {
+ 89C39CB81598EB1200271216 /* transports */ = {
isa = PBXGroup;
children = (
- 89C39C971598EA2600271216 /* __init__.py */,
- 89C39C981598EA2600271216 /* __init__.pyc */,
- 89C39C991598EA2600271216 /* dummy.py */,
- 89C39C9A1598EA2600271216 /* dummy.pyc */,
- 89C39C9B1598EA2600271216 /* rot13.py */,
+ 89C39CB91598EB1200271216 /* __init__.py */,
+ 89C39CBA1598EB1200271216 /* __init__.pyc */,
+ 89C39CBB1598EB1200271216 /* dummy.py */,
+ 89C39CBC1598EB1200271216 /* dummy.pyc */,
+ 89C39CBD1598EB1200271216 /* rot13.py */,
);
path = transports;
sourceTree = "<group>";
diff --git a/src/pyptlib/__init__.py b/src/obfsproxy/__init__.py
similarity index 100%
rename from src/pyptlib/__init__.py
rename to src/obfsproxy/__init__.py
diff --git a/src/pyptlib/cli/obfsproxy.py b/src/obfsproxy/cli/obfsproxy.py
similarity index 100%
rename from src/pyptlib/cli/obfsproxy.py
rename to src/obfsproxy/cli/obfsproxy.py
diff --git a/src/pyptlib/config/__init__.py b/src/obfsproxy/framework/__init__.py
similarity index 100%
rename from src/pyptlib/config/__init__.py
rename to src/obfsproxy/framework/__init__.py
diff --git a/src/pyptlib/framework/daemon.py b/src/obfsproxy/framework/daemon.py
similarity index 100%
rename from src/pyptlib/framework/daemon.py
rename to src/obfsproxy/framework/daemon.py
diff --git a/src/pyptlib/framework/__init__.py b/src/obfsproxy/framework/external/__init__.py
similarity index 100%
rename from src/pyptlib/framework/__init__.py
rename to src/obfsproxy/framework/external/__init__.py
diff --git a/src/pyptlib/framework/external/client.py b/src/obfsproxy/framework/external/client.py
similarity index 100%
rename from src/pyptlib/framework/external/client.py
rename to src/obfsproxy/framework/external/client.py
diff --git a/src/pyptlib/framework/external/server.py b/src/obfsproxy/framework/external/server.py
similarity index 100%
rename from src/pyptlib/framework/external/server.py
rename to src/obfsproxy/framework/external/server.py
diff --git a/src/pyptlib/framework/loopback.py b/src/obfsproxy/framework/loopback.py
similarity index 100%
rename from src/pyptlib/framework/loopback.py
rename to src/obfsproxy/framework/loopback.py
diff --git a/src/pyptlib/framework/external/__init__.py b/src/obfsproxy/framework/managed/__init__.py
similarity index 100%
rename from src/pyptlib/framework/external/__init__.py
rename to src/obfsproxy/framework/managed/__init__.py
diff --git a/src/pyptlib/framework/managed/client.py b/src/obfsproxy/framework/managed/client.py
similarity index 100%
rename from src/pyptlib/framework/managed/client.py
rename to src/obfsproxy/framework/managed/client.py
diff --git a/src/pyptlib/framework/managed/server.py b/src/obfsproxy/framework/managed/server.py
similarity index 100%
rename from src/pyptlib/framework/managed/server.py
rename to src/obfsproxy/framework/managed/server.py
diff --git a/src/pyptlib/framework/proxy.py b/src/obfsproxy/framework/proxy.py
similarity index 100%
rename from src/pyptlib/framework/proxy.py
rename to src/obfsproxy/framework/proxy.py
diff --git a/src/pyptlib/framework/shared.py b/src/obfsproxy/framework/shared.py
similarity index 100%
rename from src/pyptlib/framework/shared.py
rename to src/obfsproxy/framework/shared.py
diff --git a/src/pyptlib/framework/socks.py b/src/obfsproxy/framework/socks.py
similarity index 100%
rename from src/pyptlib/framework/socks.py
rename to src/obfsproxy/framework/socks.py
diff --git a/src/pyptlib/framework/managed/__init__.py b/src/obfsproxy/manager/__init__.py
similarity index 100%
rename from src/pyptlib/framework/managed/__init__.py
rename to src/obfsproxy/manager/__init__.py
diff --git a/src/pyptlib/manager/__init__.pyc b/src/obfsproxy/manager/__init__.pyc
similarity index 100%
rename from src/pyptlib/manager/__init__.pyc
rename to src/obfsproxy/manager/__init__.pyc
diff --git a/src/pyptlib/manager/clientManager.py b/src/obfsproxy/manager/clientManager.py
similarity index 100%
rename from src/pyptlib/manager/clientManager.py
rename to src/obfsproxy/manager/clientManager.py
diff --git a/src/pyptlib/manager/manager.py b/src/obfsproxy/manager/manager.py
similarity index 100%
rename from src/pyptlib/manager/manager.py
rename to src/obfsproxy/manager/manager.py
diff --git a/src/pyptlib/manager/manager.pyc b/src/obfsproxy/manager/manager.pyc
similarity index 100%
rename from src/pyptlib/manager/manager.pyc
rename to src/obfsproxy/manager/manager.pyc
diff --git a/src/pyptlib/manager/serverManager.py b/src/obfsproxy/manager/serverManager.py
similarity index 100%
rename from src/pyptlib/manager/serverManager.py
rename to src/obfsproxy/manager/serverManager.py
diff --git a/src/pyptlib/manager/__init__.py b/src/obfsproxy/transports/__init__.py
similarity index 100%
rename from src/pyptlib/manager/__init__.py
rename to src/obfsproxy/transports/__init__.py
diff --git a/src/pyptlib/transports/__init__.pyc b/src/obfsproxy/transports/__init__.pyc
similarity index 100%
rename from src/pyptlib/transports/__init__.pyc
rename to src/obfsproxy/transports/__init__.pyc
diff --git a/src/pyptlib/transports/dummy.py b/src/obfsproxy/transports/dummy.py
similarity index 100%
rename from src/pyptlib/transports/dummy.py
rename to src/obfsproxy/transports/dummy.py
diff --git a/src/pyptlib/transports/dummy.pyc b/src/obfsproxy/transports/dummy.pyc
similarity index 100%
rename from src/pyptlib/transports/dummy.pyc
rename to src/obfsproxy/transports/dummy.pyc
diff --git a/src/pyptlib/transports/rot13.py b/src/obfsproxy/transports/rot13.py
similarity index 100%
rename from src/pyptlib/transports/rot13.py
rename to src/obfsproxy/transports/rot13.py
diff --git a/src/pyptlib/util.py b/src/obfsproxy/util.py
similarity index 100%
rename from src/pyptlib/util.py
rename to src/obfsproxy/util.py
diff --git a/src/pyptlib/__init__.pyc b/src/pyptlib/__init__.pyc
deleted file mode 100644
index e50beb2..0000000
Binary files a/src/pyptlib/__init__.pyc and /dev/null differ
diff --git a/src/pyptlib/config/__init__.pyc b/src/pyptlib/config/__init__.pyc
deleted file mode 100644
index 1bd55bb..0000000
Binary files a/src/pyptlib/config/__init__.pyc and /dev/null differ
diff --git a/src/pyptlib/config/client.py b/src/pyptlib/config/client.py
deleted file mode 100644
index 0cc268c..0000000
--- a/src/pyptlib/config/client.py
+++ /dev/null
@@ -1,43 +0,0 @@
-import os
-
-from pyptlib.config.config import Config
-
-"""
-Configuration for a Pluggable Transport client.
-"""
-
-__docformat__ = 'restructuredtext'
-
-class ClientConfig(Config):
- #Public methods
-
- def __init__(self): # throws EnvError
- Config.__init__(self)
-
- self.transports=self.get('TOR_PT_CLIENT_TRANSPORTS').split(',')
- if '*' in self.transports:
- self.allTransportsEnabled=True
- self.transports.remove('*')
-
- # Returns a list of strings representing the client transports reported by Tor. If present, '*' is stripped from this list and used to set allTransportsEnabled to True.
- def getClientTransports(self):
- return self.transports
-
- # Write a message to stdout specifying a supported transport
- # Takes: str, int, (str, int), [str], [str]
- def writeMethod(self, name, socksVersion, address, args, optArgs): # CMETHOD
- methodLine='CMETHOD %s socks%s %s:%s' % (name, socksVersion, address[0], address[1])
- if args and len(args)>0:
- methodLine=methodLine+' ARGS='+args.join(',')
- if optArgs and len(optArgs)>0:
- methodLine=methodLine+' OPT-ARGS='+args.join(',')
- print(methodLine)
-
- # Write a message to stdout specifying that an error occurred setting up the specified method
- # Takes: str, str
- def writeMethodError(self, name, message): # CMETHOD-ERROR
- print('CMETHOD-ERROR %s %s' % (name, message))
-
- # Write a message to stdout specifying that the list of supported transports has ended
- def writeMethodEnd(self): # CMETHODS DONE
- print('CMETHODS DONE')
diff --git a/src/pyptlib/config/client.pyc b/src/pyptlib/config/client.pyc
deleted file mode 100644
index 5006f94..0000000
Binary files a/src/pyptlib/config/client.pyc and /dev/null differ
diff --git a/src/pyptlib/config/config.py b/src/pyptlib/config/config.py
deleted file mode 100644
index 148cc7a..0000000
--- a/src/pyptlib/config/config.py
+++ /dev/null
@@ -1,70 +0,0 @@
-import os
-
-"""
-The base class for the client and server config classes. This class should not be used directly. Instead, use pyptlib.client or pyptlib.server.
-"""
-
-__docformat__ = 'restructuredtext'
-
-class Config:
- stateLocation=None # TOR_PT_STATE_LOCATION
- managedTransportVer=[] # TOR_PT_MANAGED_TRANSPORT_VER
- transports=[] # TOR_PT_SERVER_TRANSPORTS or TOR_PT_CLIENT_TRANSPORTS
- allTransportsEnabled=False
-
- #Public methods
-
- def __init__(self): # throws EnvError
- self.stateLocation=self.get('TOR_PT_STATE_LOCATION')
- self.managedTransportVer=self.get('TOR_PT_MANAGED_TRANSPORT_VER').split(',')
-
- # Returns a string representing the path to the state storage directory (which may not exist, but should be creatable) reported by Tor
- def getStateLocation(self):
- return self.stateLocation
-
- # Returns a list of strings representing supported versions as reported by Tor
- def getManagedTransportVersions(self):
- return self.managedTransportVer
-
- # Checks to see if the specified version is included in those reported by Tor
- # Returns True if the version is included and False if it is not
- def checkManagedTransportVersion(self, version):
- return version in self.managedTransportVer
-
- # Returns a bool, True if the transport '*' was specified by Tor, otherwise False.
- def getAllTransportsEnabled(self):
- return self.allTransportsEnabled
-
- def checkTransportEnabled(self, transport):
- return self.allTransportsEnabled or transport in self.transports
-
- # Write a message to stdout specifying that an error parsing the environment variables has occurred
- # Takes: str
- def writeEnvError(self, message): # ENV-ERROR
- print('ENV-ERROR %s' % (message))
-
- # Write a message to stdout specifying that the specified configuration protocol version is supported
- # Takes: str
- def writeVersion(self, version): # VERSION
- print('VERSION %s' % (version))
-
- # Write a message to stdout specifying that none of the specified configuration protocol versions are supported
- def writeVersionError(self): # VERSION-ERROR
- print('VERSION-ERROR no-version')
-
- # Private methods
-
- def get(self, key):
- if key in os.environ:
- return os.environ[key]
- else:
- message="Missing environment variable %s" % (key)
- self.writeEnvError(message)
- raise EnvException(message)
-
-# Exception thrown when there is an error parsing the configuration parameters provided by Tor in environment variables
-class EnvException(Exception):
- message=None
-
- def __init__(self, message):
- self.message=message
diff --git a/src/pyptlib/config/config.pyc b/src/pyptlib/config/config.pyc
deleted file mode 100644
index 4710a84..0000000
Binary files a/src/pyptlib/config/config.pyc and /dev/null differ
diff --git a/src/pyptlib/config/server.py b/src/pyptlib/config/server.py
deleted file mode 100644
index 809de3b..0000000
--- a/src/pyptlib/config/server.py
+++ /dev/null
@@ -1,115 +0,0 @@
-import os
-
-from pyptlib.config.config import Config
-
-"""
-Configuration for a Pluggable Transport server.
-"""
-
-__docformat__ = 'restructuredtext'
-
-class ServerConfig(Config):
- extendedServerPort=None # TOR_PT_EXTENDED_SERVER_PORT
- ORPort=None # TOR_PT_ORPORT
- serverBindAddr={} # TOR_PT_SERVER_BINADDR
-
- #Public methods
-
- def __init__(self): # throws EnvError
- Config.__init__(self)
-
- self.extendedServerPort=self.get('TOR_PT_EXTENDED_SERVER_PORT')
- self.ORPort=self.get('TOR_PT_ORPORT')
-
- binds=self.get('TOR_PT_SERVER_BINDADDR').split(',')
- for bind in binds:
- key,value=bind.split('-')
- self.serverBindAddr[key]=value
-
- self.transports=self.get('TOR_PT_SERVER_TRANSPORTS').split(',')
- if '*' in self.transports:
- self.allTransportsEnabled=True
- self.transports.remove('*')
-
- # Returns a tuple (str,int) representing the address of the Tor server port as reported by Tor
- def getExtendedServerPort(self):
- return self.extendedServerPort
-
- # Returns a tuple (str,int) representing the address of the Tor OR port as reported by Tor
- def getORPort(self):
- return self.ORPort
-
- # Returns a dict {str: (str,int)} representing the addresses for each transport as reported by Tor
- def getServerBindAddresses(self):
- return self.serverBindAddr
-
- # Returns a list of strings representing the server transports reported by Tor. If present, '*' is stripped from this list and used to set allTransportsEnabled to True.
- def getServerTransports(self):
- return self.transports
-
- # Write a message to stdout specifying a supported transport
- # Takes: str, (str, int), MethodOptions
- def writeMethod(self, name, address, options): # SMETHOD
- if options:
- print('SMETHOD %s %s:%s %s' % (name, address[0], address[1], options))
- else:
- print('SMETHOD %s %s:%s' % (name, address[0], address[1]))
-
- # Write a message to stdout specifying that an error occurred setting up the specified method
- # Takes: str, str
- def writeMethodError(self, name, message): # SMETHOD-ERROR
- print('SMETHOD-ERROR %s %s' % (name, message))
-
- # Write a message to stdout specifying that the list of supported transports has ended
- def writeMethodEnd(self): # SMETHODS DONE
- print('SMETHODS DONE')
-
-class MethodOptions:
- forward=False # FORWARD
- args={} # ARGS
- declare={} # DECLARE
- useExtendedPort=False # USE-EXTENDED-PORT
-
- #Public methods
-
- def __init__(self):
- pass
-
- # Sets forward to True
- def setForward(self):
- self.forward=True
-
- # Adds a key-value pair to args
- def addArg(self, key, value):
- self.args[key]=value
-
- # Adds a key-value pair to declare
- def addDeclare(self, key, value):
- self.declare[key]=value
-
- # Sets useExtendedPort to True
- def setUserExtendedPort(self):
- self.useExtendedPort=True
-
- def __str__(self):
- options=[]
- if self.forward:
- options.append('FORWARD:1')
- if len(self.args)>0:
- argstr='ARGS:'
- for key in self.args:
- value=self.args[key]
- argstr=argstr+key+'='+value+','
- argstr=argstr[:-1] # Remove trailing comma
- options.append(argstr)
- if len(self.declare)>0:
- decs='DECLARE:'
- for key in self.declare:
- value=self.declare[key]
- decs=decs+key+'='+value+','
- decs=decs[:-1] # Remove trailing comma
- options.append(decs)
- if self.useExtendedPort:
- options.append('USE-EXTENDED-PORT:1')
-
- return ' '.join(options)
diff --git a/src/pyptlib/config/server.pyc b/src/pyptlib/config/server.pyc
deleted file mode 100644
index cf1017b..0000000
Binary files a/src/pyptlib/config/server.pyc and /dev/null differ
diff --git a/src/pyptlib/transports/__init__.py b/src/pyptlib/transports/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/src/pyptlib/util.pyc b/src/pyptlib/util.pyc
deleted file mode 100644
index 9784d60..0000000
Binary files a/src/pyptlib/util.pyc and /dev/null differ
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/obfsproxy.git
More information about the Pkg-privacy-commits
mailing list