[Pkg-privacy-commits] [obfsproxy] 280/353: Obfsproxy can now resolve DNS hostnames in bridge addresses.

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository obfsproxy.

commit ba6c1d6417ef49b35d4ab95ab683a6005f33c3ab
Author: George Kadianakis <desnacked at riseup.net>
Date:   Tue Mar 11 17:12:27 2014 +0000

    Obfsproxy can now resolve DNS hostnames in bridge addresses.
    
    Conflicts:
    	ChangeLog
---
 ChangeLog                    | 2 ++
 obfsproxy/transports/base.py | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 391f9cf..06e1a3a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 Changes in version 0.2.8 - UNRELEASED:
  - Fix a bug in the SOCKS5 sever code.  An exception would be raised on systems
    with Python < 2.7.4.  Patch by Yawning Angel.  Fixes #11329.
+ - Obfsproxy can now resolve bridge addresses that were provided as
+   DNS hostnames.  Fix suggested by Yawning Angel. Resolves #10316.
 
 
 Changes in version 0.2.7 - 2014-03-15
diff --git a/obfsproxy/transports/base.py b/obfsproxy/transports/base.py
index 2cda011..b9140c0 100644
--- a/obfsproxy/transports/base.py
+++ b/obfsproxy/transports/base.py
@@ -19,7 +19,7 @@ def addrport(string):
     Used during argparse CLI parsing.
     """
     try:
-        return pyptlib.util.parse_addr_spec(string)
+        return pyptlib.util.parse_addr_spec(string, resolve=True)
     except ValueError, err:
         raise argparse.ArgumentTypeError(err)
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/obfsproxy.git