mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 3.10.0

Browse Source 
Former-commit-id: 172c8e3c300b39d5785c7a3e8dfb08ebdbc1a99b
This commit is contained in:
Jo Shields
2014-10-04 11:27:48 +01:00
parent fe777c5c82
commit 8b9b85e7f5
970 changed files with 20242 additions and 31308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
mcs/class/System/System.Net.NetworkInformation/LinuxNetworkInterfaceMarshal.cs
View File

@ -85,8 +85,15 @@ namespace System.Net.NetworkInformation {
public ushort sll_hatype;
public byte sll_pkttype;
public byte sll_halen;
#if MONODROID
// In MonoDroid the structure has larger space allocated for the address part since there exist
// addresses (Infiniband, ipv6 tunnels) which exceed the standard 8 bytes. In fact, glibc's
// getifaddrs implementation also uses the bigger size, but for compatibility with other libc
// implementations we use the standard address size
[MarshalAs (UnmanagedType.ByValArray, SizeConst=24)]
#else
[MarshalAs (UnmanagedType.ByValArray, SizeConst=8)]
#endif
public byte[] sll_addr;
}
@ -96,11 +103,18 @@ namespace System.Net.NetworkInformation {
PRONET = 4,
ATM = 19,
SLIP = 256,
CSLIP = 257,
SLIP6 = 258,
CSLIP6 = 259,
PPP = 512,
LOOPBACK = 772,
FDDI = 774,
TUNNEL = 768,
TUNNEL6 = 769
TUNNEL6 = 769,
SIT = 776, // IPv6-in-IPv4 tunnel
IPDDP = 777, // IP over DDP tunnel
IPGRE = 778, // GRE over IP
IP6GRE = 823 // GRE over IPv6
}
}

35
mcs/class/System/System.Net.NetworkInformation/NetworkInterface.cs
View File

@ -238,11 +238,29 @@ namespace System.Net.NetworkInformation {
get { return iface_path; }
}
static int GetInterfaceAddresses (out IntPtr ifap)
{
#if MONODROID
return AndroidPlatform.GetInterfaceAddresses (out ifap);
#else
return getifaddrs (out ifap);
#endif
}
static void FreeInterfaceAddresses (IntPtr ifap)
{
#if MONODROID
AndroidPlatform.FreeInterfaceAddresses (ifap);
#else
freeifaddrs (ifap);
#endif
}
public static NetworkInterface [] ImplGetAllNetworkInterfaces ()
{
var interfaces = new Dictionary <string, LinuxNetworkInterface> ();
IntPtr ifap;
if (getifaddrs (out ifap) != 0)
if (GetInterfaceAddresses (out ifap) != 0)
throw new SystemException ("getifaddrs() failed");
try {
@ -254,6 +272,7 @@ namespace System.Net.NetworkInformation {
int index = -1;
byte[] macAddress = null;
NetworkInterfaceType type = NetworkInterfaceType.Unknown;
int nullNameCount = 0;
if (addr.ifa_addr != IntPtr.Zero) {
sockaddr_in sockaddr = (sockaddr_in) Marshal.PtrToStructure (addr.ifa_addr, typeof (sockaddr_in));
@ -295,6 +314,9 @@ namespace System.Net.NetworkInformation {
break;
case LinuxArpHardware.SLIP:
case LinuxArpHardware.CSLIP:
case LinuxArpHardware.SLIP6:
case LinuxArpHardware.CSLIP6:
type = NetworkInterfaceType.Slip;
break;
@ -311,9 +333,11 @@ namespace System.Net.NetworkInformation {
type = NetworkInterfaceType.Fddi;
break;
case LinuxArpHardware.SIT:
case LinuxArpHardware.IPDDP:
case LinuxArpHardware.IPGRE:
case LinuxArpHardware.IP6GRE:
case LinuxArpHardware.TUNNEL6:
goto case LinuxArpHardware.TUNNEL;
case LinuxArpHardware.TUNNEL:
type = NetworkInterfaceType.Tunnel;
break;
@ -324,6 +348,9 @@ namespace System.Net.NetworkInformation {
LinuxNetworkInterface iface = null;
if (String.IsNullOrEmpty (name))
name = "\0" + (++nullNameCount).ToString ();
if (!interfaces.TryGetValue (name, out iface)) {
iface = new LinuxNetworkInterface (name);
interfaces.Add (name, iface);
@ -344,7 +371,7 @@ namespace System.Net.NetworkInformation {
next = addr.ifa_next;
}
} finally {
freeifaddrs (ifap);
FreeInterfaceAddresses (ifap);
}
NetworkInterface [] result = new NetworkInterface [interfaces.Count];