For Kaeros

Added debug statements
made macro TUI accessible
2026-11-07 09:46:04 -10:00 · 2020-09-17 19:12:24 +01:00 · 2020-09-16 18:46:52 +01:00 · 2020-09-15 21:56:31 +01:00 · 2020-09-15 18:34:47 +01:00 · 2020-09-15 18:22:10 +01:00
19 changed files with 1000 additions and 395 deletions
@@ -115,6 +115,84 @@
        "doc",
        "design"
      ]
+    },
+    {
+      "login": "Ferryistaken",
+      "name": "Alessandro Ferrari",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/47927670?v=4",
+      "profile": "https://github.com/Ferryistaken",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "Phenomite",
+      "name": "Phenomite",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/8285537?v=4",
+      "profile": "https://github.com/Phenomite",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "SuperSandro2000",
+      "name": "Sandro",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/7258858?v=4",
+      "profile": "https://supersandro.de/",
+      "contributions": [
+        "content",
+        "bug",
+        "code"
+      ]
+    },
+    {
+      "login": "caass",
+      "name": "Cass",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/25358963?v=4",
+      "profile": "https://swag.lgbt",
+      "contributions": [
+        "platform",
+        "code",
+        "bug"
+      ]
+    },
+    {
+      "login": "niklasmohrin",
+      "name": "Niklas Mohrin",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/47574893?v=4",
+      "profile": "https://github.com/niklasmohrin",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "tim77",
+      "name": "Artem Polishchuk",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/5614476?v=4",
+      "profile": "https://liberapay.com/Artem4/",
+      "contributions": [
+        "platform"
+      ]
+    },
+    {
+      "login": "buermarc",
+      "name": "buermarc",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/44375277?v=4",
+      "profile": "https://github.com/buermarc",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "bergabman",
+      "name": "bergabman",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/44554109?v=4",
+      "profile": "https://github.com/bergabman",
+      "contributions": [
+        "code",
+        "bug",
+        "design"
+      ]
    }
  ],
  "contributorsPerLine": 7,
@@ -0,0 +1,2 @@
+.git
+Dockerfile
@@ -1,4 +1,4 @@
-github: brandonskerritt
+github: bee-san
 patreon: brandonskerritt
 ko_fi: hacker
 custom: ["https://monzo.me/bee", "https://paypal.me/brandonskerritt"]
@@ -0,0 +1,4 @@
+template: |
+  ## What’s Changed
+
+  $CHANGES
@@ -0,0 +1,3 @@
+[submodule "src/rustscan_scripting_engine"]
+	path = src/rustscan_scripting_engine
+	url = https://github.com/RustScan/rustscan_scripting_engine
@@ -1,56 +1,37 @@
 language: rust
-
 os:
-  - linux
-  - osx
-  - windows
-
+- linux
+- osx
 arch:
-  - amd64
-  - arm64
-
+- amd64
+- arm64
 services:
-  - docker  
-
+- docker
 before_install:
 - rustup component add rustfmt
-
-# cargo test
 rust:
-  - stable
-  - beta
+- stable
+- beta
 jobs:
  fast_finish: true
-
-# Cargo fmt
 script:
 - cargo build
 - cargo test
 - cargo fmt -- --check
-
-# automatic deployment to cargo on release
-# deploy:
-
-#   provider: releases
-#   api_key: "GITHUB OAUTH TOKEN"
-#   file: "FILE TO UPLOAD"
-#   skip_cleanup: true
-#   on:
-#     tags: true
-
-# after_success:
-#   - wget https://raw.githubusercontent.com/DiscordHooks/travis-ci-discord-webhook/master/send.sh
-#   - chmod +x send.sh
-#   - ./send.sh success $WEBHOOK_URL
-
-        # only deploy on master branch
-        # on:
-                # branch: master
-        # provider: cargo
-        # token: $crates 
-
-
 after_failure:
-  - wget https://raw.githubusercontent.com/DiscordHooks/travis-ci-discord-webhook/master/send.sh
-  - chmod +x send.sh
-  - ./send.sh failure $WEBHOOK_URL
+- wget https://raw.githubusercontent.com/DiscordHooks/travis-ci-discord-webhook/master/send.sh
+- chmod +x send.sh
+- "./send.sh failure $WEBHOOK_URL"
+after_success: |
+  if [ -n "${GITHUB_TOKEN}" ]; then
+    [ "${TRAVIS_BRANCH} " = master ] &&
+    [ "${TRAVIS_PULL_REQUEST}" = false ] &&
+    cargo doc &&
+    echo "<meta http-equiv=refresh content=0;url=rustscan/index.html>" > target/doc/index.html &&
+    sudo pip install ghp-import &&
+    ghp-import -n target/doc &&
+    git push -fq https://${GITHUB_TOKEN}@github.com/${TRAVIS_REPO_SLUG}.git gh-pages
+  fi
+env:
+  global:
+    secure: Gf24LG7Hr3Q0drWyPrvISTL35Z57DxdS/wIOo7v+ZdauzY3Qjvv3Lh4TY//C4sdN0g1CLj4yjg7LQOqF4XRdh2Qah7JZPv/i2B5uz9nwjTsoRzmmMWML9VtfT1u53nSFqsNeXbvpmoNG9rfMXcoiyd+Lv+EgniHphDEBlXvS9n9KMcpOi1F2x7bsH0EK37wQYKMTpCCd5TPUPdZou7BJNiZS3ikRLpTRFF7uIN4gYtRH9kU5uBSphWgnJ6eBm2ItzZcUPOgrjAoF4RkmZAzGG4idDh1Qkf3No3nZwT3U5NSk8h7owtJ4oADlRgYqYKCB4YcC9cAKCJgDsyMlKKMkEyagvw1seFnBLCY3ljsW4EklpVEZ0rVqZOx4pTkIaxIxytLTC9pHmdDSnhdhFknOcVAQQWjg+nAZfD07QUeAqUdr0i/vxQoZitvbNY0znzEarycE1waKvwlkiB4gt385U1CBfYldydnOnRKkdtLNrCLClu13HU0djmSXMhojQJhTuNxTHtZAf5fKcWIWwkVbNZ5MNKYjQh4rKufqW3o1iHphB8dfAGsDEPv0RQMtVbu6H4+clCouLkFlxHOIrrOJ5SXQ8cIATPhnJR7y4cSDdRaN0DRLRjeLAIKlbOGBtNuFC+BftocaTY5qN42aKAMqQcT30ycfiLuRVJNiQJ5pkto=
@@ -14,22 +14,22 @@ appearance, race, religion, or sexual identity and orientation.
 Examples of behavior that contributes to creating a positive environment
 include:

-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
+- Using welcoming and inclusive language
+- Being respectful of differing viewpoints and experiences
+- Gracefully accepting constructive criticism
+- Focusing on what is best for the community
+- Showing empathy towards other community members

 Examples of unacceptable behavior by participants include:

-* The use of sexualized language or imagery and unwelcome sexual attention or
- advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic
- address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
- professional setting
+- The use of sexualized language or imagery and unwelcome sexual attention or
+  advances
+- Trolling, insulting/derogatory comments, and personal or political attacks
+- Public or private harassment
+- Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+- Other conduct which could reasonably be considered inappropriate in a
+  professional setting

 ## Our Responsibilities

@@ -55,7 +55,7 @@ further defined and clarified by project maintainers.
 ## Enforcement

 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at brandon@skerritt.blog. All
+reported by contacting the project team at our discord via a private message to any of the owners. All
 complaints will be reviewed and investigated and will result in a response that
 is deemed necessary and appropriate to the circumstances. The project team is
 obligated to maintain confidentiality with regard to the reporter of an incident.
@@ -67,10 +67,10 @@ members of the project's leadership.

 ## Attribution

-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+This Code of Conduct is adapted from the Contributor Covenant homepage, version 1.4,
 available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html

-[homepage]: https://www.contributor-covenant.org
+homepage: https://www.contributor-covenant.org

 For answers to common questions about this code of conduct, see
 https://www.contributor-covenant.org/faq
@@ -208,6 +208,19 @@ version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"

+[[package]]
+name = "cidr-utils"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89f7b6372f3c783f6d44c0da283d3694af4104967bf2371cb3bdc9d09e1cfe00"
+dependencies = [
+ "debug-helper",
+ "num-bigint",
+ "num-traits",
+ "once_cell",
+ "regex",
+]
+
 [[package]]
 name = "clap"
 version = "2.33.2"
@@ -266,6 +279,12 @@ dependencies = [
 "lazy_static",
 ]

+[[package]]
+name = "debug-helper"
+version = "0.3.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a8a5bb894f24f42c247f19b25928a88e31867c0f84552c05df41a9dd527435e"
+
 [[package]]
 name = "dirs"
 version = "3.0.1"
@@ -521,6 +540,36 @@ dependencies = [
 "fastrand",
 ]

