* Hub has a new property called StoreId and should be used when creating a new Source.

* Hub has a new function called GetUserByStoredId, thanks hackward for suggesting it.
* RemoteCertificateValidation has a new default behaivor to make it more simple for you as a developer. it will now auto approve certificate if you havn't showed that you have overriden the funtionality by setting CertificateValidationInfo.Handled to true.
* Added functionality to UPnP to make it possible to specify search target
* Changed what search target to use in UPnP Detect. Now used "urn:schemas-upnp-org:service:WANIPConnection:1".
* Changed the method IEnumerator<KeyValuePair<string, ContentInfo>> GetEnumerator in Share to have the same output as the generic one.
* Added Equals functionality on Source.
* Added a IsReady Property and action to Hub that should tell you as a developer when the hub is ready to be sending commands/messages to.
* All transfers now have a centrilized way of reading/writing/closing files (Should be better then before). You are encuraged to use this logic yourself. Logic is in here: FlowLib.Utils.FileOperations.
  - Changed how we allocate files. Thanks hackward for code.
* Changed how we locked stuff in TransferManager. We will now just lock stuff we need to lock.
* Changed so ADC users are passive until we know something else.
* Changed some int.Parse to long.Parse (Then was stored as long, just not parsed as long).
* Changed how parsing is done for ADC (Hopefully not broken anything).
* Changed so we now use System.Net.IPEndPoint.MinPort and System.Net.IPEndPoint.MaxPort instead of hardcoded values.
* Made it possible to get a C# class from a web address. For example: FlowLib.Utils.WebOperations<Version>.GetObjectFromPage("http://www.example.com/version.xml") would try to get a Xml representation of a class called Version.
* Added some work for automated testing.

Author: blomman84

FlowLib/Connections/Hub.cs

