[pull] master from robertdavidgraham:master

.github/workflows/unittests.yml

@@ -0,0 +1,27 @@
+name: masscan unit tests
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [master]
+
+permissions:
+  contents: read
+
+jobs:
+  regress:
+    name: Run regression tests
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest]
+    steps:
+      - name: Checkout masscan
+        uses: actions/checkout@v3
+      - name: Install libpcap-dev
+        if: ${{ vars.RUNNER_OS == 'Linux' }}
+        run: sudo apt-get install -y libpcap-dev
+      - name: Run regression tests
+        run: make test

.gitignore

@@ -1,3 +1,4 @@
 paused.conf
 .Makefile.swp
 .vscode
+vs10/.vs/

Makefile

@@ -1,3 +1,10 @@
+# If Windows, then assume the compiler is `gcc` for the
+# MinGW environment. I can't figure out how to tell if it's
+# actually MingGW. FIXME TODO
+ifeq ($(OS),Windows_NT)
+    CC = gcc
+endif
+
 # Try to figure out the default compiler. I dont know the best
 # way to do this with `gmake`. If you have better ideas, please
 # submit a pull request on github.
@@ -55,7 +62,7 @@ endif
 ifneq (, $(findstring mingw, $(SYS)))
 INCLUDES = -Ivs10/include
 LIBS = -L vs10/lib -lIPHLPAPI -lWs2_32
-FLAGS2 = -march=i686
+#FLAGS2 = -march=i686
 endif
 
 # Cygwin

README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/robertdavidgraham/masscan.svg?branch=master)](https://travis-ci.org/robertdavidgraham/masscan.svg)
+[![unittests](https://github.com/robertdavidgraham/masscan/actions/workflows/unittests.yml/badge.svg?branch=master)](https://github.com/robertdavidgraham/masscan/actions/workflows/unittests.yml/?branch=master)
 
 # MASSCAN: Mass IP port scanner
 
@@ -152,11 +152,11 @@ On FreeBSD and older MacOS, use an `ipfw` command:
 On newer MacOS and OpenBSD, use the `pf` packet-filter utility. 
 Edit the file `/etc/pf.conf` to add a line like the following:
 
-    block in proto tcp from any to any port 40000
+    block in proto tcp from any to any port 40000:40015
 
 Then to enable the firewall, run the command:
 
-    # pfctrl -E    
+    # pfctl -E    
 
 If the firewall is already running, then either reboot or reload the rules
 with the following command:
@@ -504,7 +504,7 @@ probably faster than you want anyway.
 A bounty is offered for vulnerabilities, see the VULNINFO.md file for more
 information.
 
-This project uses safe functions like `strcpy_s()` instead of unsafe functions
+This project uses safe functions like `safe_strcpy()` instead of unsafe functions
 like `strcpy()`.
 
 This project has automated unit regression tests (`make regress`).
@@ -545,7 +545,7 @@ network needs to be able to route IPv6 packets.
 ## PF_RING
 
 To get beyond 2 million packets/second, you need an Intel 10-gbps Ethernet
-adapter and a special driver known as ["PF_RING ZC" from ntop](http://www.ntop.org/products/packet-capture/pf_ring/pf_ring-zc-zero-copy/). Masscan doesn't need to be rebuilt in order to use PF_RING. To use PF_RING,
+adapter and a special driver known as ["PF_RING ZC" from ntop](https://www.ntop.org/installation-guide-for-pf_ring/). Masscan doesn't need to be rebuilt in order to use PF_RING. To use PF_RING,
 you need to build the following components:
 
   * `libpfring.so` (installed in /usr/lib/libpfring.so)
@@ -599,3 +599,19 @@ at which they perform this calculation, making `masscan` much faster.
 This tool created by Robert Graham:
 email: robert_david_graham@yahoo.com
 twitter: @ErrataRob
+
+# License
+
+Copyright (c) 2013 Robert David Graham
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published by
+the Free Software Foundation, version 3 of the License.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <https://www.gnu.org/licenses/>.

data/exclude.conf

@@ -77,7 +77,7 @@
 #organization scan our network at all.
 #
 #If you fail to do that we will block whole traffic from ASN 10439, and we
-#will fail a police report after that.
+#will file a police report after that.
 #
 #Let me know when you stop, since we still receive the attack from you, and
 #by the way your scan are not going anywhere, it's was dropped from our edge

doc/faq/FAQ0001-slow.md

@@ -21,9 +21,9 @@ The speed is determined by the operating system. The amount of CPU used by `mass
 itself is insignificant.
 
 My theory is various configuration options within the operating system that can make
-packet tranmission very slow. Simple features that would not otherwise impact network
+packet transmission very slow. Simple features that would not otherwise impact network
 stacks that run at lower rates become really important at high rates.
 
-One way around this is to install `PF_RING` and decidate a network adapter to packet
+One way around this is to install `PF_RING` and dedicate a network adapter to packet
 transmission completely bypassing the operating system. In that case, packet transmission
 rates can reach 15 million packets-per-second.

doc/faq/FAQ0002-drops.md

@@ -27,5 +27,5 @@ rates rather than overloading network equipment.
 
 # Issues
 
-- (#546 fast scan get result)[https://github.com/robertdavidgraham/masscan/issues/546]
+- [#546 fast scan get result](https://github.com/robertdavidgraham/masscan/issues/546)
 

doc/faq/README.md

@@ -5,5 +5,5 @@ questions
 
  - 1 - [Why is it not as fast as I expect?](FAQ0001-slow.md)
  - 2 - [Why are many results missing that I expect?](FAQ0002-drops.md)
- - 3 - [How can I add my IPs to an official exlude list, to get people to stop scanning me?](FAQ0003-excludelist.md)
+ - 3 - [How can I add my IPs to an official exclude list, to get people to stop scanning me?](FAQ0003-excludelist.md)
  - 4 - [Why is this in my server logs?](FAQ0004-serverlogs.md)