Changeset 377

Timestamp:

05/12/08 23:44:26 (8 months ago)

Author:

tomoyo

Message:

プロクシの設定が正しく動作していなかったのを修正した。

Location:

TwitterIrcGateway

Files:

• TwitterIrcGatewayCLI/Program.cs (modified) (5 diffs)
• TwitterIrcGatewayCore/TwitterService.cs (modified) (6 diffs)

TwitterIrcGateway/TwitterIrcGatewayCLI/Program.cs

@@ -19 +19 @@
             IPAddress bindAddress = IPAddress.Loopback;
             Encoding encoding = Encoding.GetEncoding("ISO-2022-JP");
+            IWebProxy proxy = WebProxy.GetDefaultProxy();
 
             CommandLineOptions options;
@@ -31 +32 @@
                 // Listening IP
                 if (!IPAddress.TryParse(options.BindAddress, out bindAddress))
+                {
+                    ShowUsage();
+                    return;
+                }
+
+                // Proxy
+                try
+                {
+                    if (!String.IsNullOrEmpty(options.Proxy))
+                        proxy = new WebProxy(options.Proxy);
+                }
+                catch (UriFormatException)
                 {
                     ShowUsage();
@@ -60 +73 @@
             _server.BroadcastUpdateMessageIsNotice = options.BroadcastUpdateMessageIsNotice;
             _server.SessionStartedRecieved += new EventHandler<SessionStartedEventArgs>(_server_SessionStartedRecieved);
-            _server.Proxy = new WebProxy(options.Proxy);
+            _server.Proxy = proxy;
 
             Console.WriteLine("Start TwitterIrcGateway Server v{0}", typeof(Server).Assembly.GetName().Version);
@@ -80 +93 @@
             Console.WriteLine("[Configuration] ClientMessageWait: {0}", _server.ClientMessageWait);
             Console.WriteLine("[Configuration] BroadcatUpdateMessageIsNotice: {0}", _server.BroadcastUpdateMessageIsNotice);
-            Console.WriteLine("[Configuration] Proxy: {0}", _server.Proxy);
+            Console.WriteLine("[Configuration] Proxy: {0}", options.Proxy);
 
             _server.Start(bindAddress, options.Port);
@@ -176 +189 @@
 
         [DefaultValue("")]
-        [Description("web proxy url")]
+        [Description("HTTP proxy server URL (http://host:port)")]
         public String Proxy { get; set; }
     }

TwitterIrcGateway/TwitterIrcGatewayCore/TwitterService.cs

@@ -17 +17 @@
     public class TwitterService : IDisposable
     {
-        private WebClient _webClient;
+        //private WebClient _webClient;
         private CredentialCache _credential;
+        private IWebProxy _proxy;
         private String _userName;
         private Boolean _cookieLoginMode = false;
@@ -36 +37 @@
             _userName = userName;
 
-            _webClient = new PreAuthenticatedWebClient();
-            _webClient = new WebClient();
-            _webClient.Credentials = _credential;
+            //_webClient = new PreAuthenticatedWebClient();
+            //_webClient = new WebClient();
+            //_webClient.Credentials = _credential;
         }
 
@@ -48 +49 @@
             get
             {
-                return _webClient.Proxy;
+                return _proxy;
+                //return _webClient.Proxy;
             }
             set
             {
-                _webClient.Proxy = value;
+                _proxy = value;
+                //_webClient.Proxy = value;
             }
         }
@@ -373 +376 @@
         public void Dispose()
         {
-            if (_webClient != null)
-            {
-                _webClient.Dispose();
-                _webClient = null;
-            }
+            //if (_webClient != null)
+            //{
+            //    _webClient.Dispose();
+            //    _webClient = null;
+            //}
         }
 
@@ -452 +455 @@
             //webRequest.Credentials = _credential;
             //webRequest.PreAuthenticate = true;
+            webRequest.Proxy = _proxy;
             webRequest.Method = method;
             webRequest.Accept = "text/xml, application/xml";
@@ -535 +539 @@
                 httpRequest.Accept = "*/*";
                 httpRequest.CookieContainer = new CookieContainer();
+                httpRequest.Proxy = _proxy;
                 if (_cookies != null)
                 {