+[[package]]
+name = "num-bigint"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b7f3fc75e3697059fb1bc465e3d8cca6cf92f56854f201158b3f9c77d5a3cfa0"
+dependencies = [
+ "autocfg",
+ "num-integer",
+ "num-traits",
+]
+
+[[package]]
+name = "num-integer"
+version = "0.1.43"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8d59457e662d541ba17869cf51cf177c0b5f0cbf476c66bdc90bf1edac4f875b"
+dependencies = [
+ "autocfg",
+ "num-traits",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac267bcc07f48ee5f8935ab0d24f316fb722d7a1292e2913f0cc196b29ffd611"
+dependencies = [
+ "autocfg",
+]
+
 [[package]]
 name = "num_cpus"
 version = "1.13.0"
@@ -759,10 +808,11 @@ dependencies = [

 [[package]]
 name = "rustscan"
-version = "1.7.1"
+version = "1.8.0"
 dependencies = [
 "ansi_term 0.12.1",
 "async-std",
+ "cidr-utils",
 "colored",
 "colorful",
 "dirs",
@@ -772,8 +822,11 @@ dependencies = [
 "log",
 "rand",
 "rlimit",
+ "serde",
+ "serde_derive",
 "shell-words",
 "structopt",
+ "toml",
 ]

 [[package]]
@@ -782,6 +835,23 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2"

+[[package]]
+name = "serde"
+version = "1.0.116"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96fe57af81d28386a513cbc6858332abc6117cfdb5999647c6444b8f43a370a5"
+
+[[package]]
+name = "serde_derive"
+version = "1.0.116"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f630a6370fd8e457873b4bd2ffdae75408bc291ba72be773772a4c2a065d9ae8"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "shell-words"
 version = "1.0.0"
@@ -814,9 +884,9 @@ checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"

 [[package]]
 name = "structopt"
-version = "0.3.16"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de5472fb24d7e80ae84a7801b7978f95a19ec32cb1876faea59ab711eb901976"
+checksum = "6cc388d94ffabf39b5ed5fadddc40147cb21e605f53db6f8f36a625d27489ac5"
 dependencies = [
 "clap",
 "lazy_static",
@@ -825,9 +895,9 @@ dependencies = [

 [[package]]
 name = "structopt-derive"
-version = "0.4.9"
+version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e0eb37335aeeebe51be42e2dc07f031163fbabfa6ac67d7ea68b5c2f68d5f99"
+checksum = "5e2513111825077552a6751dfad9e11ce0fba07d7276a3943a037d7e93e64c5f"
 dependencies = [
 "heck",
 "proc-macro-error",
@@ -874,6 +944,15 @@ dependencies = [
 "lazy_static",
 ]

+[[package]]
+name = "toml"
+version = "0.5.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffc92d160b1eef40665be3a05630d003936a3bc7da7421277846c2613e92c71a"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "unicode-segmentation"
 version = "1.6.0"
@@ -1,6 +1,6 @@
 [package]
 name = "rustscan"
-version = "1.7.1"
+version = "1.8.0"
 authors = ["Bee <[email protected]>"]
 edition = "2018"
 description = "Faster Nmap Scanning with Rust"
@@ -18,9 +18,10 @@ exclude = [

 [dependencies]
 colored = "2.0.0"
-structopt = "0.3.16"
+structopt = "0.3.17"
 async-std = "1.6.3"
 futures = "0.3"
+rlimit = "0.4.0"
 shell-words = "1.0.0"
 log = "0.4.0"
 env_logger = "0.7.1"
@@ -29,9 +30,10 @@ gcd = "2.0.1"
 rand = "0.7.3"
 colorful = "0.2.1"
 ansi_term = "0.12.1"
-
-[target."cfg(not(windows))".dependencies]
-rlimit = "0.4.0"
+toml = "0.5.6"
+serde = "1.0.116"
+serde_derive = "1.0.116"
+cidr-utils = "0.5.0"

 [package.metadata.deb]
 depends = "$auto, nmap"
@@ -1,22 +1,16 @@
 FROM rust:alpine as builder
-RUN apk update && \
-    apk add build-base && \
-    rm -rf /var/cache/apk/*
+RUN apk add --no-cache build-base

 WORKDIR /usr/src/rustscan
 COPY . .
 RUN cargo install --path .

-FROM alpine
+FROM alpine:3.12
 LABEL author="Hydragyrum <https://github.com/Hydragyrum>"
-RUN ulimit -n 100000 && \
-    apk update && \
-    apk add \
-    nmap nmap-scripts wget \
-    && \
-    rm -rf /var/cache/apk/*
-COPY --from=builder /usr/local/cargo/bin/rustscan /usr/local/bin/rustscan
 RUN addgroup -S rustscan && \
-    adduser -S -G rustscan rustscan
+    adduser -S -G rustscan rustscan && \
+    ulimit -n 100000 && \
+    apk add --no-cache nmap nmap-scripts wget
+COPY --from=builder /usr/local/cargo/bin/rustscan /usr/local/bin/rustscan
 USER rustscan
-ENTRYPOINT ["/usr/local/bin/rustscan"]
+ENTRYPOINT [ "/usr/local/bin/rustscan" ]
@@ -5,7 +5,7 @@
 <a href="https://github.com/RustScan/RustScan#-usage">Usage Guide</a>
 ⬅️
 <br>
-<img src="https://github.com/RustScan/RustScan/blob/master/pictures/rustscan.png?raw=true">
+<img src="pictures/rustscan.png" height=400px width=400px>
 </p>
 <p align="center">
 <u><b> Turns a 17 minutes Nmap scan into 19 seconds. </b></u><br> Find all open ports <b>fast</b> with RustScan, automatically pipe them into Nmap.
@@ -13,7 +13,7 @@
 <p align="center">
 <img alt="AUR version" src="https://img.shields.io/aur/version/rustscan">
 <img src="https://img.shields.io/badge/Built%20with-Rust-Purple">
-<img alt="GitHub commit activity" src="https://img.shields.io/github/commit-activity/w/brandonskerritt/rustscan">
+<img alt="GitHub commit activity" src="https://img.shields.io/github/commit-activity/w/Rustscan/Rustscan">
 <img alt="GitHub All Releases" src="https://img.shields.io/github/downloads/rustscan/rustscan/total?label=GitHub%20Downloads">
 <img alt="Crates.io" src="https://img.shields.io/crates/d/rustscan?label=Cargo%20Downloads">
 <img alt="Discord" src="https://img.shields.io/discord/736614461313515576">
@@ -21,14 +21,15 @@
 </p>
 <hr>

-| <p align="center"><a href="https://hub.docker.com/r/cmnatic/rustscan">🐋 Docker (Recommended) </a></p> | <p align="center"><a href="https://github.com/RustScan/RustScan/releases">👩‍💻 Kali / Debian </p> | <p align="center"><a href="https://aur.archlinux.org/packages/rustscan/">🏗️ Arch </a></p> | <p align="center"><a href="https://crates.io/crates/rustscan">🔧 Cargo (Universal) </a></p> |
-| ---- | ---- | ---- | --- |
-| <p align="center"><img src="https://github.com/RustScan/RustScan/blob/master/pictures/docker.png?raw=true" /></p> | <p align="center"><img src="https://github.com/RustScan/RustScan/blob/master/pictures/kali.png?raw=true" /></p> | <p align="center"><img src="https://github.com/RustScan/RustScan/blob/master/pictures/arch.png?raw=true" /></p> | <p align="center"><img src="https://github.com/RustScan/RustScan/blob/master/pictures/rust.png?raw=true" /></p>
-| `docker pull rustscan/rustscan:alpine` <p>[Usage](https://github.com/RustScan/RustScan#docker-whale) | [Read the install guide](https://github.com/brandonskerritt/RustScan/blob/master/README.md#%EF%B8%8F-debian--kali) | `yay -S rustscan` | `cargo install rustscan`
+| <p align="center"><a href="https://hub.docker.com/r/cmnatic/rustscan">🐋 Docker (Recommended) </a></p>            | <p align="center"><a href="https://github.com/RustScan/RustScan/releases">👩‍💻 Kali / Debian </p>                 | <p align="center"><a href="https://aur.archlinux.org/packages/rustscan/">🏗️ Arch </a></p>                       | <p align="center"><a href="https://crates.io/crates/rustscan">🔧 Cargo (Universal) </a></p>                     |
+| ----------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------- |
+| <p align="center"><img src="https://github.com/RustScan/RustScan/blob/master/pictures/docker.png?raw=true" /></p> | <p align="center"><img src="https://github.com/RustScan/RustScan/blob/master/pictures/kali.png?raw=true" /></p> | <p align="center"><img src="https://github.com/RustScan/RustScan/blob/master/pictures/arch.png?raw=true" /></p> | <p align="center"><img src="https://github.com/RustScan/RustScan/blob/master/pictures/rust.png?raw=true" /></p> |
+| `docker pull rustscan/rustscan:alpine` <p>[Usage](https://github.com/RustScan/RustScan#docker-whale)              | [Read the install guide](https://github.com/Rustscan/RustScan/blob/master/README.md#%EF%B8%8F-debian--kali)     | `yay -S rustscan`                                                                                               | `cargo install rustscan`                                                                                        |

 <hr>

 # 🤔 What is this?
+
 1. Find ports quickly using Rustscan (**3 seconds at its fastest**).
 2. Automatically runs `nmap` on those ports.
 3. ???
@@ -57,26 +58,29 @@
 RustScans **only** job is to reduce the friction between finding open ports and inputting them into nmap.

 # ✨ Features
-* Scans all 65k ports in **8 seconds** (on 10k batch size).
-* Saves you time by automatically piping it into Nmap. No more manual copying and pasting!
-* Does one thing and does it well. **Only** purpose is to improve Nmap, not replace it!
-* Let's you choose what Nmap commands to run, or uses the default.
-* IPv6 Support
+
+- Scans all 65k ports in **8 seconds** (on 10k batch size).
+- Saves you time by automatically piping it into Nmap. No more manual copying and pasting!
+- Does one thing and does it well. **Only** purpose is to improve Nmap, not replace it!
+- Let's you choose what Nmap commands to run, or uses the default.
+- IPv6 Support

 ## ‼️ Important Links

-| Installation Guide | Documentation | Discord |
-| ------------------ | ------------- | ------- |
-| 📖 [Installation Guide](https://github.com/RustScan/RustScan#-full-installation-guide) | 📚 [Documentation](https://github.com/RustScan/RustScan/issues/89) | 🦜 [Discord](https://discord.gg/GFrQsGy)
+| Installation Guide                                                                     | Documentation                                            | Discord                                  |
+| -------------------------------------------------------------------------------------- | -------------------------------------------------------- | ---------------------------------------- |
+| 📖 [Installation Guide](https://github.com/RustScan/RustScan#-full-installation-guide) | 📚 [Documentation](https://rustscan.github.io/RustScan/) | 🦜 [Discord](https://discord.gg/GFrQsGy) |

 ## 🙋 Table of Contents
-* 📖 [Installation Guide](https://github.com/RustScan/RustScan#-full-installation-guide)
-* 🐋 [Docker Usage](https://github.com/RustScan/RustScan#docker-whale)
-* 🦜 [Discord](https://discord.gg/GFrQsGy)
-* 🤸 [Usage](https://github.com/RustScan/RustScan#-usage)
-* 🎪 [Community](https://github.com/RustScan/RustScan#-community)
+
+- 📖 [Installation Guide](https://github.com/RustScan/RustScan#-full-installation-guide)
+- 🐋 [Docker Usage](https://github.com/RustScan/RustScan#docker-whale)
+- 🦜 [Discord](https://discord.gg/GFrQsGy)
+- 🤸 [Usage](https://github.com/RustScan/RustScan#-usage)
+- 🎪 [Community](https://github.com/RustScan/RustScan#-community)

 # 🔭 Why RustScan?
+
 Why spend time running fast scans and manually copying the ports, or waiting for a 20 minute scan to finish when you can just do all 65k ports in less than a minute?

 ![gif](https://github.com/RustScan/RustScan/blob/master/pictures/8seconds.gif?raw=true)
@@ -87,11 +91,12 @@ Why spend time running fast scans and manually copying the ports, or waiting for

 | **Name**                                                                                   | RustScan | Nmap | Masscan |
 | ------------------------------------------------------------------------------------------ | -------- | ---- | ------- |
-| Fast                                                                                       | ✅        | ❌    | ✅       |
-| Actually useful                                                                            | ❌        | ✅    | ❌       |
-| Realises it's not useful, and pipes the only useful data into the only useful port scanner | ✅        | ❌    | ❌       |
+| Fast                                                                                       | ✅       | ❌   | ✅      |
+| Actually useful                                                                            | ❌       | ✅   | ❌      |
+| Realises it's not useful, and pipes the only useful data into the only useful port scanner | ✅       | ❌   | ❌      |

 # 📖 Full Installation Guide
+
 **You need Nmap**. If you have Kali Linux or Parrot OS installed, you already have Nmap. If not, [follow the nmap install guide](https://nmap.org/download.html).

 The easiest way to install RustScan is to use one of the packages provided for your system, such as HomeBrew or Yay for Arch Linux.
@@ -106,37 +111,40 @@ Note: sometimes Rust doesn't add Cargo to the path. Please see [this issue](http

 Download the .deb file from the releases page:

-[https://github.com/brandonskerritt/RustScan/releases](https://github.com/brandonskerritt/RustScan/releases)
+[https://github.com/RustScan/RustScan/releases](https://github.com/RustScan/RustScan/releases)

-Run the commpand `dpkg -i` on the file.
+Run the command `dpkg -i` on the file.

 Note: sometimes you can double click the file to achieve the same result.

 ## Docker :whale:

 Docker is the recommended way of installing RustScan. This is because:
-* It has a high open file descriptor limit, which is one of the [main problems](https://github.com/RustScan/RustScan/issues/40) with RustScan. Now you don't have to fiddle around trying to understand your OS.
-* It works on all systems, regardless of OS. Even Windows, which we don't officially support.
-* The Docker image uses the latest build from Cargo, our main source-of-truth package. This means that you will always be using the latest version.
-* No need to install Rust, Cargo, or Nmap.
+
+- It has a high open file descriptor limit, which is one of the [main problems](https://github.com/RustScan/RustScan/issues/40) with RustScan. Now you don't have to fiddle around trying to understand your OS.
+- It works on all systems, regardless of OS. Even Windows, which we don't officially support.
+- The Docker image uses the latest build from Cargo, our main source-of-truth package. This means that you will always be using the latest version.
+- No need to install Rust, Cargo, or Nmap.

 To install Docker, [follow their guide](https://docs.docker.com/engine/install/).

 **Once Docker is installed, you can either build your own image using the `Dockerfile` (alpine) provided in the repo, or alternatively, use the published Docker image like below (most convenient)**

 Please see our [DockerHub](https://hub.docker.com/repository/docker/rustscan/rustscan) for further info, however, note that we have two Docker images:
+
 ```
 rustscan/rustscan:alpine

 rustscan/rustscan:latest
 ```
+
 We strongly recommend using the `alpine` tag, as this is the latest major - stable - release of RustScan. This READMDE uses the `alpine` image by default, however, note that the`latest` image is considered experimental.

 #### To get started:

 Simply run this command against the IP you want to target:

-```
+```bash
 docker run -it --rm --name rustscan rustscan/rustscan:alpine <rustscan arguments here> <ip address to scan>
 ```

@@ -146,30 +154,33 @@ Once done, you will no longer need to re-download the image (except when RustSca

 You will have to run this command every time, so we suggest aliasing it to something memorable.

-```
-alias rustscan='docker run -it --rm --name rustscan rustscan/rustscan:alpine <rustscan arguments here> <ip address to scan>'
+```bash
+alias rustscan='docker run -it --rm --name rustscan rustscan/rustscan:alpine'
 ```

 Then we can:

-```
+```bash
 rustscan 127.0.0.1 -t 500 -b 1500 -- -A
 ```

 #### To build your own image:

 Download the repo:
-```
+
+```bash
 git clone https://github.com/RustScan/RustScan.git
 ```

 Ensure you navigate to the download location of the repo:
-```
+
+```bash
 cd /path/to/download/RustScan
 ```

 Build away!
-```
+
+```bash
 docker build -t <yourimagename> .
 ```

@@ -179,13 +190,13 @@ docker build -t <yourimagename> .

 Tap the brew:

-```
+```bash
 brew tap brandonskerritt/rustscan
 ```

 Install it:

-```
+```bash
 brew install rustscan
 ```

@@ -198,38 +209,42 @@ brew install rustscan
 5. Symlink to the binary or something. Whatever you want!

 ## 🦊 Community Distributions
+
 Here are all of RustScan's community distributions.

 If you maintain a community distribution and want it listed here, leave an issue / pull request / Discord message or however you want to let us know.

-* [OpenSuse](https://software.opensuse.org/package/rustscan?search_term=rustscan)
+- [OpenSuse](https://software.opensuse.org/package/rustscan?search_term=rustscan)
+- [Fedora/CentOS](https://copr.fedorainfracloud.org/coprs/atim/rustscan/)

 [![Packaging status](https://repology.org/badge/vertical-allrepos/rustscan.svg)](https://repology.org/project/rustscan/versions)

 # 🤸 Usage

-```
-rustscan -h
-```
+```console
+$ rustscan -h

-```
-rustscan 1.7.1
 Fast Port Scanner built in Rust. WARNING Do not use this program against sensitive infrastructure since the specified
 server may not be able to handle this many socket connections at once. - Discord https://discord.gg/GFrQsGy - GitHub
 https://github.com/RustScan/RustScan

 USAGE:
-    rustscan [FLAGS] [OPTIONS] <ips>... [-- <command>...]
+    rustscan [FLAGS] [OPTIONS] [addresses]... [-- <command>...]

 FLAGS:
-    -h, --help       Prints help information
-    -q, --quiet      Quiet mode. Only output the ports. No Nmap. Useful for grep or outputting to a file
-    -V, --version    Prints version information
+        --accessible    Accessible mode. Turns off features which negatively affect screen readers
+    -h, --help          Prints help information
+    -n, --no-config     Whether to ignore the configuration file or not
+        --no-nmap       Turns off Nmap
+    -q, --quiet         Quiet mode. Only output the ports. No Nmap. Useful for grep or outputting to a file
+    -V, --version       Prints version information

 OPTIONS:
    -b, --batch-size <batch-size>    The batch size for port scanning, it increases or slows the speed of scanning.
                                     Depends on the open file limit of your OS.  If you do 65535 it will do every port
                                     at the same time. Although, your OS may not support this [default: 4500]
+    -p, --ports <ports>...           A list of comma separed ports to be scanned. Example: 80,443,8080
+    -r, --range <range>              A range of ports with format start-end. Example: 1-1000
        --scan-order <scan-order>    The order of scanning to be performed. The "serial" option will scan ports in
                                     ascending order while the "random" option will scan ports randomly [default:
                                     serial]  [possible values: Serial, Random]
@@ -237,19 +252,50 @@ OPTIONS:
    -u, --ulimit <ulimit>            Automatically ups the ULIMIT with the value you provided

 ARGS:
-    <ips>...        A list of comma separated IP addresses to be scanned
-    <command>...    The Nmap arguments to run. To use the argument -A, end RustScan's args with '-- -A'. Example:
-                    'rustscan -T 1500 127.0.0.1 -- -A -sC'. This command adds -Pn -vvv -p $PORTS automatically to
-                    nmap. For things like --script '(safe and vuln)' enclose it in quotations marks \"'(safe and
-                    vuln)'\"")
+    <addresses>...    A list of comma separated CIDRs, IPs, or hosts to be scanned
+    <command>...      The Nmap arguments to run. To use the argument -A, end RustScan's args with '-- -A'. Example:
+                      'rustscan -t 1500 127.0.0.1 -- -A -sC'. This command adds -Pn -vvv -p $PORTS automatically to
+                      nmap. For things like --script '(safe and vuln)' enclose it in quotations marks \"'(safe and
+                      vuln)'\"")
 ```

-The format is `rustscan -b 500 -T 1500 192.168.0.1` to scan 192.168.0.1 with 500 batch size with a timeout of 1500ms. The timeout is how long RustScan waits for a response until it assumes the port is closed.
+The format is `rustscan -b 500 -t 1500 192.168.0.1` to scan 192.168.0.1 with 500 batch size with a timeout of 1500ms. The timeout is how long RustScan waits for a response until it assumes the port is closed.

 The batch size determines how fast RustScan is. Set it to 65k, and it will scan all 65k ports at the same time. This means at at 65k batch size, RustScan will take TIMEOUT long to scan all ports. Essentially, if timeout is 1000ms, **RustScan can scan in 1 second**.

 Your operating system may not support this, but it is worth it to play around and see where your open file limit is. Shortly I will be releasing a dockerised version with a much larger open file limit, so this will be possible.

+## Configuration file
+
+This binary accepts a configuration file that is read from the home directory of the user. It follows the TOML format
+and accepts the following fields:
+
+- `addresses`
+- `ports`
+- `range`
+- `scan_order`
+- `command`
+- `accessible`
+- `quiet`
+- `batch-size`
+- `timeout`
+- `ulimit`
+
+### Format example
+
+```toml
+addresses = ["127.0.0.1", "192.168.0.0/30", "www.google.com"]
+command = ["-A"]
+ports = [80, 443, 8080]
+range = { start = 1, end = 10 }
+quiet = false
+accessible = true
+scan_order = "Serial"
+batch_size = 1000
+timeout = 1000
+ulimit = 1000
+```
+
 ## ⚠️ WARNING

 This program, by default, scans 5000 ports at a time (5000 per second).
@@ -257,16 +303,18 @@ This program, by default, scans 5000 ports at a time (5000 per second).
 This may cause damage to a server, or may make it incredibly obvious you are scanning the server.

 There are 2 ways to deal with this;
+
 1. Decrease batch size
-`rustscan -b 10` will run 10 port scans for 1 second, and then another 10 for 1 second and so on.
+   `rustscan -b 10` will run 10 port scans for 1 second, and then another 10 for 1 second and so on.
 2. Increase timeout
-`rustscan -T 5000` will mean RustScan waits 5 seconds until it scans the next ports.
+   `rustscan -T 5000` will mean RustScan waits 5 seconds until it scans the next ports.

 You can also use both of these at the same time, to make it as slow or as fast as you want. A fun favourite is 65535 batch size with 1 second timeout. Theoretically, this scans all 65535 ports in 1 second.

 **Please** do not use this tool against sensitive servers. It is designed mainly for Capture the Flag events, not real world servers with sensitive data.

 ## 🚨 Thread Panicked at Main: Too Many Open Files
+
 This is the most common error found in RustScan.

 The open file limit is how many open sockets you can have at any given time.
@@ -278,6 +326,7 @@ RustScan does not automatically create defaults (other than 5000) like Nmap does
 By figuring out for yourself the optimal batch size, you will know that RustScan is the most optimised port scanner for your system.

 There are 2 things you can do:
+
 1. Decrease batch size
 2. Increase open file limit

@@ -285,7 +334,7 @@ Decreasing batch size slows down the program, so as long as it isn't too drastic

 Run these 3 commands:

-```
+```bash
 ulimit -a
 ulimit -Hn
 ulimit -Sn
@@ -299,7 +348,7 @@ Increasing the open file limit increases speed, but poses danger. Although, **op

 To open more, set the ulimit to a higher number:

-```
+```bash
 ulimit -n 5000
 ```

@@ -316,9 +365,10 @@ Windows Subsystem for Linux does not support ulimit (see issue #39).
 The best way is to use it on a host computer, in Docker, or in a VM that isn't WSL.

 **Automatic Ulimit updating**
-We are currently working on automatic Ulimit updating. If it is too high, it will lower itself. If it is too low, it will suggest a higher Ulimit. Watch [this issue](https://github.com/brandonskerritt/RustScan/issues/25) for more.
+We are currently working on automatic Ulimit updating. If it is too high, it will lower itself. If it is too low, it will suggest a higher Ulimit. Watch [this issue](https://github.com/RustScan/RustScan/issues/25) for more.

 ## 🔌 Nmap Custom Flags
+
 To run your own nmap commands, end the RustScan command with `-- -A` where `--` indicates "end of RustScan flags, please do not parse anything further" and any flags after that will be entered into nmap.

 RustScan automatically runs `nmap -vvv -p $PORTS $IP`. To make it run `-A`, execute the command `rustscan 127.0.0.1 -- -A`.
@@ -326,13 +376,14 @@ RustScan automatically runs `nmap -vvv -p $PORTS $IP`. To make it run `-A`, exec
 If you want to run commands such as `--script (vuln and safe)`, you will need to enclose it in quotations like so `--script '"(vuln and safe) or default"'`.

 ## 🎯 Increasing speed / accuracy
-* Batch size
+
+- Batch size

 This increases speed, by allowing us to process more at once. Something experimental I am working on is changing the open file limit. You can do this manually with `ulimit -n 70000` and then running rustscan with `-b 65535`. This _should_ scan all 65535 ports at the exact same time. But this is extremely experimental.

 For non-experimental speed increases, slowly increase the batch size until it no longer gets open ports, or it breaks.

-* Accuracy (and some speed)
+- Accuracy (and some speed)

 To increase accuracy, the easiest way is to increase the timeout. The default is 1.5 seconds, by setting it to 4 seconds (4000) we are telling RustScan "if we do not hear back from a port in 4 seconds, assume it is closed".

@@ -349,19 +400,21 @@ Before contributing, read our [code of conduct](https://github.com/RustScan/Rust
 TL;DR if you abuse members of our community you will be **perma-banned** 🤗

 RustScan has 2 major labels for GitHub issues you should look at:
-* Good First issue
-These are issues for newcomers to open source!
-[https://github.com/RustScan/RustScan/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22](https://github.com/RustScan/RustScan/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22)
-* Help wanted
-These are issues that aren't really for newcomers, but we could still do wiht help!
-[https://github.com/RustScan/RustScan/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22+label%3A%22help+wanted%22](https://github.com/RustScan/RustScan/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22+label%3A%22help+wanted%22)
+
+- Good First issue
+  These are issues for newcomers to open source!
+  [https://github.com/RustScan/RustScan/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22](https://github.com/RustScan/RustScan/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22)
+- Help wanted
+  These are issues that aren't really for newcomers, but we could still do wiht help!
+  [https://github.com/RustScan/RustScan/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22+label%3A%22help+wanted%22](https://github.com/RustScan/RustScan/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22+label%3A%22help+wanted%22)

 If you want to, solve the issue or comment on the issue for help.

 The flow for contributing to open source software is:
-* Fork the repo
-* Make changes
-* Pull request to the repo
+
+- Fork the repo
+- Make changes
+- Pull request to the repo

 And then comment on the issue that you've done.

@@ -372,14 +425,15 @@ If you have any feature suggestions or bugs, leave a GitHub issue. We welcome an
 We communicate over Discord. [Click here](https://discord.gg/GFrQsGy) to join our Discord community!

 ## Rewarding you
-I cannot pay you :-( But, I can place your GitHub profile on the README under `#Contributors` as a thank you! :)

+I cannot pay you :-( But, I can place your GitHub profile on the README under `#Contributors` as a thank you! :)

 Please read the [contributing.md file](contributing.md)

 ## Contributors ✨
+
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-[![All Contributors](https://img.shields.io/badge/all_contributors-11-orange.svg?style=flat-square)](#contributors-)
+[![All Contributors](https://img.shields.io/badge/all_contributors-19-orange.svg?style=flat-square)](#contributors-)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->

 Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)):
@@ -402,6 +456,16 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
    <td align="center"><a href="https://tgotwig.me"><img src="https://avatars0.githubusercontent.com/u/30773779?v=4" width="100px;" alt=""/><br /><sub><b>Thomas Gotwig</b></sub></a><br /><a href="#platform-TGotwig" title="Packaging/porting to new platform">📦</a></td>
    <td align="center"><a href="https://github.com/remigourdon"><img src="https://avatars3.githubusercontent.com/u/2874133?v=4" width="100px;" alt=""/><br /><sub><b>Rémi Gourdon</b></sub></a><br /><a href="https://github.com/RustScan/RustScan/commits?author=remigourdon" title="Documentation">📖</a> <a href="https://github.com/RustScan/RustScan/commits?author=remigourdon" title="Code">💻</a></td>
    <td align="center"><a href="https://cmnatic.co.uk"><img src="https://avatars3.githubusercontent.com/u/4163116?v=4" width="100px;" alt=""/><br /><sub><b>Ben (CMNatic)</b></sub></a><br /><a href="https://github.com/RustScan/RustScan/commits?author=cmnatic" title="Code">💻</a> <a href="https://github.com/RustScan/RustScan/commits?author=cmnatic" title="Documentation">📖</a> <a href="#design-cmnatic" title="Design">🎨</a></td>
+    <td align="center"><a href="https://github.com/Ferryistaken"><img src="https://avatars3.githubusercontent.com/u/47927670?v=4" width="100px;" alt=""/><br /><sub><b>Alessandro Ferrari</b></sub></a><br /><a href="#content-Ferryistaken" title="Content">🖋</a></td>
+    <td align="center"><a href="https://github.com/Phenomite"><img src="https://avatars2.githubusercontent.com/u/8285537?v=4" width="100px;" alt=""/><br /><sub><b>Phenomite</b></sub></a><br /><a href="#content-Phenomite" title="Content">🖋</a></td>
+    <td align="center"><a href="https://supersandro.de/"><img src="https://avatars2.githubusercontent.com/u/7258858?v=4" width="100px;" alt=""/><br /><sub><b>Sandro</b></sub></a><br /><a href="#content-SuperSandro2000" title="Content">🖋</a> <a href="https://github.com/RustScan/RustScan/issues?q=author%3ASuperSandro2000" title="Bug reports">🐛</a> <a href="https://github.com/RustScan/RustScan/commits?author=SuperSandro2000" title="Code">💻</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://swag.lgbt"><img src="https://avatars2.githubusercontent.com/u/25358963?v=4" width="100px;" alt=""/><br /><sub><b>Cass</b></sub></a><br /><a href="#platform-caass" title="Packaging/porting to new platform">📦</a> <a href="https://github.com/RustScan/RustScan/commits?author=caass" title="Code">💻</a> <a href="https://github.com/RustScan/RustScan/issues?q=author%3Acaass" title="Bug reports">🐛</a></td>
+    <td align="center"><a href="https://github.com/niklasmohrin"><img src="https://avatars0.githubusercontent.com/u/47574893?v=4" width="100px;" alt=""/><br /><sub><b>Niklas Mohrin</b></sub></a><br /><a href="https://github.com/RustScan/RustScan/commits?author=niklasmohrin" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://liberapay.com/Artem4/"><img src="https://avatars0.githubusercontent.com/u/5614476?v=4" width="100px;" alt=""/><br /><sub><b>Artem Polishchuk</b></sub></a><br /><a href="#platform-tim77" title="Packaging/porting to new platform">📦</a></td>
+    <td align="center"><a href="https://github.com/buermarc"><img src="https://avatars2.githubusercontent.com/u/44375277?v=4" width="100px;" alt=""/><br /><sub><b>buermarc</b></sub></a><br /><a href="https://github.com/RustScan/RustScan/commits?author=buermarc" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/bergabman"><img src="https://avatars1.githubusercontent.com/u/44554109?v=4" width="100px;" alt=""/><br /><sub><b>bergabman</b></sub></a><br /><a href="https://github.com/RustScan/RustScan/commits?author=bergabman" title="Code">💻</a> <a href="https://github.com/RustScan/RustScan/issues?q=author%3Abergabman" title="Bug reports">🐛</a> <a href="#design-bergabman" title="Design">🎨</a></td>
  </tr>
 </table>

@@ -0,0 +1,391 @@
+use serde_derive::Deserialize;
+use std::fs;
+use structopt::{clap::arg_enum, StructOpt};
+
+
+const LOWEST_PORT_NUMBER: u16 = 1;
+const TOP_PORT_NUMBER: u16 = 65535;
+
+arg_enum! {
+    /// Represents the strategy in which the port scanning will run.
+    ///   - Serial will run from start to end, for example 1 to 1_000.
+    ///   - Random will randomize the order in which ports will be scanned.
+    #[derive(Deserialize, Debug, StructOpt, Clone, PartialEq)]
+    pub enum ScanOrder {
+        Serial,
+        Random,
+    }
+}
+
+/// Represents the range of ports to be scanned.
+#[derive(Deserialize, Debug, Clone, PartialEq)]
+pub struct PortRange {
+    pub start: u16,
+    pub end: u16,
+}
+
+fn parse_range(input: &str) -> Result<PortRange, String> {
+    let range = input
+        .split("-")
+        .map(|x| x.parse::<u16>())
+        .collect::<Result<Vec<u16>, std::num::ParseIntError>>();
+
+    if range.is_err() {
+        return Err(String::from(
+            "the range format must be 'start-end'. Example: 1-1000.",
+        ));
+    }
+
+    match range.unwrap().as_slice() {
+        [start, end] => Ok(PortRange {
+            start: *start,
+            end: *end,
+        }),
+        _ => Err(String::from(
+            "the range format must be 'start-end'. Example: 1-1000.",
+        )),
+    }
+}
+
+#[derive(StructOpt, Debug)]
+#[structopt(name = "rustscan", setting = structopt::clap::AppSettings::TrailingVarArg)]
+/// Fast Port Scanner built in Rust.
+/// WARNING Do not use this program against sensitive infrastructure since the
+/// specified server may not be able to handle this many socket connections at once.
+/// - Discord https://discord.gg/GFrQsGy
+/// - GitHub https://github.com/RustScan/RustScan
+pub struct Opts {
+    /// A list of comma separated CIDRs, IPs, or hosts to be scanned.
+    #[structopt(use_delimiter = true)]
+    pub addresses: Vec<String>,
+
+    /// A list of comma separed ports to be scanned. Example: 80,443,8080.
+    #[structopt(short, long, use_delimiter = true)]
+    pub ports: Option<Vec<u16>>,
+
+    /// A range of ports with format start-end. Example: 1-1000.
+    #[structopt(short, long, conflicts_with = "ports", parse(try_from_str = parse_range))]
+    pub range: Option<PortRange>,
+
+    /// Whether to ignore the configuration file or not.
+    #[structopt(short, long)]
+    pub no_config: bool,
+
+    /// greppable mode. Only output the ports. No Nmap. Useful for grep or outputting to a file.
+    #[structopt(short, long)]
+    pub greppable: bool,
+
+    /// Accessible mode. Turns off features which negatively affect screen readers.
+    #[structopt(long)]
+    pub accessible: bool,
+
+    /// Turns off Nmap.
+    #[structopt(long)]
+    pub no_nmap: bool,
+
+    /// The batch size for port scanning, it increases or slows the speed of
+    /// scanning. Depends on the open file limit of your OS.  If you do 65535
+    /// it will do every port at the same time. Although, your OS may not
+    /// support this.
+    #[structopt(short, long, default_value = "4500")]
+    pub batch_size: u16,
+
+    /// The timeout in milliseconds before a port is assumed to be closed.
+    #[structopt(short, long, default_value = "1500")]
+    pub timeout: u32,
+
+    /// Automatically ups the ULIMIT with the value you provided.
+    #[structopt(short, long)]
+    pub ulimit: Option<rlimit::rlim>,
+
+    /// The order of scanning to be performed. The "serial" option will
+    /// scan ports in ascending order while the "random" option will scan
+    /// ports randomly.
+    #[structopt(long, possible_values = &ScanOrder::variants(), case_insensitive = true, default_value = "serial")]
+    pub scan_order: ScanOrder,
+
+    /// The Nmap arguments to run.
+    /// To use the argument -A, end RustScan's args with '-- -A'.
+    /// Example: 'rustscan -T 1500 127.0.0.1 -- -A -sC'.
+    /// This command adds -Pn -vvv -p $PORTS automatically to nmap.
+    /// For things like --script '(safe and vuln)' enclose it in quotations marks \"'(safe and vuln)'\"")
+    #[structopt(last = true)]
+    pub command: Vec<String>,
+
+    /// Use the top 1000 ports.
+    #[structopt(long)]
+    pub top: bool,
+}
+
+impl Opts {
+    pub fn read() -> Self {
+        let mut opts = Opts::from_args();
+
+        if opts.ports.is_none() && opts.range.is_none() {
+            opts.range = Some(PortRange {
+                start: LOWEST_PORT_NUMBER,
+                end: TOP_PORT_NUMBER,
+            });
+        }
+
+        opts
+    }
+
+    /// Reads the command line arguments into an Opts struct and merge
+    /// values found within the user configuration file.
+    pub fn merge(&mut self, config: &Config) {
+        if !self.no_config {
+            self.merge_required(&config);
+            self.merge_optional(&config);
+        }
+    }
+
+    fn merge_required(&mut self, config: &Config) {
+        macro_rules! merge_required {
+            ($($field: ident),+) => {
+                $(
+                    if let Some(e) = &config.$field {
+                        self.$field = e.clone();
+                    }
+                )+
+            }
+        }
+
+        merge_required!(addresses, greppable, accessible, batch_size, timeout, scan_order, command);
+    }
+
+    fn merge_optional(&mut self, config: &Config) {
+        macro_rules! merge_optional {
+            ($($field: ident),+) => {
+                $(
+                    if config.$field.is_some() {
+                        self.$field = config.$field.clone();
+                    }
+                )+
+            }
+        }
+
+        // Only use top ports when the user asks for them
+        if self.top {
+            // self.ports = config.ports.clone().values().cloned().collect();
+        }
+
+        merge_optional!(range, ulimit);
+    }
+}
+
+/// Struct used to deserialize the options specified within our config file.
+/// These will be further merged with our command line arguments in order to
+/// generate the final Opts struct.
+#[derive(Debug, Deserialize)]
+pub struct Config {
+    addresses: Option<Vec<String>>,
+    ports: Option<Vec<u16>>,
+    range: Option<PortRange>,
+    greppable: Option<bool>,
+    accessible: Option<bool>,
+    batch_size: Option<u16>,
+    timeout: Option<u32>,
+    no_nmap: Option<bool>,
+    ulimit: Option<rlimit::rlim>,
+    scan_order: Option<ScanOrder>,
+    command: Option<Vec<String>>,
+}
+
+
+impl Config {
+    /// Reads the configuration file with TOML format and parses it into a
+    /// Config struct.
+    ///
+    /// # Format
+    ///
+    /// addresses = ["127.0.0.1", "127.0.0.1"]
+    /// ports = [80, 443, 8080]
+    /// greppable = true
+    /// scan_order: "Serial"
+    ///
+    pub fn read() -> Self {
+
+        let config_dir = dirs::home_dir();
+
+        // TODO make opt.accessible use opts
+        // right now its greppable=False, accessible=True
+        // I want it to use opts.accessible instead of accessible=True
+        crate::detail!(format!(
+            "{} {:?}",
+            "The config file is expected to be at", config_dir
+        ), false, true);
+
+        let mut paths = Vec::new();
+        paths.push(match config_dir {
+            Some(mut path) => {
+                path.push(".rustscan.toml");
+                path
+            }
+            None => panic!("Could not infer config file path."),
+        });
+
+        let mut contents: Option<String> = None;
+        for path in paths.iter().rev() {
+            println!{"path is {:?}", path};
+            contents = match fs::read_to_string(path) {
+                Ok(content) => {
+                    contents = Some(content);
+                    println!("contents is {:?}", contents);
+                    break;
+                }
+                Err(_) => None,
+            };
+            println!("contents is {:?}", contents);
+        }
+        // println!("{:?}", contents);
+
+        if contents.is_none() {
+            contents = Some(String::new());
+        }
+
+
+        let config: Config = match toml::from_str(&contents.unwrap()) {
+            Ok(config) => config,
+            Err(e) => {
+                println!("Found {} in configuration file.\nAborting scan.\n", e);
+                std::process::exit(1);
+            }
+        };
+
+        println!("\nconfig is {:?}", config);
+
+        config
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::{Config, Opts, PortRange, ScanOrder};
+
+    #[test]
+    fn opts_no_merge_when_config_is_ignored() {
+        let mut opts = Opts {
+            addresses: vec![],
+            ports: None,
+            range: None,
+            greppable: false,
+            batch_size: 0,
+            timeout: 0,
+            ulimit: None,
+            command: vec![],
+            accessible: false,
+            no_nmap: false,
+            scan_order: ScanOrder::Serial,
+            no_config: true,
+            top: false,
+        };
+
+        let config = Config {
+            addresses: Some(vec!["127.0.0.1".to_owned()]),
+            ports: None,
+            range: None,
+            greppable: Some(true),
+            batch_size: Some(25_000),
+            timeout: Some(1_000),
+            ulimit: None,
+            no_nmap: Some(false),
+            command: Some(vec!["-A".to_owned()]),
+            accessible: Some(true),
+            scan_order: Some(ScanOrder::Random),
+        };
+
+        opts.merge(&config);
+
+        assert_eq!(opts.addresses, vec![] as Vec<String>);
+        assert_eq!(opts.greppable, false);
+        assert_eq!(opts.accessible, false);
+        assert_eq!(opts.timeout, 0);
+        assert_eq!(opts.command, vec![] as Vec<String>);
+        assert_eq!(opts.scan_order, ScanOrder::Serial);
+    }
+
+    #[test]
+    fn opts_merge_required_arguments() {
+        let mut opts = Opts {
+            addresses: vec![],
+            ports: None,
+            range: None,
+            greppable: false,
+            batch_size: 0,
+            timeout: 0,
+            ulimit: None,
+            command: vec![],
+            accessible: false,
+            scan_order: ScanOrder::Serial,
+            no_nmap: false,
+            no_config: false,
+            top: false,
+        };
+
+        let config = Config {
+            addresses: Some(vec!["127.0.0.1".to_owned()]),
+            ports: None,
+            no_nmap: Some(false),
+            range: None,
+            greppable: Some(true),
+            batch_size: Some(25_000),
+            timeout: Some(1_000),
+            ulimit: None,
+            command: Some(vec!["-A".to_owned()]),
+            accessible: Some(true),
+            scan_order: Some(ScanOrder::Random),
+        };
+
+        opts.merge_required(&config);
+
+        assert_eq!(opts.addresses, config.addresses.unwrap());
+        assert_eq!(opts.greppable, config.greppable.unwrap());
+        assert_eq!(opts.timeout, config.timeout.unwrap());
+        assert_eq!(opts.command, config.command.unwrap());
+        assert_eq!(opts.accessible, config.accessible.unwrap());
+        assert_eq!(opts.scan_order, config.scan_order.unwrap());
+    }
+
+    #[test]
+    fn opts_merge_optional_arguments() {
+        let mut opts = Opts {
+            addresses: vec![],
+            ports: None,
+            range: None,
+            greppable: false,
+            batch_size: 0,
+            timeout: 0,
+            ulimit: None,
+            command: vec![],
+            accessible: false,
+            scan_order: ScanOrder::Serial,
+            no_nmap: false,
+            no_config: false,
+            top: false,
+        };
+
+        let config = Config {
+            addresses: None,
+            ports: Some(vec![80, 403]),
+            range: Some(PortRange {
+                start: 1,
+                end: 1_000,
+            }),
+            greppable: None,
+            batch_size: None,
+            timeout: None,
+            no_nmap: Some(false),
+            ulimit: Some(1_000),
+            command: None,
+            accessible: None,
+            scan_order: None,
+        };
+
+        opts.merge_optional(&config);
+
+        assert_eq!(opts.ports, config.ports);
+        assert_eq!(opts.range, config.range);
+        assert_eq!(opts.ulimit, config.ulimit);
+    }
+}
@@ -1,6 +1,9 @@
 extern crate shell_words;

-mod tui;
+pub mod tui;
+
+mod input;
+use input::{Config, Opts, PortRange, ScanOrder};

 mod scanner;
 use scanner::Scanner;
@@ -8,167 +11,59 @@ use scanner::Scanner;
 mod port_strategy;
 use port_strategy::PortStrategy;

+use cidr_utils::cidr::IpCidr;
 use colorful::Color;
 use colorful::Colorful;
 use futures::executor::block_on;
-
-#[cfg(not(target_os = "windows"))]
-use rlimit::{getrlimit, setrlimit, Resource};
-
+use rlimit::Resource;
+use rlimit::{getrlimit, setrlimit};
 use std::collections::HashMap;
-#[cfg(not(target_os = "windows"))]
-use std::convert::TryInto;
+use std::net::ToSocketAddrs;
 use std::process::Command;
-use std::str::FromStr;
-use std::{net::IpAddr, net::ToSocketAddrs, time::Duration};
-use structopt::{clap::arg_enum, StructOpt};
+use std::{net::IpAddr, time::Duration};

 extern crate colorful;
 extern crate dirs;

-const LOWEST_PORT_NUMBER: u16 = 1;
-const TOP_PORT_NUMBER: u16 = 65535;
 // Average value for Ubuntu
-const DEFAULT_FILE_DESCRIPTORS_LIMIT: u32 = 8000;
+const DEFAULT_FILE_DESCRIPTORS_LIMIT: rlimit::rlim = 8000;
 // Safest batch size based on experimentation
-const AVERAGE_BATCH_SIZE: u32 = 3000;
+const AVERAGE_BATCH_SIZE: rlimit::rlim = 3000;

 #[macro_use]
 extern crate log;

-arg_enum! {
-    #[derive(Debug, StructOpt)]
-    pub enum ScanOrder {
-        Serial,
-        Random,
-    }
-}
-
-#[derive(Debug)]
-pub struct PortRange {
-    start: u16,
-    end: u16,
-}
-
-fn parse_range(input: &str) -> Result<PortRange, String> {
-    let range = input
-        .split("-")
-        .map(|x| x.parse::<u16>())
-        .collect::<Result<Vec<u16>, std::num::ParseIntError>>();
-
-    if range.is_err() {
-        return Err(String::from(
-            "the range format must be 'start-end'. Example: 1-1000.",
-        ));
-    }
-
-    match range.unwrap().as_slice() {
-        [start, end] => Ok(PortRange {
-            start: *start,
-            end: *end,
-        }),
-        _ => Err(String::from(
-            "the range format must be 'start-end'. Example: 1-1000.",
-        )),
-    }
-}
-
-#[derive(StructOpt, Debug)]
-#[structopt(name = "rustscan", setting = structopt::clap::AppSettings::TrailingVarArg)]
-/// Fast Port Scanner built in Rust.
-/// WARNING Do not use this program against sensitive infrastructure since the
-/// specified server may not be able to handle this many socket connections at once.
-/// - Discord https://discord.gg/GFrQsGy
-/// - GitHub https://github.com/RustScan/RustScan
-struct Opts {
-    /// A list of comma separated IP addresses or hosts to be scanned.
-    #[structopt(use_delimiter = true, required = true)]
-    ips_or_hosts: Vec<String>,
-
-    /// A list of comma separed ports to be scanned. Example: 80,443,8080.
-    #[structopt(short, long, use_delimiter = true)]
-    ports: Option<Vec<u16>>,
-
-    /// A range of ports with format start-end. Example: 1-1000.
-    #[structopt(short, long, conflicts_with = "ports", parse(try_from_str = parse_range))]
-    range: Option<PortRange>,
-
-    ///Quiet mode. Only output the ports. No Nmap. Useful for grep or outputting to a file.
-    #[structopt(short, long)]
-    quiet: bool,
-
-    //Accessible mode. Turns off features which negatively affect screen readers.
-    #[structopt(short, long)]
-    accessible: bool,
-
-    /// The batch size for port scanning, it increases or slows the speed of
-    /// scanning. Depends on the open file limit of your OS.  If you do 65535
-    /// it will do every port at the same time. Although, your OS may not
-    /// support this.
-    #[structopt(short, long, default_value = "4500")]
-    batch_size: u16,
-
-    /// The timeout in milliseconds before a port is assumed to be closed.
-    #[structopt(short, long, default_value = "1500")]
-    timeout: u32,
-
-    /// Automatically ups the ULIMIT with the value you provided.
-    #[structopt(short, long)]
-    ulimit: Option<u32>,
-
-    /// The order of scanning to be performed. The "serial" option will
-    /// scan ports in ascending order while the "random" option will scan
-    /// ports randomly.
-    #[structopt(long, possible_values = &ScanOrder::variants(), case_insensitive = true, default_value = "serial")]
-    scan_order: ScanOrder,
-
-    /// The Nmap arguments to run.
-    /// To use the argument -A, end RustScan's args with '-- -A'.
-    /// Example: 'rustscan -T 1500 127.0.0.1 -- -A -sC'.
-    /// This command adds -Pn -vvv -p $PORTS automatically to nmap.
-    /// For things like --script '(safe and vuln)' enclose it in quotations marks \"'(safe and vuln)'\"")
-    #[structopt(last = true)]
-    command: Vec<String>,
-}
-
 #[cfg(not(tarpaulin_include))]
 /// Faster Nmap scanning with Rust
 /// If you're looking for the actual scanning, check out the module Scanner
 fn main() {
    env_logger::init();

-    info!("Starting up");
-    let mut opts = Opts::from_args();
+    let mut opts: Opts = Opts::read();
+    let config = Config::read();
+    opts.merge(&config);

-    if opts.ports.is_none() && opts.range.is_none() {
-        opts.range = Some(PortRange {
-            start: LOWEST_PORT_NUMBER,
-            end: TOP_PORT_NUMBER,
-        });
-    }
+    info!("Main() `opts` arguments are {:?}", opts);

-    info!("Mains() `opts` arguments are {:?}", opts);
-
-    if !opts.quiet && !opts.accessible {
+    if !opts.greppable && !opts.accessible {
        print_opening();
    }

-    let ips: Vec<IpAddr> = parse_ips(&opts);
+    let ips: Vec<IpAddr> = parse_addresses(&opts);

    if ips.is_empty() {
-        warning!("No IPs could be resolved, aborting scan.", false);
+        warning!("No IPs could be resolved, aborting scan.", false, opts.accessible);
        std::process::exit(1);
    }

-    let ulimit: u32 = adjust_ulimit_size(&opts);
-
+    let ulimit: rlimit::rlim = adjust_ulimit_size(&opts);
    let batch_size: u16 = infer_batch_size(&opts, ulimit);

    let scanner = Scanner::new(
        &ips,
        batch_size,
        Duration::from_millis(opts.timeout.into()),
-        opts.quiet,
+        opts.greppable,
        PortStrategy::pick(opts.range, opts.ports, opts.scan_order),
    );

@@ -192,25 +87,25 @@ fn main() {

        let x = format!("{} Looks like I didn't find any open ports for {:?}. This is usually caused by a high batch size.
        \n*I used {} batch size, consider lowering to {} with {} or a comfortable number for your system.
-        \n Alternatively, increase the timeout if your ping is high. Rustscan -t 2000 for 2000 second timeout.\n",
+        \n Alternatively, increase the timeout if your ping is high. Rustscan -t 2000 for 2000 milliseconds (2s) timeout.\n",
        "ERROR",
        ip,
        opts.batch_size,
        (opts.batch_size / 2).to_string(),
        "'rustscan -b <batch_size> <ip address>'");
-        warning!(x, opts.quiet);
+        warning!(x, opts.greppable, opts.accessible);
    }

    for (ip, ports) in ports_per_ip.iter_mut() {
        let nmap_str_ports: Vec<String> = ports.into_iter().map(|port| port.to_string()).collect();

-        detail!("Starting Nmap", opts.quiet);
+        detail!("Starting Nmap", opts.greppable, opts.accessible);

        // nmap port style is 80,443. Comma separated with no spaces.
        let ports_str = nmap_str_ports.join(",");

-        // if quiet mode is on nmap should not be spawned
-        if opts.quiet {
+        // if greppable mode is on nmap should not be spawned
+        if opts.greppable {
            println!("{}", ports_str);
            continue;
        }
@@ -223,7 +118,7 @@ fn main() {
        output!(format!(
            "The Nmap command to be run is nmap {}\n",
            &nmap_args.join(" ")
-        ));
+        ), false, opts.accessible);

        // Runs the nmap command and spawns it as a process.
        let mut child = Command::new("nmap")
@@ -251,19 +146,7 @@ Faster Nmap scanning with Rust."#;
    println!("{}", info.gradient(Color::Yellow).bold());
    funny_opening!();

-    let config_path = match dirs::config_dir() {
-        Some(mut path) => {
-            path.push("rustscan");
-            path.push("config.toml");
-            path
-        }
-        None => panic!("Couldn't find config dir."),
-    };

-    detail!(format!(
-        "{} {:?}",
-        "The config file is expected to be at", config_path
-    ));
 }
 #[cfg(not(tarpaulin_include))]
 fn build_nmap_arguments<'a>(
@@ -286,17 +169,17 @@ fn build_nmap_arguments<'a>(
    arguments
 }

-fn parse_ips(opts: &Opts) -> Vec<IpAddr> {
+fn parse_addresses(opts: &Opts) -> Vec<IpAddr> {
    let mut ips: Vec<IpAddr> = Vec::new();

-    for ip_or_host in &opts.ips_or_hosts {
-        match IpAddr::from_str(ip_or_host) {
-            Ok(ip) => ips.push(ip),
+    for ip_or_host in &opts.addresses {
+        match IpCidr::from_str(ip_or_host) {
+            Ok(cidr) => cidr.iter().for_each(|ip| ips.push(ip)),
            _ => match format!("{}:{}", &ip_or_host, 80).to_socket_addrs() {
                Ok(mut iter) => ips.push(iter.nth(0).unwrap().ip()),
                _ => {
                    let failed_to_resolve = format!("Host {:?} could not be resolved.", ip_or_host);
-                    warning!(failed_to_resolve, opts.quiet);
+                    warning!(failed_to_resolve, opts.greppable, opts.accessible);
                }
            },
        }
@@ -305,16 +188,15 @@ fn parse_ips(opts: &Opts) -> Vec<IpAddr> {
    ips
 }

-#[cfg(not(target_os = "windows"))]
-fn adjust_ulimit_size(opts: &Opts) -> u32 {
+fn adjust_ulimit_size(opts: &Opts) -> rlimit::rlim {
    if opts.ulimit.is_some() {
-        let limit: rlimit::rlim = opts.ulimit.unwrap().into();
+        let limit: rlimit::rlim = opts.ulimit.unwrap();

        match setrlimit(Resource::NOFILE, limit, limit) {
            Ok(_) => {
                detail!(
                    format!("Automatically increasing ulimit value to {}.", limit),
-                    opts.quiet
+                    opts.greppable, opts.accessible
                );
            }
            Err(_) => println!("{}", "ERROR. Failed to set ulimit value."),
@@ -323,23 +205,16 @@ fn adjust_ulimit_size(opts: &Opts) -> u32 {

    let (rlim, _) = getrlimit(Resource::NOFILE).unwrap();

-    rlim.try_into().unwrap()
+    rlim
 }

-// Rlimit does not support Windows
-// set to 1000 if Windows is used
-#[cfg(target_os = "windows")]
-fn adjust_ulimit_size(_opts: &Opts) -> u32 {
-    1000
-}
-
-fn infer_batch_size(opts: &Opts, ulimit: u32) -> u16 {
-    let mut batch_size: u32 = opts.batch_size.into();
+fn infer_batch_size(opts: &Opts, ulimit: rlimit::rlim) -> u16 {
+    let mut batch_size: rlimit::rlim = opts.batch_size.into();

    // Adjust the batch size when the ulimit value is lower than the desired batch size
-    if ulimit < batch_size && !(cfg!(windows)) {
-        warning!("File limit is lower than default batch size. Consider upping with --ulimt. May cause harm to sensitive servers",
-            opts.quiet
+    if ulimit < batch_size {
+        warning!("File limit is lower than default batch size. Consider upping with --ulimit. May cause harm to sensitive servers",
+            opts.greppable, opts.accessible
        );

        // When the OS supports high file limits like 8000, but the user
@@ -349,11 +224,7 @@ fn infer_batch_size(opts: &Opts, ulimit: u32) -> u16 {
            // ulimit is smaller than aveage batch size
            // user must have very small ulimit
            // decrease batch size to half of ulimit
-            if !(cfg!(windows)) {
-                warning!("Your file limit is very small, which negatively impacts RustScan's speed. Use the Docker image, or up the Ulimit with '--ulimit 5000'. ");
-            } else {
-                warning!("Windows is known to be much slower than scanning on Unix systems. Use the Docker image if you need faster speeds.");
-            }
+            warning!("Your file limit is very small, which negatively impacts RustScan's speed. Use the Docker image, or up the Ulimit with '--ulimit 5000'. ", false, opts.accessible);
            info!("Halving batch_size because ulimit is smaller than average batch size");
            batch_size = ulimit / 2
        } else if ulimit > DEFAULT_FILE_DESCRIPTORS_LIMIT {
@@ -369,7 +240,7 @@ fn infer_batch_size(opts: &Opts, ulimit: u32) -> u16 {
        detail!(format!(
                "File limit higher than batch size. Can increase speed by increasing batch size '-b {}'.",
                ulimit - 100
-            ), opts.quiet);
+            ), opts.greppable, opts.accessible);
    }

    batch_size as u16
@@ -377,83 +248,94 @@ fn infer_batch_size(opts: &Opts, ulimit: u32) -> u16 {

 #[cfg(test)]
 mod tests {
-    use crate::{adjust_ulimit_size, infer_batch_size, parse_ips, print_opening, Opts, ScanOrder};
+    use crate::{
+        adjust_ulimit_size, infer_batch_size, parse_addresses, print_opening, Opts, ScanOrder,
+    };
+    use std::net::Ipv4Addr;

-    #[cfg(not(target_os = "windows"))]
    #[test]
    fn batch_size_lowered() {
        let opts = Opts {
-            ips_or_hosts: vec!["127.0.0.1".to_owned()],
+            addresses: vec!["127.0.0.1".to_owned()],
            ports: None,
            range: None,
-            quiet: true,
+            greppable: true,
            batch_size: 50_000,
            timeout: 1_000,
            ulimit: Some(2_000),
            command: Vec::new(),
            accessible: false,
            scan_order: ScanOrder::Serial,
+            no_config: false,
+            no_nmap: false,
+            top: false,
        };
        let batch_size = infer_batch_size(&opts, 120);

        assert!(batch_size < 50_000);
    }

-    #[cfg(not(target_os = "windows"))]
    #[test]
    fn batch_size_lowered_average_size() {
        let opts = Opts {
-            ips_or_hosts: vec!["127.0.0.1".to_owned()],
+            addresses: vec!["127.0.0.1".to_owned()],
            ports: None,
            range: None,
-            quiet: true,
+            greppable: true,
            batch_size: 50_000,
            timeout: 1_000,
            ulimit: Some(2_000),
            command: Vec::new(),
            accessible: false,
            scan_order: ScanOrder::Serial,
+            no_config: false,
+            no_nmap: false,
+            top: false,
        };
        let batch_size = infer_batch_size(&opts, 9_000);

        assert!(batch_size == 3_000);
    }
-    #[cfg(not(target_os = "windows"))]
    #[test]
    fn batch_size_equals_ulimit_lowered() {
        // because ulimit and batch size are same size, batch size is lowered
        // to ULIMIT - 100
        let opts = Opts {
-            ips_or_hosts: vec!["127.0.0.1".to_owned()],
+            addresses: vec!["127.0.0.1".to_owned()],
            ports: None,
            range: None,
-            quiet: true,
+            greppable: true,
            batch_size: 50_000,
            timeout: 1_000,
            ulimit: Some(2_000),
            command: Vec::new(),
            accessible: false,
            scan_order: ScanOrder::Serial,
+            no_config: false,
+            no_nmap: false,
+            top: false,
        };
        let batch_size = infer_batch_size(&opts, 5_000);

        assert!(batch_size == 4_900);
    }
-    #[cfg(not(target_os = "windows"))]
    #[test]
    fn batch_size_adjusted_2000() {
        // ulimit == batch_size
        let opts = Opts {
-            ips_or_hosts: vec!["127.0.0.1".to_owned()],
+            addresses: vec!["127.0.0.1".to_owned()],
            ports: None,
            range: None,
-            quiet: true,
+            greppable: true,
            batch_size: 50_000,
            timeout: 1_000,
            ulimit: Some(2_000),
            command: Vec::new(),
            accessible: false,
            scan_order: ScanOrder::Serial,
+            no_config: false,
+            no_nmap: false,
+            top: false,
        };
        let batch_size = adjust_ulimit_size(&opts);

@@ -466,18 +348,21 @@ mod tests {
        assert!(1 == 1);
    }
    #[test]
-    fn test_high_ulimit_no_quiet_mode() {
+    fn test_high_ulimit_no_greppable_mode() {
        let opts = Opts {
-            ips_or_hosts: vec!["127.0.0.1".to_owned()],
+            addresses: vec!["127.0.0.1".to_owned()],
            ports: None,
            range: None,
-            quiet: false,
+            greppable: false,
            batch_size: 10,
            timeout: 1_000,
            ulimit: None,
            command: Vec::new(),
            accessible: true,
            scan_order: ScanOrder::Serial,
+            no_config: false,
+            no_nmap: false,
+            top: false,
        };

        infer_batch_size(&opts, 1_000_000);
@@ -486,59 +371,99 @@ mod tests {
    }

    #[test]
-    fn parse_correct_ips_or_hosts() {
+    fn parse_correct_addresses() {
        let opts = Opts {
-            ips_or_hosts: vec!["127.0.0.1".to_owned(), "google.com".to_owned()],
+            addresses: vec!["127.0.0.1".to_owned(), "192.168.0.0/30".to_owned()],
            ports: None,
            range: None,
-            quiet: true,
+            greppable: true,
            batch_size: 10,
            timeout: 1_000,
            ulimit: Some(2_000),
            command: Vec::new(),
            accessible: false,
            scan_order: ScanOrder::Serial,
+            no_config: false,
+            no_nmap: false,
+            top: false,
        };
-        let ips = parse_ips(&opts);
+        let ips = parse_addresses(&opts);

-        assert_eq!(2, ips.len());
+        assert_eq!(
+            ips,
+            [
+                Ipv4Addr::new(127, 0, 0, 1),
+                Ipv4Addr::new(192, 168, 0, 0),
+                Ipv4Addr::new(192, 168, 0, 1),
+                Ipv4Addr::new(192, 168, 0, 2),
+                Ipv4Addr::new(192, 168, 0, 3)
+            ]
+        );
    }

    #[test]
-    fn parse_correct_and_incorrect_ips_or_hosts() {
+    fn parse_correct_host_addresses() {
        let opts = Opts {
-            ips_or_hosts: vec!["127.0.0.1".to_owned(), "im_wrong".to_owned()],
+            addresses: vec!["google.com".to_owned()],
            ports: None,
            range: None,
-            quiet: true,
+            greppable: true,
            batch_size: 10,
            timeout: 1_000,
            ulimit: Some(2_000),
            command: Vec::new(),
            accessible: false,
            scan_order: ScanOrder::Serial,
+            no_config: false,
+            no_nmap: false,
+            top: false,
        };
-        let ips = parse_ips(&opts);
+        let ips = parse_addresses(&opts);

-        assert_eq!(1, ips.len());
+        assert_eq!(ips.len(), 1);
    }

    #[test]
-    fn parse_incorrect_ips_or_hosts() {
+    fn parse_correct_and_incorrect_addresses() {
        let opts = Opts {
-            ips_or_hosts: vec!["im_wrong".to_owned(), "300.10.1.1".to_owned()],
+            addresses: vec!["127.0.0.1".to_owned(), "im_wrong".to_owned()],
            ports: None,
            range: None,
-            quiet: true,
+            greppable: true,
            batch_size: 10,
            timeout: 1_000,
            ulimit: Some(2_000),
            command: Vec::new(),
            accessible: false,
            scan_order: ScanOrder::Serial,
+            no_config: false,
+            no_nmap: false,
+            top: false,
        };
-        let ips = parse_ips(&opts);
+        let ips = parse_addresses(&opts);

-        assert_eq!(0, ips.len());
+        assert_eq!(ips, [Ipv4Addr::new(127, 0, 0, 1),]);
+    }
+
+    #[test]
+    fn parse_incorrect_addresses() {
+        let opts = Opts {
+            addresses: vec!["im_wrong".to_owned(), "300.10.1.1".to_owned()],
+            ports: None,
+            range: None,
+            greppable: true,
+            batch_size: 10,
+            timeout: 1_000,
+            ulimit: Some(2_000),
+            command: Vec::new(),
+            accessible: false,
+            scan_order: ScanOrder::Serial,
+            no_config: false,
+            no_nmap: false,
+            top: false,
+        };
+        let ips = parse_addresses(&opts);
+
+        assert_eq!(ips.is_empty(), true);
    }
 }
@@ -1,14 +1,17 @@
 use super::PortStrategy;

+mod socket_iterator;
+use socket_iterator::SocketIterator;
+
 use async_std::io;
 use async_std::net::TcpStream;
 use async_std::prelude::*;
 use colored::*;
 use futures::stream::FuturesUnordered;
-use std::time::Duration;
 use std::{
    io::ErrorKind,
    net::{IpAddr, Shutdown, SocketAddr},
+    time::Duration,
 };

 /// The class for the scanner
@@ -48,29 +51,23 @@ impl Scanner {
    /// Returns all open ports as Vec<u16>
    pub async fn run(&self) -> Vec<SocketAddr> {
        let ports: Vec<u16> = self.port_strategy.order();
-        let batch_per_ip: usize = self.batch_size as usize / self.ips.len();
+        let mut socket_iterator: SocketIterator = SocketIterator::new(&self.ips, &ports);
        let mut open_sockets: Vec<SocketAddr> = Vec::new();
-
-        for batch in ports.chunks(batch_per_ip) {
-            let mut sockets = self.scan_ports(batch).await;
-            open_sockets.append(&mut sockets);
-        }
-
-        open_sockets
-    }
-
-    /// Given a slice of sockets, scan them all.
-    /// Returns a vector of open sockets.
-    async fn scan_ports(&self, ports: &[u16]) -> Vec<SocketAddr> {
        let mut ftrs = FuturesUnordered::new();
-        for port in ports {
-            for ip in &self.ips {
-                ftrs.push(self.scan_socket(SocketAddr::new(*ip, *port)));
+
+        for _ in 0..self.batch_size {
+            if let Some(socket) = socket_iterator.next() {
+                ftrs.push(self.scan_socket(socket));
+            } else {
+                break;
            }
        }

-        let mut open_sockets: Vec<SocketAddr> = Vec::new();
        while let Some(result) = ftrs.next().await {
+            if let Some(socket) = socket_iterator.next() {
+                ftrs.push(self.scan_socket(socket));
+            }
+
            match result {
                Ok(socket) => open_sockets.push(socket),
                _ => {}
@@ -95,7 +92,6 @@ impl Scanner {
    async fn scan_socket(&self, socket: SocketAddr) -> io::Result<SocketAddr> {
        match self.connect(socket).await {
            Ok(x) => {
-                // match stream_result.shutdown(Shutdown::Both)
                info!("Shutting down stream");
                match x.shutdown(Shutdown::Both) {
                    _ => {}
@@ -0,0 +1,83 @@
+use std::net::{IpAddr, SocketAddr};
+
+pub struct SocketIterator<'s> {
+    ips: &'s [IpAddr],
+    ports: &'s [u16],
+    ip_idx: usize,
+    ip_len: usize,
+    port_idx: usize,
+    port_len: usize,
+}
+
+/// An iterator that receives a slice of IPs and ports and returns a Socket
+/// for each IP and port pair until all of these combinations are exhausted.
+/// The goal of this iterator is to go over every IP and port combination
+/// wihout generating a big memory footprint. The alternative would be
+/// generating a vector containing all these combinations.
+impl<'s> SocketIterator<'s> {
+    pub fn new(ips: &'s [IpAddr], ports: &'s [u16]) -> Self {
+        Self {
+            ip_idx: 0,
+            ip_len: ips.len(),
+            port_idx: 0,
+            port_len: ports.len(),
+            ips,
+            ports,
+        }
+    }
+}
+
+impl<'s> Iterator for SocketIterator<'s> {
+    type Item = SocketAddr;
+
+    /// Returns a socket based on the combination of one of the provided
+    /// IPs and ports or None when these combinations are exhausted. Every
+    /// IP will have the same port until a port is incremented.
+    ///
+    /// let it = SocketIterator::new(&["127.0.0.1", "192.168.0.1"], &[80, 443]);
+    /// it.next(); // 127.0.0.1:80
+    /// it.next(); // 192.168.0.1:80
+    /// it.next(); // 127.0.0.1:443
+    /// it.next(); // 192.168.0.1:443
+    /// it.next(); // None
+    fn next(&mut self) -> Option<Self::Item> {
+        if self.port_idx == self.port_len {
+            return None;
+        }
+
+        self.ip_idx = self.ip_idx % self.ip_len;
+
+        let socket = SocketAddr::new(self.ips[self.ip_idx], self.ports[self.port_idx]);
+        self.ip_idx += 1;
+
+        if self.ip_idx == self.ip_len {
+            self.port_idx += 1;
+        }
+
+        Some(socket)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::SocketIterator;
+    use std::net::{IpAddr, SocketAddr};
+
+    #[test]
+    fn goes_through_every_ip_port_combination() {
+        let addrs = vec![
+            "127.0.0.1".parse::<IpAddr>().unwrap(),
+            "192.168.0.1".parse::<IpAddr>().unwrap(),
+        ];
+        let ports: Vec<u16> = vec![22, 80, 443];
+        let mut it = SocketIterator::new(&addrs, &ports);
+
+        assert_eq!(Some(SocketAddr::new(addrs[0], ports[0])), it.next());
+        assert_eq!(Some(SocketAddr::new(addrs[1], ports[0])), it.next());
+        assert_eq!(Some(SocketAddr::new(addrs[0], ports[1])), it.next());
+        assert_eq!(Some(SocketAddr::new(addrs[1], ports[1])), it.next());
+        assert_eq!(Some(SocketAddr::new(addrs[0], ports[2])), it.next());
+        assert_eq!(Some(SocketAddr::new(addrs[1], ports[2])), it.next());
+        assert_eq!(None, it.next());
+    }
+}
@@ -3,44 +3,46 @@

 #[macro_export]
 macro_rules! warning {
-    ($name:expr) => {
+    ($name:expr, $greppable:expr, $accessible:expr) => {
        use ansi_term::Colour::Red;
-        println!("{} {}", Red.bold().paint("[!]"), $name);
-    };
-    // quiet mode
-    ($name:expr, $quiet:expr) => {
-        use ansi_term::Colour::Red;
-        if !$quiet {
+        // if greppable, no else statement so do not print.
+        if !$greppable {
            println!("{} {}", Red.bold().paint("[!]"), $name);
        }
+        else if !$accessible{
+            // Don't print the ascii art
+            println!("{}", $name);
+        }
    };
 }

 #[macro_export]
 macro_rules! detail {
-    ($name:expr) => {
+    ($name:expr, $greppable:expr, $accessible:expr) => {
        use ansi_term::Colour::Blue;
-        println!("{} {}", Blue.bold().paint("[~]"), $name);
-    };
-    ($name:expr, $quiet:expr) => {
-        use ansi_term::Colour::Blue;
-        if !$quiet {
+        // if greppable, no else statement so do not print.
+        if !$greppable {
            println!("{} {}", Blue.bold().paint("[~]"), $name);
        }
+        else if !$accessible{
+            // Don't print the ascii art
+            println!("{}", $name);
+        }
    };
 }

 #[macro_export]
 macro_rules! output {
-    ($name:expr, $quiet:expr) => {
+    ($name:expr, $greppable:expr, $accessible:expr) => {
        use ansi_term::Colour::RGB;
-        if !$quiet {
+        // if greppable, no else statement so do not print.
+        if !$greppable {
            println!("{} {}", RGB(0, 255, 9).bold().paint("[>]"), $name);
        }
-    };
-    ($name:expr) => {
-        use ansi_term::Colour::RGB;
-        println!("{} {}", RGB(0, 255, 9).bold().paint("[>]"), $name);
+        else if !$accessible{
+            // Don't print the ascii art
+            println!("{}", $name);
+        }
    };
 }

@@ -50,15 +52,15 @@ macro_rules! funny_opening {
    () => {
        use rand::seq::SliceRandom;
        let quotes = vec![
-            "Nmap? More like slowmap.🐢",
+            "Hello, Elliot.",
            "🌍HACK THE PLANET🌍",
            "Real hackers hack time ⌛",
            "Please contribute more quotes to our GitHub https://github.com/rustscan/rustscan",
            "😵 https://admin.tryhackme.com",
+            "Mess with the best, die like the rest",
        ];
        let random_quote = quotes.choose(&mut rand::thread_rng()).unwrap();

        println!("{}\n", random_quote);
-        // println!("{} {}", RGB(0, 255, 9).bold().paint("[>]"), $name);
    };
 }
Author	SHA1	Message	Date
Brandon	fa072bac12	For Kaeros	2020-09-17 19:12:24 +01:00
Brandon	ff5a4b44f8	Added debug statements	2020-09-16 18:46:52 +01:00
Brandon	3763c384ca	made macro TUI accessible	2020-09-15 21:56:31 +01:00
Brandon	7b85b9756b	Changed quiet mode to greppable	2020-09-15 18:34:47 +01:00
Brandon	d23b4f1ccf	removed unused code	2020-09-15 18:22:10 +01:00
Brandon	a185d0fb26	Merge branch 'master' into bee-add-top-ports	2020-09-15 02:46:31 +01:00
Brandon	64624e90b3	merging	2020-09-15 02:46:29 +01:00
Bee	4dfe76737b	Merge pull request #216 from RustScan/dependabot/cargo/serde_derive-1.0.116 Bump serde_derive from 1.0.115 to 1.0.116	2020-09-14 14:01:52 +01:00
Bee	cc0b344232	Merge branch 'master' into dependabot/cargo/serde_derive-1.0.116	2020-09-14 13:58:43 +01:00
Bee	abaf100da9	Merge pull request #217 from RustScan/bee-fix-debug-output fixed debug log	2020-09-14 13:58:29 +01:00
Bee	43602793e0	Merge branch 'master' into bee-fix-debug-output	2020-09-14 12:23:28 +01:00
Brandon	7b827991c1	cargo fmt	2020-09-14 12:23:09 +01:00
Brandon	f4555ecb98	fixed debug log	2020-09-14 12:20:48 +01:00
dependabot-preview[bot]	2fb8a399a7	Bump serde_derive from 1.0.115 to 1.0.116 Bumps [serde_derive](https://github.com/serde-rs/serde) from 1.0.115 to 1.0.116. - [Release notes](https://github.com/serde-rs/serde/releases) - [Commits](https://github.com/serde-rs/serde/compare/v1.0.115...v1.0.116) Signed-off-by: dependabot-preview[bot] <[email protected]>	2020-09-14 11:05:24 +00:00
Bee	e612ddc4e6	Merge pull request #215 from RustScan/dependabot/cargo/serde-1.0.116 Bump serde from 1.0.115 to 1.0.116	2020-09-14 12:04:08 +01:00
dependabot-preview[bot]	8bf75846d3	Bump serde from 1.0.115 to 1.0.116 Bumps [serde](https://github.com/serde-rs/serde) from 1.0.115 to 1.0.116. - [Release notes](https://github.com/serde-rs/serde/releases) - [Commits](https://github.com/serde-rs/serde/compare/v1.0.115...v1.0.116) Signed-off-by: dependabot-preview[bot] <[email protected]>	2020-09-14 06:57:46 +00:00
Bee	bf1cb3a5d0	Merge pull request #208 from RustScan/ba-socket-iterator Introduce SocketIterator	2020-09-13 00:22:49 +01:00
Bernardo Chaves	01975d7238	Introduce SocketIterator The goal of this iterator is to generate sockets based on combinations of IPs and ports in a memory-bounded way, we only consume the next item of this iterator when a socket has been processed by our scanner. Before this change we were generating every combination of IP and port and storing it in a VecDeque, and while this is fine for a small subset of IPs and ports it can quickly get out of hand with multiple IPs and a big port range.	2020-09-12 12:24:30 -04:00
Bee	8c4cc77e6b	Merge pull request #206 from bergabman/master Bugfixes	2020-09-11 23:35:23 +01:00
bergabman	b0c1ab3177	Logic at adding targets to the FuturesUnordered rolled back to the initial. In case of batchsize higher than all sockets to scan, we could end up in an infinite loop. Fixed with breaking out of the loop if that's the case.	2020-09-11 19:21:21 +02:00
Bee	6812cc3051	Merge pull request #205 from Martin005/patch-1 Fix incorrect timeout option in README	2020-09-11 13:00:50 +01:00
Martin Chrástek	2800adec34	Fix incorrect timeout option	2020-09-11 13:22:11 +02:00
Bee	cf1aa67a21	Merge pull request #204 from RustScan/all-contributors/add-bergabman docs: add bergabman as a contributor	2020-09-11 01:16:28 +01:00
Bee	c9708671e8	Merge branch 'master' into all-contributors/add-bergabman	2020-09-11 01:13:27 +01:00
Bee	461f9aaa6d	Merge pull request #203 from bergabman/master Small improvement in the scanning engine.	2020-09-11 01:12:51 +01:00
allcontributors[bot]	01a74b72df	docs: update .all-contributorsrc [skip ci]	2020-09-11 00:01:53 +00:00
allcontributors[bot]	d301cf3b20	docs: update README.md [skip ci]	2020-09-11 00:01:52 +00:00
Bee	5e8d45bf01	Merge branch 'master' into master	2020-09-11 01:00:47 +01:00
Brandon	bc5b2eea7e	added release drafter	2020-09-11 00:59:55 +01:00
bergabman	c8a8915682	Remove unnecessary comment. Fix mistake at adding futures to the initial stream.	2020-09-11 01:48:35 +02:00
bergabman	d786e24186	Fix format.	2020-09-11 00:48:23 +02:00
Bee	5b536621e6	Merge branch 'master' into master	2020-09-10 23:45:46 +01:00
bergabman	c05f40ae70	Small improvement at an if.	2020-09-10 23:29:07 +02:00
bergabman	24b9f8d8d3	Improved scanner engine to work more efficient and consistent with scanning.	2020-09-10 23:27:28 +02:00
Brandon	774213cc15	Fixed tests	2020-09-10 01:48:49 +01:00
Brandon	58906b7f7e	added top ports	2020-09-10 01:36:40 +01:00
Bee	bda392c9a7	Merge pull request #200 from RustScan/ba-add-cidr-support Add CIDR support	2020-09-10 00:46:19 +01:00
Bernardo Chaves	3836480486	Add CIDR support Add CIDR support for ips_or_hosts argument. This will allow our users to specify multiple IPs within a network at once which is pretty convenient.	2020-09-09 19:21:43 -04:00
Bee	2291ba73d2	Update FUNDING.yml	2020-09-07 23:00:14 +01:00
Bee	e0af8a306a	Merge pull request #198 from RustScan/all-contributors/add-buermarc docs: add buermarc as a contributor	2020-09-07 22:22:52 +01:00
Bee	cb0f4f7a92	Merge branch 'master' into all-contributors/add-buermarc	2020-09-07 22:17:59 +01:00
Bee	402bea4b06	Merge pull request #195 from buermarc/master Check '.config/rustscan/config.toml' for config	2020-09-07 22:15:47 +01:00
allcontributors[bot]	f44dda0360	docs: update .all-contributorsrc [skip ci]	2020-09-07 21:15:35 +00:00
allcontributors[bot]	965a173032	docs: update README.md [skip ci]	2020-09-07 21:15:34 +00:00
Bee	d95cae6677	Merge branch 'master' into master	2020-09-07 21:41:27 +01:00
Bee	2f92d5583a	Merge pull request #197 from RustScan/ba-no-nmap-option Introduce the -no-nmap option	2020-09-07 21:41:09 +01:00
Bee	8d8da79640	Merge branch 'master' into ba-no-nmap-option	2020-09-07 21:29:23 +01:00
Bee	e5b4a2f443	Merge branch 'master' into master	2020-09-07 21:23:18 +01:00
Bernardo Araujo	a0b877729e	Merge pull request #194 from usrGabriel/patch-1 Update README.md	2020-09-07 11:20:25 -04:00
Bernardo Chaves	743fa1cad6	Introduce the -no-nmap option As the name implies this will allow RustScan to to run the scan without starting an nmap scan with ports that are found.	2020-09-06 22:22:17 -04:00
mulc	a0561d4728	Check '.config/rustscan/config.toml' for config When reading the config file '$CONFIG_DIR/.config/rustscan/config.toml' should also be checked. If both '~/.rustscan.toml' and '$CONFIG_DIR/.config/rustscan/config.toml' exist, then later will be used.	2020-09-05 18:32:08 +02:00
Gabriel	b2a1bd2e7a	Update README.md Typo fix in the Debian / Kali install section.	2020-09-05 12:23:18 -04:00
Brandon	87de96c3c4	Merge pull request #185 from RustScan/ba-add-config-file Add configuration file	2020-08-30 14:00:07 +01:00
Bernardo Chaves	8e21f3bf8c	Add configuration file This configuration file will be read from the home directory of the user. Options set within this file will have priority over arguments from the command line unless the `--no-config` option is passed to the program.	2020-08-29 18:01:44 -04:00
Brandon	4019d1ff3a	Merge pull request #182 from RustScan/all-contributors/add-tim77 docs: add tim77 as a contributor	2020-08-29 12:15:07 +01:00
Brandon	c004bd0527	Merge pull request #181 from tim77/tim77-patch-1 Add Fedora/CentOS installation instructions	2020-08-29 11:53:44 +01:00
allcontributors[bot]	cdc5bbd924	docs: update .all-contributorsrc [skip ci]	2020-08-29 10:53:35 +00:00
allcontributors[bot]	f41213047a	docs: update README.md [skip ci]	2020-08-29 10:53:34 +00:00
Artem Polishchuk	2315ef2417	Add Fedora/CentOS installation instructions	2020-08-28 23:33:42 +03:00
Brandon	cb87d5b9ce	Update README.md	2020-08-28 16:14:10 +01:00
Brandon	92800678cd	Merge branch 'master' of github.com:brandonskerritt/RustScan into master	2020-08-28 15:59:05 +01:00
Brandon	8e76a71a4c	updated logo	2020-08-28 15:58:42 +01:00
Brandon	07fdea8471	Merge pull request #176 from niklasmohrin/improve-readme README.md tweaks	2020-08-28 13:50:38 +01:00
Niklas Mohrin	8670bcc35f	Move "rustscan -h" and output together	2020-08-28 14:43:50 +02:00
Niklas Mohrin	fbba9d16ca	Mark code blocks as bash commands in README	2020-08-28 14:43:50 +02:00
Niklas Mohrin	309d1ad660	Remove argument placeholders in docker alias	2020-08-28 14:43:47 +02:00
Brandon	ed48161bea	added travis token	2020-08-28 11:22:23 +01:00
Brandon	f0d1aa2b9a	Merge pull request #180 from RustScan/all-contributors/add-SuperSandro2000 docs: add SuperSandro2000 as a contributor	2020-08-28 11:12:35 +01:00
Brandon	ac93feddb5	Merge pull request #178 from SuperSandro2000/optimize-docker Optimize Dockerfile	2020-08-28 11:12:17 +01:00
allcontributors[bot]	1280fa1b47	docs: update .all-contributorsrc [skip ci]	2020-08-28 10:12:08 +00:00
Brandon	6e731aaf93	Merge branch 'master' into optimize-docker	2020-08-28 11:12:08 +01:00
allcontributors[bot]	9230165f8f	docs: update README.md [skip ci]	2020-08-28 10:12:07 +00:00
Brandon	818c80041b	Merge pull request #177 from RustScan/all-contributors/add-niklasmohrin docs: add niklasmohrin as a contributor	2020-08-28 11:11:38 +01:00
allcontributors[bot]	bce955212a	docs: update .all-contributorsrc [skip ci]	2020-08-28 10:11:34 +00:00
allcontributors[bot]	41e0e8905f	docs: update README.md [skip ci]	2020-08-28 10:11:33 +00:00
Sandro Jäckel	85f1699724	Prevent cache bustages	2020-08-28 01:31:54 +02:00
Sandro Jäckel	bafd0141df	Pin Alpine 3.12 to prevent breakages in the future	2020-08-28 01:31:26 +02:00
Sandro Jäckel	aba0f3c38c	Cleanup Dockerfile	2020-08-28 01:31:08 +02:00
allcontributors[bot]	9e161d4f79	docs: update .all-contributorsrc [skip ci]	2020-08-27 23:12:10 +00:00
allcontributors[bot]	731b4079cf	docs: update README.md [skip ci]	2020-08-27 23:12:09 +00:00
Brandon	b4edc6cca6	1.8.0 publish	2020-08-28 00:03:02 +01:00
Brandon	4a7cbd701b	Merge pull request #175 from RustScan/all-contributors/add-caass docs: add caass as a contributor	2020-08-27 20:39:46 +01:00
allcontributors[bot]	f34ee8f5ef	docs: update .all-contributorsrc [skip ci]	2020-08-27 19:36:22 +00:00
allcontributors[bot]	89c763789f	docs: update README.md [skip ci]	2020-08-27 19:36:21 +00:00
Brandon	5c48f1173a	Merge pull request #140 from remigourdon/docs-pages Add Travis configuration to publish doc to GitHub pages	2020-08-27 14:02:46 +01:00
Brandon	8d8ca1d4a0	Merge branch 'master' into docs-pages	2020-08-27 14:01:29 +01:00
Brandon	8d8acd61e8	Merge pull request #173 from RustScan/bee-add-submodule added submodule	2020-08-27 13:33:16 +01:00
Brandon	0ab3e53034	Merge branch 'master' into bee-add-submodule	2020-08-27 13:05:19 +01:00
Brandon	56493859cb	added submodule	2020-08-27 12:36:56 +01:00
Brandon	2ef723ed96	Merge branch 'master' into docs-pages	2020-08-27 12:30:33 +01:00
Brandon	e9288302ba	Merge pull request #172 from RustScan/all-contributors/add-caass docs: add caass as a contributor	2020-08-27 11:39:35 +01:00
remigourdon	8179511527	Add Travis configuration to publish doc to GitHub pages	2020-08-26 23:22:13 -04:00
allcontributors[bot]	fbab4a4020	docs: update .all-contributorsrc [skip ci]	2020-08-26 23:22:13 -04:00
allcontributors[bot]	b425d15a98	docs: update README.md [skip ci]	2020-08-26 23:22:13 -04:00
allcontributors[bot]	fddda34465	docs: update .all-contributorsrc [skip ci]	2020-08-26 23:39:11 +00:00
allcontributors[bot]	125df4a2ed	docs: update README.md [skip ci]	2020-08-26 23:39:10 +00:00
Brandon	e670d11223	Merge pull request #170 from RustScan/all-contributors/add-SuperSandro2000 docs: add SuperSandro2000 as a contributor	2020-08-27 00:36:42 +01:00
Brandon	8453320586	Merge pull request #169 from SuperSandro2000/fix-timeout-arg Convert -T to -t	2020-08-26 17:27:15 +01:00
allcontributors[bot]	99e9c834a9	docs: update .all-contributorsrc [skip ci]	2020-08-26 15:54:45 +00:00
allcontributors[bot]	dfbce6a636	docs: update README.md [skip ci]	2020-08-26 15:54:44 +00:00
Sandro Jäckel	916be1e4a2	Convert -T to -t	2020-08-26 17:38:58 +02:00
Brandon	90b4328fb6	Merge pull request #167 from RustScan/all-contributors/add-Phenomite docs: add Phenomite as a contributor	2020-08-26 16:08:25 +01:00
Brandon	76035d3379	Merge branch 'master' into all-contributors/add-Phenomite	2020-08-26 15:50:08 +01:00
Brandon	4de31ecede	Merge pull request #163 from Phenomite/patch-1 2000 milliseconds not seconds	2020-08-26 15:47:50 +01:00
allcontributors[bot]	ce9befaa1a	docs: update .all-contributorsrc [skip ci]	2020-08-26 14:47:28 +00:00
Brandon	5f6457ed7e	Merge branch 'master' into patch-1	2020-08-26 15:47:27 +01:00
allcontributors[bot]	12d3c91983	docs: update README.md [skip ci]	2020-08-26 14:47:27 +00:00
Brandon	e0fd7a39dc	Merge pull request #164 from RustScan/dependabot/cargo/structopt-0.3.17 Bump structopt from 0.3.16 to 0.3.17	2020-08-26 14:59:31 +01:00
Brandon	ff0787e332	Merge branch 'master' into dependabot/cargo/structopt-0.3.17	2020-08-26 14:02:08 +01:00
Brandon	6ce6c0ce9e	Merge pull request #166 from RustScan/all-contributors/add-Ferryistaken docs: add Ferryistaken as a contributor	2020-08-26 14:01:48 +01:00
Brandon	edf989ad5d	Merge branch 'master' into all-contributors/add-Ferryistaken	2020-08-26 13:35:08 +01:00
Brandon	3fede4c6db	Merge pull request #165 from Ferryistaken/fix-message Fixed small typo in a warning message	2020-08-26 13:34:46 +01:00
allcontributors[bot]	75b310f227	docs: update .all-contributorsrc [skip ci]	2020-08-26 12:34:40 +00:00
allcontributors[bot]	72c6ef1f1d	docs: update README.md [skip ci]	2020-08-26 12:34:39 +00:00
Ferry	83b23da32b	Fixed small typo in a warning message	2020-08-26 11:00:54 +02:00
dependabot-preview[bot]	3886a07775	Bump structopt from 0.3.16 to 0.3.17 Bumps [structopt](https://github.com/TeXitoi/structopt) from 0.3.16 to 0.3.17. - [Release notes](https://github.com/TeXitoi/structopt/releases) - [Changelog](https://github.com/TeXitoi/structopt/blob/master/CHANGELOG.md) - [Commits](https://github.com/TeXitoi/structopt/compare/v0.3.16...v0.3.17) Signed-off-by: dependabot-preview[bot] <[email protected]>	2020-08-26 06:52:53 +00:00
Phenomite	f5064d3d5c	2000 milliseconds not seconds	2020-08-25 18:42:59 -04:00