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

Imported Upstream version 5.8.0.22

Browse Source 
Former-commit-id: df344e34b07851d296efb3e6604c8db42b6f7aa3
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-10-19 20:04:20 +00:00
parent 5f4a27cc8a
commit 7d05485754
5020 changed files with 114082 additions and 186061 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
mcs/class/System/System.Net.NetworkInformation/Ping.cs
View File

@@ -76,9 +76,8 @@ namespace System.Net.NetworkInformation {
const int default_timeout = 4000; // 4 sec.
ushort identifier;
// This value is correct as of Linux kernel version 2.6.25.9
// See /usr/include/linux/capability.h
const UInt32 linux_cap_version = 0x20071026;
// Request 32-bit capabilities by using version 1
const UInt32 _LINUX_CAPABILITY_VERSION_1 = 0x19980330;
static readonly byte [] default_buffer = new byte [0];
@@ -132,7 +131,7 @@ namespace System.Net.NetworkInformation {
cap_user_header_t header = new cap_user_header_t ();
cap_user_data_t data = new cap_user_data_t ();
header.version = linux_cap_version;
header.version = _LINUX_CAPABILITY_VERSION_1;
int ret = -1;
@@ -247,7 +246,7 @@ namespace System.Net.NetworkInformation {
s.SendBufferSize = bytes.Length;
s.SendTo (bytes, bytes.Length, SocketFlags.None, target);
DateTime sentTime = DateTime.Now;
var sw = Stopwatch.StartNew ();
// receive
bytes = new byte [100];
@@ -263,7 +262,7 @@ namespace System.Net.NetworkInformation {
}
throw new NotSupportedException (String.Format ("Unexpected socket error during ping request: {0}", error));
}
long rtt = (long) (DateTime.Now - sentTime).TotalMilliseconds;
long rtt = (long) sw.ElapsedMilliseconds;
int headerLength = (bytes [0] & 0xF) << 2;
int bodyLength = rc - headerLength;
@@ -295,7 +294,7 @@ namespace System.Net.NetworkInformation {
private PingReply SendUnprivileged (IPAddress address, int timeout, byte [] buffer, PingOptions options)
{
#if MONO_FEATURE_PROCESS_START
DateTime sentTime = DateTime.UtcNow;
var sw = Stopwatch.StartNew ();
Process ping = new Process ();
string args = BuildPingArgs (address, timeout, options);
@@ -319,7 +318,7 @@ namespace System.Net.NetworkInformation {
string stderr = ping.StandardError.ReadToEnd ();
#pragma warning restore 219
trip_time = (long) (DateTime.UtcNow - sentTime).TotalMilliseconds;
trip_time = (long) sw.ElapsedMilliseconds;
if (!ping.WaitForExit (timeout) || (ping.HasExited && ping.ExitCode == 2))
status = IPStatus.TimedOut;
else if (ping.ExitCode == 0)