@@ -1,7 +1,7 @@
 
 /*
  *
- * Copyright (C) 2009 Mattias Blomqvist, patr-blo at dsv dot su dot se
+ * Copyright (C) 2010 Mattias Blomqvist, patr-blo at dsv dot su dot se
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -114,6 +114,16 @@ public override IShare Share
                 }
             }
         }
+        public string StoreId
+        {
+            get
+            {
+                if (HubSetting == null)
+                    return null;
+                return HubSetting.Address + HubSetting.Port.ToString();
+            }
+        }
+
         /// <summary>
         /// Settings used by this hub for connection.
         /// </summary>
@@ -345,7 +355,28 @@ public User GetUserByNick(string nick)
             return null;
         }
 
-        #region Connection
+		/// <summary>
+		/// Returns first user in userlist with the specified storedId.
+		/// </summary>
+		/// <param name="storedId">StoredId for the user we want to get</param>
+		/// <returns>User that have the specified storedId or null if not found</returns>
+		public User GetUserByStoredId(string storedId)
+		{
+			// TODO : Make this more effective.
+			lock (userlist)
+			{
+				foreach (KeyValuePair<string, User> kpair in userlist)
+				{
+					if (storedId.Equals(kpair.Value.StoreID))
+					{
+						return kpair.Value;
+					}
+				}
+			}
+			return null;
+		}
+
+		#region Connection
         /// <summary>
         /// Tells listener object that hub is will reconnect and then reconnects.
         /// </summary>

FlowLib/Connections/TcpConnection.cs

@@ -1,7 +1,7 @@
 
 /*
  *
- * Copyright (C) 2009 Mattias Blomqvist, patr-blo at dsv dot su dot se
+ * Copyright (C) 2010 Mattias Blomqvist, patr-blo at dsv dot su dot se
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -39,6 +39,7 @@
 using System.Security.Cryptography.X509Certificates;
 using FlowLib.Containers.Security;
 using FlowLib.Enums;
+using System.IO;
 #endif
 
 #if COMPACT_FRAMEWORK
@@ -195,7 +196,10 @@ protected void CheckSecure()
             {
                 SecureUpdate(this, new FmdcEventArgs(Actions.SecurityAuthenticationError, pe));
             }
-
+            catch (IOException ioe)
+            {
+				SecureUpdate(this, new FmdcEventArgs(Actions.SecurityAuthenticationError, ioe));
+            }
         }
 #endif
         public bool IsDisposed
@@ -427,7 +431,7 @@ public virtual void Disconnect(string msg)
                 }
 #endif
 
-                socket.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.DontLinger,new LingerOption(false, 0));
+                //socket.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.DontLinger,new LingerOption(false, 0));
                 socket.Disconnect(true);
             }
             catch (Exception) { }
@@ -481,7 +485,7 @@ protected virtual void SetupRecieveCallback(Socket sock)
                 {
                     // Determin Protocol to use here.
                     //if (Protocol != null && sock.Connected && first)
-                    if (Protocol != null && first && !importedSocket)
+                    if (first && !importedSocket && Protocol != null)
                     {
                         first = false;
                         if (Protocol.FirstCommand != null)
@@ -740,9 +744,17 @@ protected bool OnRemoteCertificateValidation(
             FmdcEventArgs args = new FmdcEventArgs(Actions.SecurityValidateRemoteCertificate, info);
             SecureUpdate(this, args);
             info = args.Data as CertificateValidationInfo;
-            if (info == null)
-                return false;
-            return info.Accepted;
+            if (args.Handled)
+            {
+                if (info == null)
+                    return false;
+                return info.Accepted;
+            }
+            else
+            {
+                // If developer havnt added logic to support this. Assume Accepted.
+                return true;
+            }
         }
 
         protected X509Certificate OnLocalCertificateSelection(

FlowLib/Connections/UPnP.cs

@@ -1,7 +1,7 @@
 
 /*
  *
- * Copyright (C) 2009 Mattias Blomqvist, patr-blo at dsv dot su dot se
+ * Copyright (C) 2010 Mattias Blomqvist, patr-blo at dsv dot su dot se
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -66,10 +66,12 @@ public System.Net.IPEndPoint EndPoint
             set;
         }
 
-        public UPnP() : this(null, null) { }
+        public UPnP() : this(null, null, null) { }
         public UPnP(IPEndPoint point) : this(point, null) { }
         public UPnP(IBaseUpdater updater) : this(null, updater) { }
-        public UPnP(IPEndPoint point, IBaseUpdater updater)
+		public UPnP(IPEndPoint point, IBaseUpdater updater) : this(point, updater, null) { }
+		public UPnP(IBaseUpdater updater, string searchTarget) : this(null, updater, searchTarget) { }
+		public UPnP(IPEndPoint point, IBaseUpdater updater, string searchTarget)
         {
             RootDevices = new SortedList<string, UPnPDevice>();
             if (point == null)
@@ -82,7 +84,14 @@ public UPnP(IPEndPoint point, IBaseUpdater updater)
             }
             client = new Socket(AddressFamily.InterNetwork,
             SocketType.Dgram, ProtocolType.Udp);
-            ProtocolUPnP = new UPnPProtocol(this);
+			if (string.IsNullOrEmpty(searchTarget))
+			{
+				ProtocolUPnP = new UPnPProtocol(this);
+			}
+			else
+			{
+				ProtocolUPnP = new UPnPProtocol(this, searchTarget);
+			}
         }
 
         protected virtual void OnUpdateBase(object sender, FlowLib.Events.FmdcEventArgs e)

FlowLib/Containers/FileStreamContainer.cs

@@ -0,0 +1,19 @@
+using System.IO;
+
+namespace FlowLib.Containers
+{
+    public class FileStreamContainer
+    {
+        public FileStream FileStream
+        {
+            get;
+            set;
+        }
+
+        public long LastAccessed
+        {
+            get;
+            set;
+        }
+    }
+}

FlowLib/Containers/Share.cs

@@ -1,7 +1,7 @@
 
 /*
  *
- * Copyright (C) 2009 Mattias Blomqvist, patr-blo at dsv dot su dot se
+ * Copyright (C) 2010 Mattias Blomqvist, patr-blo at dsv dot su dot se
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -1353,9 +1353,26 @@ protected void OnErrorOccured(object sender, FmdcEventArgs e)
         //public IEnumerator<KeyValuePair<string, ContentInfo>> GetEnumerator()
         IEnumerator<KeyValuePair<string, ContentInfo>> IEnumerable<KeyValuePair<string, ContentInfo>>.GetEnumerator()
         {
-            lock (share)
+            if (share.Count != 0)
+            {
+                lock (share)
+                {
+                    return share.GetEnumerator();
+                }
+            }
+            else if (tthNames.Count != 0)
+            {
+                lock (tthNames)
+                {
+                    return tthNames.GetEnumerator();
+                }
+            }
+            else
             {
-                return share.GetEnumerator();
+                lock (virtualNames)
+                {
+                    return virtualNames.GetEnumerator();
+                }
             }
         }
         #endregion

FlowLib/Containers/Source.cs

@@ -1,7 +1,7 @@
 
 /*
  *
- * Copyright (C) 2009 Mattias Blomqvist, patr-blo at dsv dot su dot se
+ * Copyright (C) 2010 Mattias Blomqvist, patr-blo at dsv dot su dot se
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -29,7 +29,8 @@ namespace FlowLib.Containers
     public class Source
         : System.Collections.Generic.IComparer<Source>,
         System.Collections.IComparer,
-        System.IComparable
+        System.IComparable,
+		System.Collections.Generic.IEqualityComparer<Source>
     {
         protected string conId = string.Empty;
         protected string userId = string.Empty;
@@ -152,5 +153,15 @@ public int CompareTo(object obj)
             return this.Compare(this, obj);
         }
         #endregion
-    }
+
+		public bool Equals(Source x, Source y)
+		{
+			return Compare(x, y) == 0;
+		}
+
+		public int GetHashCode(Source obj)
+		{
+            return base.GetHashCode();
+		}
+	}
 }

FlowLib/Containers/TransferRequest.cs

@@ -1,7 +1,7 @@
 
 /*
  *
- * Copyright (C) 2009 Mattias Blomqvist, patr-blo at dsv dot su dot se
+ * Copyright (C) 2010 Mattias Blomqvist, patr-blo at dsv dot su dot se
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,11 +26,12 @@ namespace FlowLib.Containers
 {
     public class TransferRequest
     {
-        UserInfo user = null;
-        Hub hub = null;
-        IShare share = null;
-        string key = null;
+        UserInfo user;
+        Hub hub;
+        IShare share;
+        string key;
         int meDownload = -1;      // Not set (We dont know who is going to download)
+        Source _source;
 
         public bool Download
         {
@@ -52,12 +53,16 @@ public Source Source
         {
             get
             {
-                string conId = null;
-                if (hub != null || hub.HubSetting != null)
+                if (_source == null)
                 {
-                    conId = hub.HubSetting.Address + hub.HubSetting.Port;
+                    string conId = null;
+                    if (hub != null || hub.HubSetting != null)
+                    {
+                        conId = hub.StoreId;
+                    }
+                    _source = new Source(conId, user.StoreID);
                 }
-                return new Source(conId, user.StoreID);
+                return _source;
             }
         }
 
@@ -104,6 +109,12 @@ public TransferRequest(string pKey, Hub pHub, UserInfo pUser, bool download)
                 meDownload = 0;
         }
 
+        public TransferRequest(Source src)
+            : this(src.UserId, null, null)
+        {
+            _source = src;
+        }
+
         /// <summary>
         /// Creates a Transfer request
         /// </summary>

FlowLib/Containers/UPnP/UPnPFunction.cs

@@ -1,7 +1,7 @@
 
 /*
  *
- * Copyright (C) 2009 Mattias Blomqvist, patr-blo at dsv dot su dot se
+ * Copyright (C) 2010 Mattias Blomqvist, patr-blo at dsv dot su dot se
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,6 +20,7 @@
  */
 
 using System.Collections.Generic;
+using System.Text;
 
 namespace FlowLib.Containers.UPnP
 {
@@ -57,5 +58,26 @@ public UPnPFunction()
             Arguments = new SortedList<string, string>();
             ErrorCode = 0;
         }
+
+		public override string ToString()
+		{
+			StringBuilder sb = new StringBuilder();
+			if (Service != null && Service.Device != null && Service.Device.Information != null)
+			{
+				sb.Append("Device: ");
+				sb.Append(Service.Device.Information.Sender);
+				sb.Append(" (");
+				sb.Append(Service.Device.Information.DeviceType);
+				sb.AppendLine(")");
+			}
+			sb.Append(Name);
+			sb.AppendLine("(");
+			foreach (KeyValuePair<string, string> item in Arguments)
+			{
+				sb.AppendFormat("\t{0} = {1}\r\n", item.Key, item.Value);
+			}
+			sb.AppendLine(")");
+			return sb.ToString();
+		}
     }
 }