Merge pull request #5 from knownsec/dev

v0.3 dev
knownsec · Sep 2, 2020 · c96db17 · c96db17
2 parents 03df32e + 2d6d4b2
commit c96db17
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 96,126 deletions.
diff --git a/cmd/ksubdomain.go b/cmd/ksubdomain.go
@@ -12,7 +12,7 @@ func test(options *core.Options) {
 	sendog := core.SendDog{}
 	ether := core.GetDevices(options)
 	ether.DstMac = net.HardwareAddr{0x5c, 0xc9, 0x09, 0x33, 0x34, 0x80}
-	sendog.Init(ether, []string{"8.8.8.8"}, 404)
+	sendog.Init(ether, []string{"8.8.8.8"}, 404, false)
 	defer sendog.Close()
 	var index int64 = 0
 	start := time.Now().UnixNano() / 1e6

diff --git a/core/banner.go b/core/banner.go
@@ -4,7 +4,7 @@ import (
 	"ksubdomain/gologger"
 )
 
-const Version = "0.2.1"
+const Version = "0.3"
 const banner = `
  _  __   _____       _         _                       _
 | |/ /  / ____|     | |       | |                     (_)

diff --git a/core/recv.go b/core/recv.go
@@ -20,6 +20,9 @@ func Recv(device string, options *Options, flagID uint16, retryChan chan RetrySt
 		timeout     time.Duration = -1 * time.Second
 	)
 	windowWith := GetWindowWith()
+	if options.Silent {
+		windowWith = 0
+	}
 	handle, _ := pcap.OpenLive(device, snapshotLen, promiscuous, timeout)
 	err := handle.SetBPFFilter("udp and port 53")
 	if err != nil {
@@ -98,12 +101,14 @@ func Recv(device string, options *Options, flagID uint16, retryChan chan RetrySt
 				for _, v := range dns.Questions {
 					msg += string(v.Name) + " => "
 				}
-				for _, v := range dns.Answers {
-					msg += v.String()
-					if isttl {
-						msg += " ttl:" + strconv.Itoa(int(v.TTL))
+				if !options.Silent {
+					for _, v := range dns.Answers {
+						msg += v.String()
+						if isttl {
+							msg += " ttl:" + strconv.Itoa(int(v.TTL))
+						}
+						msg += " => "
 					}
-					msg += " => "
 				}
 				msg = strings.Trim(msg, " => ")
 				ff := windowWith - len(msg) - 1

diff --git a/core/send.go b/core/send.go
@@ -21,9 +21,10 @@ type SendDog struct {
 	increate_index bool   // 是否使用index自增
 	flagID         uint16 // dnsid 前3位
 	flagID2        uint16 // dnsid 后2位
+	printStatus    bool
 }
 
-func (d *SendDog) Init(ether EthTable, dns []string, flagID uint16) {
+func (d *SendDog) Init(ether EthTable, dns []string, flagID uint16, printStatus bool) {
 	d.ether = ether
 	d.dns = dns
 	d.flagID = flagID
@@ -41,6 +42,7 @@ func (d *SendDog) Init(ether EthTable, dns []string, flagID uint16) {
 	d.index = 10000
 	d.increate_index = true
 	d.lock = &sync.RWMutex{}
+	d.printStatus = printStatus
 	//defer d.handle.Close()
 }
 func (d *SendDog) Lock() {
@@ -157,7 +159,9 @@ func (d *SendDog) Send(domain string, dnsname string, srcport uint16, flagid uin
 		gologger.Warningf("WritePacketDate error:%s\n", err.Error())
 	}
 	atomic.AddUint64(&SentIndex, 1)
-	PrintStatus()
+	if d.printStatus {
+		PrintStatus()
+	}
 }
 func (d *SendDog) Close() {
 	d.handle.Close()

diff --git a/core/start.go b/core/start.go
@@ -27,7 +27,7 @@ func Start(options *Options) {
 	retryChan := make(chan RetryStruct, options.Rate)
 	go Recv(ether.Device, options, flagID, retryChan)
 	sendog := SendDog{}
-	sendog.Init(ether, options.Resolvers, flagID)
+	sendog.Init(ether, options.Resolvers, flagID, true)
 
 	var f io.Reader
 	// handle Stdin
@@ -47,7 +47,7 @@ func Start(options *Options) {
 	if len(options.Domain) > 0 {
 		if options.FileName == "" {
 			gologger.Infof("加载内置字典\n")
-			f = strings.NewReader(DefaultSubdomain)
+			f = strings.NewReader(GetSubdomainData())
 		} else {
 			f2, err := os.Open(options.FileName)
 			defer f2.Close()