Solved conflict

LeakIX · Oct 6, 2021 · 9c31572 · 9c31572
2 parents c121130 + ba1f718
commit 9c31572
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 83 deletions.
diff --git a/LICENSE b/LICENSE
@@ -0,0 +1,29 @@
+BSD 3-Clause License
+
+Copyright (c) 2020, LeakIX
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/README.md b/README.md
@@ -58,71 +58,6 @@ $ ./leakix -r -s services -l 0
 ...keeps streaming...
 ```
 
-## leakix-ns - Command line usage
-
-```
-$ ./bin/leakix-ns-linux-64 
-Usage of leakix-dns: 
-  ./leakix-ns -d <domain> -l 200
-
-  -d string
-        Specify domain or IP
-  -j    JSON mode, (excludes -t)
-  -l int
-        Limit results output (default 100)
-$ ./bin/leakix-ns-linux-64 -d microsoft.com -l 3000
-PTR records :
-[22-09-2020 03:50] sophosent.microsoft.com <- 157.58.217.12
-[04-10-2020 21:08] tide131.microsoft.com <- 213.199.128.156
-[01-10-2020 12:42] 52-114-124-186.relay.teams.microsoft.com <- 52.114.124.186
-[27-09-2020 06:11] dbecbip01.one.microsoft.com <- 213.199.129.203
-[04-10-2020 13:15] duschy644p52v2-portal.msftvpn.ras.microsoft.com <- 157.58.214.101
-[02-10-2020 16:10] timestamping4096.microsoft.com <- 207.46.153.123
-[02-10-2020 13:07] invoicepresentmentjournal.co1.cp.microsoft.com <- 65.55.120.33
-[28-09-2020 05:28] 52-114-124-198.relay.teams.microsoft.com <- 52.114.124.198
-[27-09-2020 23:11] dm2.usmevpn.microsoft.com <- 131.253.121.62
-[25-09-2020 12:56] blugro7gms.groove.microsoft.com <- 134.170.3.177
-[27-09-2020 20:35] 52-114-125-70.relay.teams.microsoft.com <- 52.114.125.70
-[22-09-2020 01:46] bn2-dspcdn.tlu.dl.delivery.mp.microsoft.com <- 40.77.228.30
-[03-10-2020 10:39] accounts.bn2.cp.microsoft.com <- 40.77.228.40
-[01-10-2020 19:53] duschy644p52v2.msftvpn-alt.ras.microsoft.com <- 157.58.214.99
-[23-09-2020 11:27] primary.exchange.microsoft.com <- 157.58.197.9
-[03-10-2020 09:33] invoicepresentment.dm2.cp.microsoft.com <- 65.55.145.65
-[01-10-2020 16:43] origin-internal-dev.support.services.microsoft.com <- 40.77.232.18
-[01-10-2020 04:14] invoicepresentment.co1.cp.microsoft.com <- 65.55.120.34
-[28-09-2020 01:50] co1.gmevpn.microsoft.com <- 65.55.5.44
-[06-10-2020 00:53] 52-114-124-181.relay.teams.microsoft.com <- 52.114.124.181
-[03-10-2020 01:04] pages.bing-email.microsoft.com <- 13.111.35.40
-[01-10-2020 01:31] accounts.bkgprocessing.cy2.cp.microsoft.com <- 40.77.232.79
-[01-10-2020 00:46] 52-114-125-17.relay.teams.microsoft.com <- 52.114.125.17
-[27-09-2020 21:52] 52-114-124-88.relay.teams.microsoft.com <- 52.114.124.88
-[30-09-2020 12:22] 52-114-124-202.relay.teams.microsoft.com <- 52.114.124.202
-[22-09-2020 22:54] staff.microsoft.com <- 209.141.49.113
-[22-09-2020 03:50] staff.microsoft.com <- 209.141.61.131
-[22-09-2020 10:44] click.bing-email.microsoft.com <- 13.111.36.33
-Forward records :
-[06-10-2020 02:26] office2018microsoft.com -> 13.77.161.179
-[06-10-2020 02:26] office2018microsoft.com -> 104.215.148.63
-[06-10-2020 02:26] office2018microsoft.com -> 40.113.200.201
-[06-10-2020 02:26] office2018microsoft.com -> 104.215.148.63
-[06-10-2020 02:26] office2018microsoft.com -> 13.77.161.179
-[06-10-2020 02:26] office2018microsoft.com -> 40.113.200.201
-[06-10-2020 02:26] office2018microsoft.com -> 40.112.72.205
-[06-10-2020 02:26] office2018microsoft.com -> 40.112.72.205
-[06-10-2020 02:26] office2018microsoft.com -> 40.76.4.15
-[06-10-2020 02:26] office2018microsoft.com -> 40.76.4.15
-[05-10-2020 02:50] www.microsoft.com -> 2600:140a:a000:299::356e
-[05-10-2020 02:50] www.microsoft.com -> 2600:140a:a000:299::356e
-[05-10-2020 02:50] www.microsoft.com -> 2600:140a:a000:293::356e
-[05-10-2020 02:50] www.microsoft.com -> 104.77.222.2
-[05-10-2020 02:50] www.microsoft.com -> 2600:140a:a000:293::356e
-[05-10-2020 02:50] www.microsoft.com -> 104.77.222.2
-[05-10-2020 02:50] es.microsoft.com -> 51.143.57.13
-[05-10-2020 02:50] es.microsoft.com -> 51.143.57.13
-[05-10-2020 02:50] mail.microsoft.com -> 157.58.197.10
-[05-10-2020 02:50] mail.microsoft.com -> 167.220.71.19
-```
-
 ## Library usage
 
 ```golang

