dandri/dns-over-https
1
0
Fork 0
mirror of https://github.com/m13253/dns-over-https.git synced 2026-06-04 23:21:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Replace Url with URL

Browse Source
This commit is contained in:
Star Brilliant
2019-03-09 19:05:07 +08:00
parent fec1e84d5e
commit 0f35971118
5 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doh-client/selector/randomSelector.go
+2 -2
View File
@@ -23,14 +23,14 @@ func (rs *RandomSelector) Add(url string, upstreamType UpstreamType) (err error)
case Google:
rs.upstreams = append(rs.upstreams, &Upstream{
Type: Google,
Url: url,
URL: url,
RequestType: "application/dns-json",
})
case IETF:
rs.upstreams = append(rs.upstreams, &Upstream{
Type: IETF,
Url: url,
URL: url,
RequestType: "application/dns-message",
})
doh-client/selector/upstream.go
+2 -2
View File
@@ -16,7 +16,7 @@ var typeMap = map[UpstreamType]string{
type Upstream struct {
Type UpstreamType
Url string
URL string
RequestType string
weight int32
effectiveWeight int32
@@ -24,5 +24,5 @@ type Upstream struct {
}
func (u Upstream) String() string {
return fmt.Sprintf("upstream type: %s, upstream url: %s", typeMap[u.Type], u.Url)
return fmt.Sprintf("upstream type: %s, upstream url: %s", typeMap[u.Type], u.URL)
}
doh-client/selector/weightRoundRobinSelector.go
+8 -8
View File
@@ -24,7 +24,7 @@ func (ws *WeightRoundRobinSelector) Add(url string, upstreamType UpstreamType, w
case Google:
ws.upstreams = append(ws.upstreams, &Upstream{
Type: Google,
Url: url,
URL: url,
RequestType: "application/dns-json",
weight: weight,
effectiveWeight: weight,
@@ -33,7 +33,7 @@ func (ws *WeightRoundRobinSelector) Add(url string, upstreamType UpstreamType, w
case IETF:
ws.upstreams = append(ws.upstreams, &Upstream{
Type: IETF,
Url: url,
URL: url,
RequestType: "application/dns-message",
weight: weight,
effectiveWeight: weight,
@@ -51,27 +51,27 @@ func (ws *WeightRoundRobinSelector) StartEvaluate() {
go func() {
for {
for i := range ws.upstreams {
upstreamUrl := ws.upstreams[i].Url
upstreamURL := ws.upstreams[i].URL
var acceptType string
switch ws.upstreams[i].Type {
case Google:
upstreamUrl += "?name=www.example.com&type=A"
upstreamURL += "?name=www.example.com&type=A"
acceptType = "application/dns-json"
case IETF:
// www.example.com
upstreamUrl += "?dns=q80BAAABAAAAAAAAA3d3dwdleGFtcGxlA2NvbQAAAQAB"
upstreamURL += "?dns=q80BAAABAAAAAAAAA3d3dwdleGFtcGxlA2NvbQAAAQAB"
acceptType = "application/dns-message"
}
req, err := http.NewRequest(http.MethodGet, upstreamUrl, nil)
req, err := http.NewRequest(http.MethodGet, upstreamURL, nil)
if err != nil {
/*log.Println("upstream:", upstreamUrl, "type:", typeMap[upstream.Type], "check failed:", err)
/*log.Println("upstream:", upstreamURL, "type:", typeMap[upstream.Type], "check failed:", err)
continue*/
// should I only log it? But if there is an error, I think when query the server will return error too
panic("upstream: " + upstreamUrl + " type: " + typeMap[ws.upstreams[i].Type] + " check failed: " + err.Error())
panic("upstream: " + upstreamURL + " type: " + typeMap[ws.upstreams[i].Type] + " check failed: " + err.Error())
}
req.Header.Set("accept", acceptType)