Remove/change some text to describe Npcap, not WinPcap

docs/nmap-install.xml

@@ -724,13 +724,13 @@ support was dropped when Microsoft removed raw TCP/IP socket support
 in Windows XP SP2.  Now Nmap must send lower-level ethernet frames
 instead.</para></listitem>
 
-<listitem><para>When using Nmap with WinPcap instead of Npcap, you cannot
+<listitem><para>When using Nmap without Npcap, you cannot
 generally scan your own machine from itself (using a
 loopback<indexterm><primary>loopback
 interface</primary></indexterm> IP such as 127.0.0.1 or any of its
 registered IP addresses).  This is a Windows limitation that we
 have worked around in Npcap, which is included in the Windows self-installer.
-Users stuck with WinPcap can use a TCP
+Users stuck without a Npcap installation can use a TCP
 connect scan without pinging (<option>-sT -Pn</option>) as that uses
 the high level socket API rather than sending raw
 packets.</para></listitem>

nmap.cc

@@ -1358,7 +1358,7 @@ void parse_options(int argc, char **argv) {
       break;
     case 'V':
 #ifdef WIN32
-      /* For pcap_get_version, since we need to get the correct Npcap/WinPcap
+      /* For pcap_get_version, since we need to get the correct Npcap
        * DLL loaded */
       win_init();
 #endif

nping/NpingOps.cc

@@ -2231,7 +2231,11 @@ void NpingOps::validateOptions() {
 const char *privreq = "root privileges";
 #ifdef WIN32
     //if (!this->have_pcap)
-        privreq = "that WinPcap version 3.1 or higher and iphlpapi.dll be installed. You seem to be missing one or both of these.  Winpcap is available from http://www.winpcap.org.  iphlpapi.dll comes with Win98 and later operating systems and NT 4.0 with SP4 or greater.  For previous Windows versions, you may be able to take iphlpapi.dll from another system and place it in your system32 dir (e.g. c:\\windows\\system32)";
+          privreq = "Npcap, but it seems to be missing.\n\
+Npcap is available from https://npcap.org. The Npcap driver service must\n\
+be started by an administrator before Npcap can be used. Running nping.exe\n\
+will open a UAC dialog where you can start the service if you have\n\
+administrator privileges.";
 #endif
 
 if (this->havePcap()==false){

output.cc

@@ -235,10 +235,10 @@ void win32_fatal_raw_sockets(const char *devname) {
   }
 }
 
-/* Display the mapping from libdnet interface names (like "eth0") to WinPcap
+/* Display the mapping from libdnet interface names (like "eth0") to Npcap
    interface names (like "\Device\NPF_{...}"). This is the same mapping used by
    eth_open and so can help diagnose connection problems.  Additionally display
-   WinPcap interface names that are not mapped to by any libdnet name, in other
+   Npcap interface names that are not mapped to by any libdnet name, in other
    words the names of interfaces Nmap has no way of using.*/
 static void print_iflist_pcap_mapping(const struct interface_info *iflist,
                                       int numifs) {

todo/nmap.txt

@@ -518,16 +518,6 @@ o [NSE] Consider whether we should include some sort of NSE debugger.  Or we
 
 o [NSE] Support routing http requests through proxies.
 
-o Consider offering a way to link Winpcap DLLs so that they start the
-  service as needed rather than requiring explicitly installing
-  Winpcap and having it start upon system boot.  CACE has offered such
-  a thing for many years as WinPcap Pro
-  (http://www.cacetech.com/products/winpcap_pro.html).  If we change
-  WinPcap in this way, we'd presumably want to also change the symbol
-  names as is done in WinPcap Pro.  And it would mean that we have to
-  build our Winpcap binaries ourselves (including 64-bit).  We might
-  even have to sign our drivers for 64-bit Windows.
-
 o [NSE] Would be great if NSE scripts could be made to NOT
   run as root if they don't have to.
 

todo/shinnok.txt

@@ -54,16 +54,6 @@ o E-mail nmap-dev with GProfiles /ncrack
 Potential:
 ==========
 
-o Consider offering a way to link Winpcap DLLs so that they start the
-  service as needed rather than requiring explicitly installing
-  Winpcap and having it start upon system boot.  CACE has offered such
-  a thing for many years as WinPcap Pro
-  (http://www.cacetech.com/products/winpcap_pro.html).  If we change
-  WinPcap in this way, we'd presumably want to also change the symbol
-  names as is done in WinPcap Pro.  And it would mean that we have to
-  build our Winpcap binaries ourselves (including 64-bit).  We might
-  even have to sign our drivers for 64-bit Windows.
-
 COMPLETED:
 ==========
 
@@ -147,8 +137,6 @@ o Investigate and document how easy it is to drop Ncat.exe by itself
     built using open source technology from portableapps.com, or look at
     "The Network Toolkit" by Cace
     (http://www.cacetech.com/products/network_toolkit.html).
-  o For Nmap and Nping, we may want to improve our Winpcap to load as a DLL
-    without requiring installation.  There is a separate TODO item for that.
 
 o --max-conns is broken in latest svn -> fixed in r24130, other two
   bugs discovered: