Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins:[3874] trunk/plugins/IR Server Suite
|
From: <che...@us...> - 2010-10-30 00:39:21
|
Revision: 3874
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3874&view=rev
Author: chef_koch
Date: 2010-10-30 00:39:14 +0000 (Sat, 30 Oct 2010)
Log Message:
-----------
moved static methos GetIPFromName from IrssComms.Client to IrssUtils.Network
Modified Paths:
--------------
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Abstractor/MainForm.cs
trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast/Program.cs
trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast (No Window)/Program.cs
trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/MainForm.cs
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Keyboard Input Relay/Program.cs
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Media Center Blaster/Forms/SetupForm.cs
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Media Center Blaster/Tray.cs
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote Skin Editor/MainForm.cs
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Web Remote/Program.cs
trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssComms/Client.cs
trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Network.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/IR Server.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Blast Zone Plugin/Forms/SetupForm.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Blast Zone Plugin/MPBlastZonePlugin.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Control Plugin/Forms/SetupForm.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Control Plugin/MPControlPlugin.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TVServer plugins/TV3 Blaster Plugin/Forms/PluginSetup.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TVServer plugins/TV3 Blaster Plugin/TV3BlasterPlugin.cs
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Abstractor/MainForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Abstractor/MainForm.cs 2010-10-30 00:15:02 UTC (rev 3873)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Abstractor/MainForm.cs 2010-10-30 00:39:14 UTC (rev 3874)
@@ -431,7 +431,7 @@
_serverHost = comboBoxComputer.Text;
- IPAddress serverIp = Client.GetIPFromName(_serverHost);
+ IPAddress serverIp = Network.GetIPFromName(_serverHost);
IPEndPoint endPoint = new IPEndPoint(serverIp, Server.DefaultPort);
StartClient(endPoint);
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast/Program.cs 2010-10-30 00:15:02 UTC (rev 3873)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast/Program.cs 2010-10-30 00:39:14 UTC (rev 3874)
@@ -109,7 +109,7 @@
}
else
{
- IPAddress serverIP = Client.GetIPFromName(_serverHost);
+ IPAddress serverIP = Network.GetIPFromName(_serverHost);
IPEndPoint endPoint = new IPEndPoint(serverIP, Server.DefaultPort);
if (StartClient(endPoint))
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast (No Window)/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast (No Window)/Program.cs 2010-10-30 00:15:02 UTC (rev 3873)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast (No Window)/Program.cs 2010-10-30 00:39:14 UTC (rev 3874)
@@ -108,7 +108,7 @@
}
else
{
- IPAddress serverIP = Client.GetIPFromName(_serverHost);
+ IPAddress serverIP = Network.GetIPFromName(_serverHost);
IPEndPoint endPoint = new IPEndPoint(serverIP, Server.DefaultPort);
if (StartClient(endPoint))
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/MainForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/MainForm.cs 2010-10-30 00:15:02 UTC (rev 3873)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/MainForm.cs 2010-10-30 00:39:14 UTC (rev 3874)
@@ -463,7 +463,7 @@
{
Invoke(new UpdateWindowDel(UpdateWindow), new string[] { "Connecting ..." });
- IPAddress serverIP = Client.GetIPFromName(_serverHost);
+ IPAddress serverIP = Network.GetIPFromName(_serverHost);
IPEndPoint endPoint = new IPEndPoint(serverIP, Server.DefaultPort);
StartClient(endPoint);
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Keyboard Input Relay/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Keyboard Input Relay/Program.cs 2010-10-30 00:15:02 UTC (rev 3873)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Keyboard Input Relay/Program.cs 2010-10-30 00:39:14 UTC (rev 3874)
@@ -83,7 +83,7 @@
bool clientStarted = false;
- IPAddress serverIP = Client.GetIPFromName(_serverHost);
+ IPAddress serverIP = Network.GetIPFromName(_serverHost);
IPEndPoint endPoint = new IPEndPoint(serverIP, Server.DefaultPort);
try
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Media Center Blaster/Forms/SetupForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Media Center Blaster/Forms/SetupForm.cs 2010-10-30 00:15:02 UTC (rev 3873)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Media Center Blaster/Forms/SetupForm.cs 2010-10-30 00:39:14 UTC (rev 3874)
@@ -299,7 +299,7 @@
Tray.ServerHost = serverAddress.ServerHost;
- IPAddress serverIP = Client.GetIPFromName(Tray.ServerHost);
+ IPAddress serverIP = Network.GetIPFromName(Tray.ServerHost);
IPEndPoint endPoint = new IPEndPoint(serverIP, Server.DefaultPort);
Tray.StartClient(endPoint);
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Media Center Blaster/Tray.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Media Center Blaster/Tray.cs 2010-10-30 00:15:02 UTC (rev 3873)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Media Center Blaster/Tray.cs 2010-10-30 00:39:14 UTC (rev 3874)
@@ -219,7 +219,7 @@
try
{
- IPAddress serverIP = Client.GetIPFromName(_serverHost);
+ IPAddress serverIP = Network.GetIPFromName(_serverHost);
IPEndPoint endPoint = new IPEndPoint(serverIP, Server.DefaultPort);
clientStarted = StartClient(endPoint);
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote Skin Editor/MainForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote Skin Editor/MainForm.cs 2010-10-30 00:15:02 UTC (rev 3873)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote Skin Editor/MainForm.cs 2010-10-30 00:39:14 UTC (rev 3874)
@@ -364,7 +364,7 @@
private void connectToolStripMenuItem_Click(object sender, EventArgs e)
{
- IPAddress serverIP = Client.GetIPFromName(_serverHost);
+ IPAddress serverIP = Network.GetIPFromName(_serverHost);
IPEndPoint endPoint = new IPEndPoint(serverIP, Server.DefaultPort);
StartClient(endPoint);
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Web Remote/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Web Remote/Program.cs 2010-10-30 00:15:02 UTC (rev 3873)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Web Remote/Program.cs 2010-10-30 00:39:14 UTC (rev 3874)
@@ -137,7 +137,7 @@
bool clientStarted = false;
- IPAddress serverIP = Client.GetIPFromName(_serverHost);
+ IPAddress serverIP = Network.GetIPFromName(_serverHost);
IPEndPoint endPoint = new IPEndPoint(serverIP, Server.DefaultPort);
try
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssComms/Client.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssComms/Client.cs 2010-10-30 00:15:02 UTC (rev 3873)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssComms/Client.cs 2010-10-30 00:39:14 UTC (rev 3874)
@@ -373,25 +373,6 @@
return (bytesReadTotal == buffer.Length);
}
- /// <summary>
- /// Translates a host name or address into an IPAddress object (IPv4).
- /// </summary>
- /// <param name="name">Host name or IP address.</param>
- /// <returns>IPAddress object.</returns>
- public static IPAddress GetIPFromName(string name)
- {
- // Automatically convert localhost to loopback address, avoiding lookup calls for systems that aren't on a network.
- if (name.Equals("localhost", StringComparison.OrdinalIgnoreCase))
- return IPAddress.Loopback;
-
- IPAddress[] addresses = Dns.GetHostAddresses(name);
- foreach (IPAddress address in addresses)
- if (address.AddressFamily == AddressFamily.InterNetwork)
- return address;
-
- return null;
- }
-
#endregion Implementation
}
}
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Network.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Network.cs 2010-10-30 00:15:02 UTC (rev 3873)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Network.cs 2010-10-30 00:39:14 UTC (rev 3874)
@@ -22,6 +22,8 @@
using System;
using System.Collections.Generic;
+using System.Net;
+using System.Net.Sockets;
using System.Runtime.InteropServices;
using System.Security;
using System.Security.Permissions;
@@ -130,6 +132,25 @@
return null;
}
+ /// <summary>
+ /// Translates a host name or address into an IPAddress object (IPv4).
+ /// </summary>
+ /// <param name="name">Host name or IP address.</param>
+ /// <returns>IPAddress object.</returns>
+ public static IPAddress GetIPFromName(string name)
+ {
+ // Automatically convert localhost to loopback address, avoiding lookup calls for systems that aren't on a network.
+ if (name.Equals("localhost", StringComparison.OrdinalIgnoreCase))
+ return IPAddress.Loopback;
+
+ IPAddress[] addresses = Dns.GetHostAddresses(name);
+ foreach (IPAddress address in addresses)
+ if (address.AddressFamily == AddressFamily.InterNetwork)
+ return address;
+
+ return null;
+ }
+
#endregion Methods
}
}
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/IR Server.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/IR Server.cs 2010-10-30 00:15:02 UTC (rev 3873)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/IR Server.cs 2010-10-30 00:39:14 UTC (rev 3874)
@@ -693,7 +693,7 @@
{
StartServer();
- IPAddress serverIP = Client.GetIPFromName(Settings.HostComputer);
+ IPAddress serverIP = Network.GetIPFromName(Settings.HostComputer);
IPEndPoint endPoint = new IPEndPoint(serverIP, Server.DefaultPort);
StartClient(endPoint);
@@ -725,7 +725,7 @@
{
StartServer();
- IPAddress serverIP = Client.GetIPFromName(Settings.HostComputer);
+ IPAddress serverIP = Network.GetIPFromName(Settings.HostComputer);
IPEndPoint endPoint = new IPEndPoint(serverIP, Server.DefaultPort);
StartClient(endPoint);
Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Blast Zone Plugin/Forms/SetupForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Blast Zone Plugin/Forms/SetupForm.cs 2010-10-30 00:15:02 UTC (rev 3873)
+++ trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Blast Zone Plugin/Forms/SetupForm.cs 2010-10-30 00:39:14 UTC (rev 3874)
@@ -60,7 +60,7 @@
MPBlastZonePlugin.ServerHost = serverAddress.ServerHost;
}
- IPAddress serverIP = Client.GetIPFromName(MPBlastZonePlugin.ServerHost);
+ IPAddress serverIP = Network.GetIPFromName(MPBlastZonePlugin.ServerHost);
IPEndPoint endPoint = new IPEndPoint(serverIP, Server.DefaultPort);
if (!MPBlastZonePlugin.StartClient(endPoint))
@@ -670,7 +670,7 @@
MPBlastZonePlugin.ServerHost = serverAddress.ServerHost;
- IPAddress serverIP = Client.GetIPFromName(MPBlastZonePlugin.ServerHost);
+ IPAddress serverIP = Network.GetIPFromName(MPBlastZonePlugin.ServerHost);
IPEndPoint endPoint = new IPEndPoint(serverIP, Server.DefaultPort);
MPBlastZonePlugin.StartClient(endPoint);
Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Blast Zone Plugin/MPBlastZonePlugin.cs
===================================================================
--- trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Blast Zone Plugin/MPBlastZonePlugin.cs 2010-10-30 00:15:02 UTC (rev 3873)
+++ trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Blast Zone Plugin/MPBlastZonePlugin.cs 2010-10-30 00:39:14 UTC (rev 3874)
@@ -290,7 +290,7 @@
Log.Info("MPBlastZonePlugin: Starting ({0})", PluginVersion);
- IPAddress serverIP = Client.GetIPFromName(ServerHost);
+ IPAddress serverIP = Network.GetIPFromName(ServerHost);
IPEndPoint endPoint = new IPEndPoint(serverIP, Server.DefaultPort);
if (!StartClient(endPoint))
@@ -447,7 +447,7 @@
Log.Warn("MPBlastZonePlugin: Attempting communications restart ...");
- IPAddress serverIP = Client.GetIPFromName(_serverHost);
+ IPAddress serverIP = Network.GetIPFromName(_serverHost);
IPEndPoint endPoint = new IPEndPoint(serverIP, Server.DefaultPort);
StartClient(endPoint);
Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Control Plugin/Forms/SetupForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Control Plugin/Forms/SetupForm.cs 2010-10-30 00:15:02 UTC (rev 3873)
+++ trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Control Plugin/Forms/SetupForm.cs 2010-10-30 00:39:14 UTC (rev 3874)
@@ -64,7 +64,7 @@
MPControlPlugin.ServerHost = serverAddress.ServerHost;
}
- IPAddress serverIP = Client.GetIPFromName(MPControlPlugin.ServerHost);
+ IPAddress serverIP = Network.GetIPFromName(MPControlPlugin.ServerHost);
IPEndPoint endPoint = new IPEndPoint(serverIP, Server.DefaultPort);
if (!MPControlPlugin.StartClient(endPoint))
@@ -834,7 +834,7 @@
MPControlPlugin.ServerHost = serverAddress.ServerHost;
- IPAddress serverIP = Client.GetIPFromName(MPControlPlugin.ServerHost);
+ IPAddress serverIP = Network.GetIPFromName(MPControlPlugin.ServerHost);
IPEndPoint endPoint = new IPEndPoint(serverIP, Server.DefaultPort);
MPControlPlugin.StartClient(endPoint);
Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Control Plugin/MPControlPlugin.cs
===================================================================
--- trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Control Plugin/MPControlPlugin.cs 2010-10-30 00:15:02 UTC (rev 3873)
+++ trunk/plugins/IR Server Suite/MediaPortal Plugins/MediaPortal Plugins/MP Control Plugin/MPControlPlugin.cs 2010-10-30 00:39:14 UTC (rev 3874)
@@ -286,7 +286,7 @@
if (MultiMappingEnabled)
LoadMultiMappings();
- IPAddress serverIP = Client.GetIPFromName(_serverHost);
+ IPAddress serverIP = Network.GetIPFromName(_serverHost);
IPEndPoint endPoint = new IPEndPoint(serverIP, Server.DefaultPort);
if (!StartClient(endPoint))
@@ -729,7 +729,7 @@
Log.Warn("MPControlPlugin: Attempting communications restart ...");
- IPAddress serverIP = Client.GetIPFromName(_serverHost);
+ IPAddress serverIP = Network.GetIPFromName(_serverHost);
IPEndPoint endPoint = new IPEndPoint(serverIP, Server.DefaultPort);
StartClient(endPoint);
Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/TVServer plugins/TV3 Blaster Plugin/Forms/PluginSetup.cs
===================================================================
--- trunk/plugins/IR Server Suite/MediaPortal Plugins/TVServer plugins/TV3 Blaster Plugin/Forms/PluginSetup.cs 2010-10-30 00:15:02 UTC (rev 3873)
+++ trunk/plugins/IR Server Suite/MediaPortal Plugins/TVServer plugins/TV3 Blaster Plugin/Forms/PluginSetup.cs 2010-10-30 00:39:14 UTC (rev 3874)
@@ -61,7 +61,7 @@
TvBusinessLayer layer = new TvBusinessLayer();
TV3BlasterPlugin.ServerHost = layer.GetSetting("TV3BlasterPlugin_ServerHost", "localhost").Value;
- IPAddress serverIP = Client.GetIPFromName(TV3BlasterPlugin.ServerHost);
+ IPAddress serverIP = Network.GetIPFromName(TV3BlasterPlugin.ServerHost);
IPEndPoint endPoint = new IPEndPoint(serverIP, Server.DefaultPort);
if (!TV3BlasterPlugin.StartClient(endPoint))
@@ -342,7 +342,7 @@
TV3BlasterPlugin.ServerHost = serverAddress.ServerHost;
- IPAddress serverIP = Client.GetIPFromName(TV3BlasterPlugin.ServerHost);
+ IPAddress serverIP = Network.GetIPFromName(TV3BlasterPlugin.ServerHost);
IPEndPoint endPoint = new IPEndPoint(serverIP, Server.DefaultPort);
TV3BlasterPlugin.StartClient(endPoint);
Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/TVServer plugins/TV3 Blaster Plugin/TV3BlasterPlugin.cs
===================================================================
--- trunk/plugins/IR Server Suite/MediaPortal Plugins/TVServer plugins/TV3 Blaster Plugin/TV3BlasterPlugin.cs 2010-10-30 00:15:02 UTC (rev 3873)
+++ trunk/plugins/IR Server Suite/MediaPortal Plugins/TVServer plugins/TV3 Blaster Plugin/TV3BlasterPlugin.cs 2010-10-30 00:39:14 UTC (rev 3874)
@@ -160,7 +160,7 @@
ITvServerEvent events = GlobalServiceProvider.Instance.Get<ITvServerEvent>();
events.OnTvServerEvent += events_OnTvServerEvent;
- IPAddress serverIP = Client.GetIPFromName(_serverHost);
+ IPAddress serverIP = Network.GetIPFromName(_serverHost);
IPEndPoint endPoint = new IPEndPoint(serverIP, Server.DefaultPort);
if (!StartClient(endPoint))
@@ -209,7 +209,7 @@
Log.Info("TV3BlasterPlugin: Attempting communications restart ...");
- IPAddress serverIP = Client.GetIPFromName(_serverHost);
+ IPAddress serverIP = Network.GetIPFromName(_serverHost);
IPEndPoint endPoint = new IPEndPoint(serverIP, Server.DefaultPort);
StartClient(endPoint);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