diff --git a/build-archs.sh b/build-archs.sh
@@ -1,21 +1,3 @@
-GOOS=linux GOARCH=386 go build -ldflags="-s -w" -o bin/leakix-ns-linux-32 ./cmd/leakix-ns &
-GOOS=linux GOARCH=amd64 go build -ldflags="-s -w" -o bin/leakix-ns-linux-64 ./cmd/leakix-ns &
-GOOS=freebsd GOARCH=amd64 go build -ldflags="-s -w" -o bin/leakix-ns-freebsd-64 ./cmd/leakix-ns &
-GOOS=freebsd GOARCH=386 go build -ldflags="-s -w" -o bin/leakix-ns-freebsd-32 ./cmd/leakix-ns &
-
-GOOS=linux GOARCH=arm GOARM=7 go build -ldflags="-s -w" -o bin/leakix-ns-linux-arm7 ./cmd/leakix-ns &
-GOOS=linux GOARCH=arm GOARM=6 go build -ldflags="-s -w" -o bin/leakix-ns-linux-arm6 ./cmd/leakix-ns &
-
-GOOS=darwin GOARCH=amd64 go build -ldflags="-s -w" -o bin/leakix-ns-osx ./cmd/leakix-ns &
-
-GOOS=windows GOARCH=amd64 go build -ldflags="-s -w" -o bin/leakix-ns-win64.exe ./cmd/leakix-ns &
-GOOS=windows GOARCH=386 go build -ldflags="-s -w" -o bin/leakix-ns-win32.exe ./cmd/leakix-ns &
-
-GOOS=netbsd GOARCH=amd64 go build -ldflags="-s -w" -o bin/leakix-ns-netbsd-64 ./cmd/leakix-ns &
-GOOS=netbsd GOARCH=386 go build -ldflags="-s -w" -o bin/leakix-ns-netbsd-32 ./cmd/leakix-ns &
-
-GOOS=openbsd GOARCH=amd64 go build -ldflags="-s -w" -o bin/leakix-ns-openbsd-64 ./cmd/leakix-ns &
-GOOS=openbsd GOARCH=386 go build -ldflags="-s -w" -o bin/leakix-ns-openbsd-32 ./cmd/leakix-ns &
 
 CGO_ENABLED=0 GOOS=linux GOARCH=386 go build -ldflags="-s -w  -extldflags '-static'" -o bin/leakix-linux-32 ./cmd/leakix &
 CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-s -w -extldflags '-static'" -o bin/leakix-linux-64 ./cmd/leakix &

diff --git a/cmd/leakix-ns/README.md b/cmd/leakix-ns/README.md
@@ -0,0 +1,3 @@
+## deprecated
+
+Kept as example