diff options
Diffstat (limited to 'plugin')
| -rw-r--r-- | plugin/v64DNS/v64dns.go | 8 | ||||
| -rw-r--r-- | plugin/v64DNS/v64dns_policy.go | 8 |
2 files changed, 7 insertions, 9 deletions
diff --git a/plugin/v64DNS/v64dns.go b/plugin/v64DNS/v64dns.go index 2cfffbd..87a60ed 100644 --- a/plugin/v64DNS/v64dns.go +++ b/plugin/v64DNS/v64dns.go @@ -2,11 +2,9 @@ package v64dns import ( "context" + "github.com/miekg/dns" "net" "ohmydns2/plugin/pkg/request" - "ohmydns2/plugin/v64DNS/analyze" - - "github.com/miekg/dns" ) // V64dns代表了水印权威 @@ -16,8 +14,8 @@ type V64dns struct { ipv6NS string V4NSAddr string V6NSAddr string - p Policy // 生成响应的策略 - a analyze.Analyzer // 分析器配置 + p Policy // 生成响应的策略 + //a analyze.Analyzer // 分析器配置 } // ServeDNS diff --git a/plugin/v64DNS/v64dns_policy.go b/plugin/v64DNS/v64dns_policy.go index d67d910..bf3d305 100644 --- a/plugin/v64DNS/v64dns_policy.go +++ b/plugin/v64DNS/v64dns_policy.go @@ -2,7 +2,6 @@ package v64dns import ( "net" - "ohmydns2/plugin/v64DNS/analyze" "strconv" "strings" "sync" @@ -36,7 +35,7 @@ func (e expobject) Addchain(ip net.IP) { } // 停止实验，根据倒计时停止 -func (e expobject) Stop(a analyze.Analyzer) { +func (e expobject) Stop() { // 如果到达时间限制则通过管道通知停止 timeTicker := time.NewTicker(1 * time.Second) i := e.interval @@ -44,7 +43,8 @@ func (e expobject) Stop(a analyze.Analyzer) { <-timeTicker.C i-- if i == 0 { - a.AnalyzeChain(e.chain) + // 调用分析器代码 + //a.AnalyzeChain(e.chain) el.c <- e.eid break } @@ -185,7 +185,7 @@ func (v V64dns) ResponseCNAME(msg *dns.Msg, sip net.IP) *dns.Msg { } e.Addchain(sip) el.l[expid] = e - go e.Stop(v.a) + go e.Stop() } e.AddProgress() e.Addchain(sip) |