Made Gray default console foreground color for packet types

Killeroo · Killeroo · commit f6922b0e861e · 2017-11-11T18:01:24.000Z
Minor change to catch more errors in location lookup
Minor timing change in Ping.cs
Updated version to 1.2
Some repo re-organization
Updated index.md
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # PowerPing - Advanced Windows Ping 
 
-[![version](https://img.shields.io/badge/version-1.1.9-brightgreen.svg)]() ![maintained](https://img.shields.io/maintenance/yes/2017.svg) ![](http://img.badgesize.io/Killeroo/PowerPing/master/build/PowerPing.exe.svg)
+[![version](https://img.shields.io/badge/version-1.2.0-brightgreen.svg)]() ![maintained](https://img.shields.io/maintenance/yes/2017.svg) ![](http://img.badgesize.io/Killeroo/PowerPing/master/build/PowerPing.exe.svg)
 
 Small improved command line ICMP ping program lovingly inspired by windows and linux, written in C#.
 
diff --git a/build.sh b/build.sh
diff --git a/build/PowerPing.exe b/build/PowerPing.exe
diff --git a/docs/index.md b/docs/index.md
@@ -1,44 +1,68 @@
 # PowerPing - Advanced Windows Ping 
 
-[![version](https://img.shields.io/badge/version-1.1.8-green.svg)]() ![maintained](https://img.shields.io/maintenance/yes/2017.svg) ![](http://img.badgesize.io/Killeroo/PowerPing/master/build/PowerPing.exe.svg)
+[![version](https://img.shields.io/badge/version-1.2.0-brightgreen.svg)]() ![maintained](https://img.shields.io/maintenance/yes/2017.svg) ![](http://img.badgesize.io/Killeroo/PowerPing/master/build/PowerPing.exe.svg)
 
-Small improved command line ICMP ping program lovingly inspired by windows and unix, written in C#.
+Small improved command line ICMP ping program lovingly inspired by windows and linux, written in C#.
 
-Download it here: [[Current Build]](https://github.com/Killeroo/PowerPing/tree/master/build) [[Github]](https://github.com/Killeroo/PowerPing/releases) [[Softpedia]](http://www.softpedia.com/progDownload/PowerPing-Download-255701.html)
+Download it here: [[Current Build]](https://github.com/Killeroo/PowerPing/tree/master/build) [[Development Build]](https://github.com/Killeroo/PowerPing/blob/dev/build/PowerPing.exe) [[Github]](https://github.com/Killeroo/PowerPing/releases) [[Softpedia]](http://www.softpedia.com/progDownload/PowerPing-Download-255701.html)
 ***
-![](https://github.com/killeroo/PowerPing/Screenshots/readme_screenshot.png "PowerPing in action")
+![alt text](docs/screenshots/readme_screenshot.png "PowerPing in action")
+
+## Features
+
+PowerPing contains the following features (with more to come...):
+
+- [x] Basic ping functionality
+- [x] Coloured output
+- [x] Display options
+- [x] [packet customisation](https://en.wikipedia.org/wiki/Internet_Control_Message_Protocol#Control_messages)
+- [x] [scanning](https://en.wikipedia.org/wiki/Ping_sweep)
+- [x] [flooding](https://en.wikipedia.org/wiki/Ping_flood)
+- [x] [packet capture (listening)](docs/screenshots/readme_screenshot3.png)
+- [x] [location lookup](docs/screenshots/readme_screenshot4.png)
+- [x] [graphing](docs/screenshots/readme_screenshot2.png)
+- [ ] [traceroute](https://en.wikipedia.org/wiki/Traceroute)
+- [ ] [tunnelling](https://en.wikipedia.org/wiki/ICMP_tunnel)
+- [ ] [IPv6/icmpv6](https://en.wikipedia.org/wiki/Internet_Control_Message_Protocol_version_6)
 
 ## Usage: 
-     PowerPing [--?] | [--li] | [--whoami] | [--loc] | [--g] | [--cg] | [--fl] | 
+     PowerPing [--?] | [--li] | [--whoami] | [--loc] | [--g] | [--cg] | [--sc] | [--fl] | 
                [--t] [--c count] [--w timeout] [--m message] [--i TTL] [--in interval] 
-               [--pt type] [--pc code] [--dm] [--4] [--sh] [--nc] [--ti timing] target_name
+               [--pt type] [--pc code] [--dm] [--4] [--sh] [--nc] [--ts] [--ti timing] target_name
 
 ## Arguments:
-     --?             Displays this help message
-     --t             Ping the target until stopped (Control-C to stop)
-     --c count       Number of pings to send
-     --w timeout     Time to wait for reply (in milliseconds)
-     --m message     Ping packet message
-     --i ttl         Time To Live
-     --in interval   Interval between each ping (in milliseconds)
-     --pt type       Use custom ICMP type
-     --pc code       use custom ICMP code value
-     --dm            Display ICMP messages
-     --4             Force using IPv4
-     --sh            Show less detailed replies
-     --nc            No colour
-     --ti timing     Timing level:
-                     0 - Paranoid    4 - Nimble
-                     1 - Sneaky      5 - Speedy
-                     2 - Quiet       6 - Insane
-                     3 - Polite
+     Options:
+     --help       [--?]            Displays this help message
+     --examples   [--ex]           Shows example usage
+     --infinite   [--t]            Ping the target until stopped (Control-C to stop)
+     --displaymsg [--dm]           Display ICMP messages
+     --request    [--r]           Show request packets
+     --shorthand  [--sh]           Show less detailed replies
+     --nocolor    [--nc]           No colour
+     --noinput    [--ni]           Require no user input
+     --timestamp  [--ts]           Display timestamp
+     --decimals   [--dp]  number   Num of decimal places to use (0 to 3)
+     --count      [--c]   number   Number of pings to send
+     --timeout    [--w]   number   Time to wait for reply (in milliseconds)
+     --ttl        [--i]   number   Time To Live
+     --interval   [--in]  number   Interval between each ping (in milliseconds)
+     --type       [--pt]  number   Use custom ICMP type
+     --code       [--pc]  number   Use custom ICMP code value
+     --message    [--m]   message  Ping packet message
+     --timing     [--ti]  timing   Timing levels:
+                                         0 - Paranoid    4 - Nimble
+                                         1 - Sneaky      5 - Speedy
+                                         2 - Quiet       6 - Insane
+                                         3 - Polite
      
-     --li            Listen for ICMP packets
-     --fl            Send high volume of ICMP packets to address
-     --g             Graph view
-     --cg            Compact graph view
-     --loc           Location info for an address
-     --whoami        Location info for current host
+     Features:
+     --scan       [--sc]  address  Network scanning, specify range "127.0.0.1-55"
+     --listen     [--li]  address  Listen for ICMP packets
+     --flood      [--fl]  address  Send high volume of pings to address
+     --graph      [--g]   address  Graph view
+     --compact    [--cg]  address  Compact graph view
+     --location   [--loc] address  Location info for an address
+     --whoami                      Location info for current host
 
 ## Examples:
      powerping 8.8.8.8                    -     Send ping to google DNS with default values (3000ms timeout, 5 pings)
@@ -47,29 +71,118 @@ Download it here: [[Current Build]](https://github.com/Killeroo/PowerPing/tree/m
      powerping 127.0.0.1 --m Meow         -     Send ping with packet message "Meow" to loopback address
      powerping 127.0.0.1 --pt 3 --pc 2    -     Send ping with ICMP type 3 (dest unreachable) and code 2
      
-	 powerping 8.8.8.8 /c 5 -w 500 --sh   -     Different argument switches (/, - or --) can be used in any combination
-	 powerping google.com /ti Paranoid    -     Sends using the 'Paranoid' timing option
-	 powerping google.com /ti 1           -     Same as above
-     
+     powerping 8.8.8.8 /c 5 -w 500 --sh   -     Different argument switches (/, - or --) can be used in any combination
+     powerping google.com /ti Paranoid    -     Sends using the 'Paranoid' timing option
+     powerping google.com /ti 1           -     Same as above
+
+## Screenshots
+
+![alt text](docs/screenshots/readme_screenshot2.png "Powerping Graph view")
+![alt text](docs/screenshots/readme_screenshot3.png "Powerping Listening")
+![alt text](docs/screenshots/readme_screenshot4.png "Location functions") ![alt text](docs/screenshots/readme_screenshot5.png "PowerPing stress testing")
+
+## Contribution
+
+Feel free to [file issues or request features](https://github.com/Killeroo/PowerPing/issues) and submit [pull requests](https://github.com/Killeroo/PowerPing/pulls) – contributions are welcome.
+
+## License
+
+PowerPing is licensed under the [MIT license](LICENSE).
+
+### Note: 
+**Requires _Elevated Rights (Admininstrator)_ to Run**
+
+*Written by Matthew Carney [matthewcarney64@gmail.com] =^-^=*
+# PowerPing - Advanced Windows Ping 
+
+[![version](https://img.shields.io/badge/version-1.1.9-brightgreen.svg)]() ![maintained](https://img.shields.io/maintenance/yes/2017.svg) ![](http://img.badgesize.io/Killeroo/PowerPing/master/build/PowerPing.exe.svg)
+
+Small improved command line ICMP ping program lovingly inspired by windows and linux, written in C#.
+
+Download it here: [[Current Build]](https://github.com/Killeroo/PowerPing/tree/master/build) [[Development Build]](https://github.com/Killeroo/PowerPing/blob/dev/build/PowerPing.exe) [[Github]](https://github.com/Killeroo/PowerPing/releases) [[Softpedia]](http://www.softpedia.com/progDownload/PowerPing-Download-255701.html)
+***
+![alt text](docs/screenshots/readme_screenshot.png "PowerPing in action")
+
 ## Features
 
-- [x] Colour coded response times
-- [x] Displays type and code of each ICMP packets
-- [x] Capture all ICMP communications for a computer
-- [x] Customisable ping payloads
-- [x] Detailed graph and statistical views
-- [x] IP location querying and whoami 
-- [x] Send pings with custom types and size
-- [x] Ping flooding
-- [ ] Local network scanning and host discovery
-- [ ] Trace route functionality
-- [ ] Full IPv6 support
+PowerPing contains the following features (with more to come...):
+
+- [x] Basic ping functionality
+- [x] Coloured output
+- [x] Display options
+- [x] [packet customisation](https://en.wikipedia.org/wiki/Internet_Control_Message_Protocol#Control_messages)
+- [x] [scanning](https://en.wikipedia.org/wiki/Ping_sweep)
+- [x] [flooding](https://en.wikipedia.org/wiki/Ping_flood)
+- [x] [packet capture (listening)](docs/screenshots/readme_screenshot3.png)
+- [x] [location lookup](docs/screenshots/readme_screenshot4.png)
+- [x] [graphing](docs/screenshots/readme_screenshot2.png)
+- [ ] [traceroute](https://en.wikipedia.org/wiki/Traceroute)
+- [ ] [tunnelling](https://en.wikipedia.org/wiki/ICMP_tunnel)
+- [ ] [IPv6/icmpv6](https://en.wikipedia.org/wiki/Internet_Control_Message_Protocol_version_6)
+
+## Usage: 
+     PowerPing [--?] | [--li] | [--whoami] | [--loc] | [--g] | [--cg] | [--sc] | [--fl] | 
+               [--t] [--c count] [--w timeout] [--m message] [--i TTL] [--in interval] 
+               [--pt type] [--pc code] [--dm] [--4] [--sh] [--nc] [--ts] [--ti timing] target_name
+
+## Arguments:
+     Options:
+     --help       [--?]            Displays this help message
+     --examples   [--ex]           Shows example usage
+     --infinite   [--t]            Ping the target until stopped (Control-C to stop)
+     --displaymsg [--dm]           Display ICMP messages
+     --request    [--r]           Show request packets
+     --shorthand  [--sh]           Show less detailed replies
+     --nocolor    [--nc]           No colour
+     --noinput    [--ni]           Require no user input
+     --timestamp  [--ts]           Display timestamp
+     --decimals   [--dp]  number   Num of decimal places to use (0 to 3)
+     --count      [--c]   number   Number of pings to send
+     --timeout    [--w]   number   Time to wait for reply (in milliseconds)
+     --ttl        [--i]   number   Time To Live
+     --interval   [--in]  number   Interval between each ping (in milliseconds)
+     --type       [--pt]  number   Use custom ICMP type
+     --code       [--pc]  number   Use custom ICMP code value
+     --message    [--m]   message  Ping packet message
+     --timing     [--ti]  timing   Timing levels:
+                                         0 - Paranoid    4 - Nimble
+                                         1 - Sneaky      5 - Speedy
+                                         2 - Quiet       6 - Insane
+                                         3 - Polite
+     
+     Features:
+     --scan       [--sc]  address  Network scanning, specify range "127.0.0.1-55"
+     --listen     [--li]  address  Listen for ICMP packets
+     --flood      [--fl]  address  Send high volume of pings to address
+     --graph      [--g]   address  Graph view
+     --compact    [--cg]  address  Compact graph view
+     --location   [--loc] address  Location info for an address
+     --whoami                      Location info for current host
+
+## Examples:
+     powerping 8.8.8.8                    -     Send ping to google DNS with default values (3000ms timeout, 5 pings)
+     powerping github.com --w 500 --t     -     Send pings indefinitely to github.com with a 500ms timeout
+     
+     powerping 127.0.0.1 --m Meow         -     Send ping with packet message "Meow" to loopback address
+     powerping 127.0.0.1 --pt 3 --pc 2    -     Send ping with ICMP type 3 (dest unreachable) and code 2
+     
+     powerping 8.8.8.8 /c 5 -w 500 --sh   -     Different argument switches (/, - or --) can be used in any combination
+     powerping google.com /ti Paranoid    -     Sends using the 'Paranoid' timing option
+     powerping google.com /ti 1           -     Same as above
 
 ## Screenshots
 
-![](https://github.com/killeroo/PowerPing/Screenshots/readme_screenshot2.png "Powerping Graph view")
-![](https://github.com/killeroo/PowerPing/Screenshots/readme_screenshot3.png "Powerping Listening")
-![](https://github.com/killeroo/PowerPing/Screenshots/readme_screenshot4.png "Location functions") ![alt text](Screenshots/readme_screenshot5.png "PowerPing stress testing")
+![alt text](docs/screenshots/readme_screenshot2.png "Powerping Graph view")
+![alt text](docs/screenshots/readme_screenshot3.png "Powerping Listening")
+![alt text](docs/screenshots/readme_screenshot4.png "Location functions") ![alt text](docs/screenshots/readme_screenshot5.png "PowerPing stress testing")
+
+## Contribution
+
+Feel free to [file issues or request features](https://github.com/Killeroo/PowerPing/issues) and submit [pull requests](https://github.com/Killeroo/PowerPing/pulls) – contributions are welcome.
+
+## License
+
+PowerPing is licensed under the [MIT license](LICENSE).
 
 ### Note: 
 **Requires _Elevated Rights (Admininstrator)_ to Run**
diff --git a/src/PowerPing/Display.cs b/src/PowerPing/Display.cs
@@ -327,7 +327,7 @@ public static void RequestPacket(ICMP packet, String address, int index)
 
             // Print coloured type
             Console.BackgroundColor = packet.type > typeColors.Length ? ConsoleColor.Black : typeColors[packet.type];
-            Console.ForegroundColor = ConsoleColor.Black;
+            Console.ForegroundColor = ConsoleColor.Gray;
             switch (packet.type) // Display speific type code values
             {
                 case 3:
@@ -384,7 +384,7 @@ public static void ReplyPacket(ICMP packet, String address, int index, TimeSpan
 
             // Print coloured type
             Console.BackgroundColor = packet.type > typeColors.Length ? ConsoleColor.Black : typeColors[packet.type];
-            Console.ForegroundColor = ConsoleColor.Black;
+            Console.ForegroundColor = ConsoleColor.Gray;
             switch (packet.type) // Display speific type code values
             {
                 case 3:
diff --git a/src/PowerPing/Helper.cs b/src/PowerPing/Helper.cs
@@ -1,4 +1,5 @@
 ﻿using System;
+using System.Collections;
 using System.Xml;
 using System.Net;
 using System.Net.NetworkInformation;
@@ -54,12 +55,12 @@ public static string GetAddressLocation(string addr, bool detailed)
                     }
                 }
             }
-            catch (WebException)
+            catch (Exception)
             {
                 loc = "[Location unavaliable]";
                 Console.WriteLine("[Location unavaliable]");
             }
-
+            
             Console.WriteLine(loc);
 
             if (!Display.NoInput)
diff --git a/src/PowerPing/Ping.cs b/src/PowerPing/Ping.cs
@@ -367,7 +367,7 @@ private PingResults SendICMP(PingAttributes attrs)
 
                     // Send ping request
                     sock.SendTo(packet.GetBytes(), packetSize, SocketFlags.None, iep); // Packet size = message field + 4 header bytes
-                    responseTimer.Restart();
+                    responseTimer.Start();
                     Results.Sent++;
 
                     // Wait for response
diff --git a/src/PowerPing/build.sh b/src/PowerPing/build.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+if [ $# -lt 1 ]; then
+	echo "Not enough arguments: script [ dotnet OR mono ]";
+	exit;
+else
+	if [ $1 = "dotnet" ]; then
+		
+		dotnet restore "PowerPing.csproj"
+
+		dotnet build "PowerPing.csproj"
+
+		dotnet publish "PowerPing.csproj" -c Release -r win-x64
+		dotnet publish "PowerPing.csproj" -c Release -r win-x86
+		dotnet publish "PowerPing.csproj" -c Release -r osx.10.12-x64
+		dotnet publish "PowerPing.csproj" -c Release -r linux-x64
+		
+	elif [ $1 = "mono" ]; then
+	
+		# Unstable
+		
+		nuget restore ..\..\PowerPing.sln
+		
+		xbuild /p:Configuration=Release ..\..\PowerPing.sln
+	
+	fi
+fi
diff --git a/src/PowerPing/properties/AssemblyInfo.cs b/src/PowerPing/properties/AssemblyInfo.cs
@@ -17,4 +17,4 @@
 [assembly: ComVisible(false)]
 [assembly: Guid("4fa774f6-c5f6-4429-bf60-c3cfc61ec560")]
 
-[assembly: AssemblyVersion("1.1.9.5")]//*")]
+[assembly: AssemblyVersion("1.2.0.*")]

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using System;`
	`2`	`+using System.Collections;`
`2`	`3`	`using System.Xml;`
`3`	`4`	`using System.Net;`
`4`	`5`	`using System.Net.NetworkInformation;`
`@@ -54,12 +55,12 @@ public static string GetAddressLocation(string addr, bool detailed)`
`54`	`55`	`}`
`55`	`56`	`}`
`56`	`57`	`}`
`57`		`- catch (WebException)`
	`58`	`+ catch (Exception)`
`58`	`59`	`{`
`59`	`60`	`loc = "[Location unavaliable]";`
`60`	`61`	`Console.WriteLine("[Location unavaliable]");`
`61`	`62`	`}`
`62`		`-`
	`63`	`+`
`63`	`64`	`Console.WriteLine(loc);`
`64`	`65`
`65`	`66`	`if (!Display.NoInput)`