[Dotgnu-pnet-commits] CVS: pnetlib/System Uri.cs,1.37,1.38

[Gopal.V <address@hidden>]

Update of /cvsroot/dotgnu-pnet/pnetlib/System
In directory subversions:/tmp/cvs-serv23422/System

Modified Files:
        Uri.cs 
Log Message:
Remove IPv6Address and implement all it had into IPAddress


Index: Uri.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/System/Uri.cs,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -r1.37 -r1.38
*** Uri.cs      24 May 2003 17:26:49 -0000      1.37
--- Uri.cs      27 May 2003 16:27:46 -0000      1.38
***************
*** 324,357 ****
        }
  
-       private static bool IsIPV4Name(String name)
-       {
-               try
-               {
-                       IPAddress.Parse(name);
-                       return true;
-               }
-               catch (FormatException)
-               {
-                       return false;
-               }
-               return false;
-       }
- 
-       /* This method is to be moved into an IPV6Address class */
-       private static bool IsIPV6Name(String name)
-       {
-               try
-               {
-                       IPv6Address.Parse(name);
-                       return true;
-               }
-               catch (FormatException)
-               {
-                       return false;
-               }
-               return false;
-       }
-       
- 
        public static UriHostNameType CheckHostName(String name)
        {
--- 324,327 ----
***************
*** 363,373 ****
                        return UriHostNameType.Dns;
                }
!               if(IsIPV4Name(name))
                {
!                       return UriHostNameType.IPv4;
                }
!               if(IsIPV6Name(name))
                {
-                       return UriHostNameType.IPv6;
                }
                return UriHostNameType.Unknown;
--- 333,349 ----
                        return UriHostNameType.Dns;
                }
!               
!               try
                {
!                       switch(IPAddress.Parse(name).AddressFamily)
!                       {
!                               case AddressFamily.InterNetwork:
!                                       return UriHostNameType.IPv4;
!                               case AddressFamily.InterNetworkV6:
!                                       return UriHostNameType.IPv6;
!                       }
                }
!               catch (FormatException)
                {
                }
                return UriHostNameType.Unknown;