diff --git a/doh-client/client.go b/doh-client/client.go
index f738ce4d94377050f3ca56dc771a2b45f5736578..df43561f52ae0d36200be20377bf93f2d912b8a0 100644
--- a/doh-client/client.go
+++ b/doh-client/client.go
@@ -38,9 +38,9 @@ import (
"sync"
"time"
- "github.com/m13253/dns-over-https/doh-client/config"
- "github.com/m13253/dns-over-https/doh-client/selector"
- jsondns "github.com/m13253/dns-over-https/json-dns"
+ "github.com/m13253/dns-over-https/v2/doh-client/config"
+ "github.com/m13253/dns-over-https/v2/doh-client/selector"
+ jsondns "github.com/m13253/dns-over-https/v2/json-dns"
"github.com/miekg/dns"
"golang.org/x/net/http2"
"golang.org/x/net/idna"
diff --git a/doh-client/google.go b/doh-client/google.go
index 1e94612fd2ddc0aca5211b5a0a725e551e48b1eb..5fecf00ef5aa4b242d97abf0eaec59a719012426 100644
--- a/doh-client/google.go
+++ b/doh-client/google.go
@@ -34,8 +34,8 @@ import (
"strconv"
"strings"
- "github.com/m13253/dns-over-https/doh-client/selector"
- jsondns "github.com/m13253/dns-over-https/json-dns"
+ "github.com/m13253/dns-over-https/v2/doh-client/selector"
+ jsondns "github.com/m13253/dns-over-https/v2/json-dns"
"github.com/miekg/dns"
)
diff --git a/doh-client/ietf.go b/doh-client/ietf.go
index b1edb4a59031ce2c3a6036517008049838427f4c..a474922bad93c35e3df45d0fd64c99d059eb8bd1 100644
--- a/doh-client/ietf.go
+++ b/doh-client/ietf.go
@@ -35,8 +35,8 @@ import (
"strings"
"time"
- "github.com/m13253/dns-over-https/doh-client/selector"
- jsondns "github.com/m13253/dns-over-https/json-dns"
+ "github.com/m13253/dns-over-https/v2/doh-client/selector"
+ jsondns "github.com/m13253/dns-over-https/v2/json-dns"
"github.com/miekg/dns"
)
diff --git a/doh-client/main.go b/doh-client/main.go
index 43dace26e5ecf6ce141cc74a6d6b58cf0b67789a..e739a22a1724371328da5a1792a9155a98de8b3f 100644
--- a/doh-client/main.go
+++ b/doh-client/main.go
@@ -33,7 +33,7 @@ import (
"runtime"
"strconv"
- "github.com/m13253/dns-over-https/doh-client/config"
+ "github.com/m13253/dns-over-https/v2/doh-client/config"
)
func checkPIDFile(pidFile string) (bool, error) {
diff --git a/doh-server/google.go b/doh-server/google.go
index 4231c726fdcbd6d741e72ab7166087747a8e6d40..b8873a62949d372878ea164f687a8425cb50075e 100644
--- a/doh-server/google.go
+++ b/doh-server/google.go
@@ -34,7 +34,7 @@ import (
"strings"
"time"
- jsondns "github.com/m13253/dns-over-https/json-dns"
+ jsondns "github.com/m13253/dns-over-https/v2/json-dns"
"github.com/miekg/dns"
"golang.org/x/net/idna"
)
diff --git a/doh-server/ietf.go b/doh-server/ietf.go
index 481d95a13f8d10553202c43e6823446bb2bd97c5..bb719f48bc9e1ed487f0c156b1ea70f269910179 100644
--- a/doh-server/ietf.go
+++ b/doh-server/ietf.go
@@ -36,7 +36,7 @@ import (
"strings"
"time"
- jsondns "github.com/m13253/dns-over-https/json-dns"
+ jsondns "github.com/m13253/dns-over-https/v2/json-dns"
"github.com/miekg/dns"
)
diff --git a/doh-server/server.go b/doh-server/server.go
index 154cac5a10de22426e0a3d00826dab0564c28e97..e1d4955f2c2b7ab40018af8a3ca213e97fe485b1 100644
--- a/doh-server/server.go
+++ b/doh-server/server.go
@@ -38,7 +38,7 @@ import (
"time"
"github.com/gorilla/handlers"
- jsondns "github.com/m13253/dns-over-https/json-dns"
+ jsondns "github.com/m13253/dns-over-https/v2/json-dns"
"github.com/miekg/dns"
)
diff --git a/go.mod b/go.mod
index ca3576be9db4f2dbad3bd45007e3ab3e6adf55a5..aca12fa0e88f192e04a92b643925750811b1491e 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module github.com/m13253/dns-over-https
+module github.com/m13253/dns-over-https/v2
go 1.13
@@ -7,7 +7,5 @@ require (
github.com/gorilla/handlers v1.4.0
github.com/infobloxopen/go-trees v0.0.0-20200715205103-96a057b8dfb9
github.com/miekg/dns v1.1.41
- golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2 // indirect
golang.org/x/net v0.0.0-20210324205630-d1beb07c2056
- golang.org/x/tools v0.0.0-20191216052735-49a3e744a425 // indirect
)
diff --git a/go.sum b/go.sum
index 37f58316b2749369940ec1c8a7e67464f60a331b..e56827c36b91d321b9bdcd375e5a999c1205b1aa 100644
--- a/go.sum
+++ b/go.sum
@@ -4,45 +4,22 @@ github.com/gorilla/handlers v1.4.0 h1:XulKRWSQK5uChr4pEgSE4Tc/OcmnU9GJuSwdog/tZs
github.com/gorilla/handlers v1.4.0/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ=
github.com/infobloxopen/go-trees v0.0.0-20200715205103-96a057b8dfb9 h1:w66aaP3c6SIQ0pi3QH1Tb4AMO3aWoEPxd1CNvLphbkA=
github.com/infobloxopen/go-trees v0.0.0-20200715205103-96a057b8dfb9/go.mod h1:BaIJzjD2ZnHmx2acPF6XfGLPzNCMiBbMRqJr+8/8uRI=
-github.com/miekg/dns v1.1.31 h1:sJFOl9BgwbYAWOGEwr61FU28pqsBNdpRBnhGXtO06Oo=
-github.com/miekg/dns v1.1.31/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
github.com/miekg/dns v1.1.41 h1:WMszZWJG0XmzbK9FEmzH2TVcqYzFesusSIB41b8KHxY=
github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de h1:ikNHVSjEfnvz6sxdSPCaPt572qowuyMDMJLLm3Db3ig=
-golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
-golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200707034311-ab3426394381 h1:VXak5I6aEWmAXeQjA+QSZzlgNrpq9mjcfDemuexIKsU=
-golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
golang.org/x/net v0.0.0-20210324205630-d1beb07c2056 h1:sANdAef76Ioam9aQUUdcAqricwY/WUaMc4+7LY4eGg8=
golang.org/x/net v0.0.0-20210324205630-d1beb07c2056/go.mod h1:uSPa2vr4CLtc/ILN5odXGNXS6mhrKVzTaCXzk9m6W3k=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ=
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200728102440-3e129f6d46b1 h1:sIky/MyNRSHTrdxfsiUSS4WIAMvInbeXljJz+jDjeYE=
-golang.org/x/sys v0.0.0-20200728102440-3e129f6d46b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210324051608-47abb6519492 h1:Paq34FxTluEPvVyayQqMPgHm+vTOrIifmcYxFBx9TLg=
golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=