summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhandingkang <[email protected]>2023-12-20 00:22:44 +0800
committerhandingkang <[email protected]>2023-12-20 00:22:44 +0800
commit36661b036bec8fa0eb5d77cfa43a02645eb9eec9 (patch)
tree4b732b0df4c131cd5d541a65ab0a5c19815c1333
parenta998707524775446e6a71477c92f6f7f9e567f47 (diff)
修复分析器代码问题
-rw-r--r--.gitignore1
-rw-r--r--core/dnsserver/zdirectives.go1
-rw-r--r--core/plugin/zplugin.go1
-rw-r--r--coremain/run.go2
-rw-r--r--plugin/v64dns/analyze/pb/analyzer.py2
-rw-r--r--plugin/v64dns/v64dnsutil.go2
6 files changed, 6 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index 1a4f33e..77963ed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -273,3 +273,4 @@ ohmydns2
plugin/v64dns/analyze/pb/twv6.py
plugin/v64dns/analyze/pb/53openIPv6.txt
plugin/v64dns/analyze/pb/TW_v6resolver.txt
+ohmydns
diff --git a/core/dnsserver/zdirectives.go b/core/dnsserver/zdirectives.go
index 83743ac..847fd70 100644
--- a/core/dnsserver/zdirectives.go
+++ b/core/dnsserver/zdirectives.go
@@ -62,4 +62,5 @@ var Directives = []string{
"on",
"sign",
"view",
+ "v64dns",
}
diff --git a/core/plugin/zplugin.go b/core/plugin/zplugin.go
index 882973d..467e1cf 100644
--- a/core/plugin/zplugin.go
+++ b/core/plugin/zplugin.go
@@ -54,6 +54,7 @@ import (
_ "ohmydns/plugin/trace"
_ "ohmydns/plugin/transfer"
_ "ohmydns/plugin/tsig"
+ _ "ohmydns/plugin/v64dns"
_ "ohmydns/plugin/view"
_ "ohmydns/plugin/whoami"
)
diff --git a/coremain/run.go b/coremain/run.go
index fcb316d..1e98135 100644
--- a/coremain/run.go
+++ b/coremain/run.go
@@ -15,7 +15,7 @@ import (
)
func init() {
- caddy.DefaultConfigFile = "Ohmyfile"
+ caddy.DefaultConfigFile = "Corefile"
caddy.Quiet = true // don't show init stuff from caddy
setVersion()
diff --git a/plugin/v64dns/analyze/pb/analyzer.py b/plugin/v64dns/analyze/pb/analyzer.py
index d5781bf..0f07824 100644
--- a/plugin/v64dns/analyze/pb/analyzer.py
+++ b/plugin/v64dns/analyze/pb/analyzer.py
@@ -199,7 +199,7 @@ class neo4j_connector:
return "node err when link"
# 不存在则建立关联
if not lexist:
- QL[0].QLINK.connect(L[1], {'W': 1}).save()
+ QL[0].QLINK.connect(QL[1], {'W': 1}).save()
# 存在则修改权重
else:
QL.W += 1
diff --git a/plugin/v64dns/v64dnsutil.go b/plugin/v64dns/v64dnsutil.go
index 6848fb1..eb07df0 100644
--- a/plugin/v64dns/v64dnsutil.go
+++ b/plugin/v64dns/v64dnsutil.go
@@ -156,5 +156,5 @@ func ip2id(ip string) string {
// 构造示例
func (v V64dns) makeProbev64() string {
- return fmt.Sprintf("c1.0-0-0-0.%v.%v.", strings.ToLower(randstr.RandomAlphanumeric(5)), v.p.v4domain)
+ return fmt.Sprintf("c1.0-0-0-0.%v.%v", strings.ToLower(randstr.RandomAlphanumeric(5)), v.p.v4domain)
}