dandri/dns-over-https
1
0
Fork 0
mirror of https://github.com/m13253/dns-over-https.git synced 2026-05-25 18:34:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update to IETF draft-07

Browse Source
This commit is contained in:
Star Brilliant
2018-04-13 02:46:03 +08:00
parent 07db7ba200
commit 83f20767ea
5 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doh-client/client.go
+9 -9
View File
@@ -182,21 +182,21 @@ func (c *Client) handlerFunc(w dns.ResponseWriter, r *dns.Msg, isTCP bool) {
if len(c.conf.UpstreamIETF) == 0 {
requestType = "application/dns-json"
} else if len(c.conf.UpstreamGoogle) == 0 {
requestType = "message/dns"
requestType = "application/dns-message"
} else {
numServers := len(c.conf.UpstreamGoogle) + len(c.conf.UpstreamIETF)
random := rand.Intn(numServers)
if random < len(c.conf.UpstreamGoogle) {
requestType = "application/dns-json"
} else {
requestType = "message/dns"
requestType = "application/dns-message"
}
}
var req *DNSRequest
if requestType == "application/dns-json" {
req = c.generateRequestGoogle(w, r, isTCP)
} else if requestType == "message/dns" {
} else if requestType == "application/dns-message" {
req = c.generateRequestIETF(w, r, isTCP)
} else {
panic("Unknown request Content-Type")
@@ -210,21 +210,21 @@ func (c *Client) handlerFunc(w dns.ResponseWriter, r *dns.Msg, isTCP bool) {
candidateType := strings.SplitN(req.response.Header.Get("Content-Type"), ";", 2)[0]
if candidateType == "application/json" {
contentType = "application/json"
} else if candidateType == "message/dns" {
contentType = "message/dns"
} else if candidateType == "application/dns-message" {
contentType = "application/dns-message"
} else if candidateType == "application/dns-udpwireformat" {
contentType = "message/dns"
contentType = "application/dns-message"
} else {
if requestType == "application/dns-json" {
contentType = "application/json"
} else if requestType == "message/dns" {
contentType = "message/dns"
} else if requestType == "application/dns-message" {
contentType = "application/dns-message"
}
}
if contentType == "application/json" {
c.parseResponseGoogle(w, r, isTCP, req)
} else if contentType == "message/dns" {
} else if contentType == "application/dns-message" {
c.parseResponseIETF(w, r, isTCP, req)
} else {
panic("Unknown response Content-Type")