更新到最新版quic-go

.travis.yml

@@ -1,7 +1,7 @@
 language: go
 
 go:
-- 1.9
+- "1.10"
 
 before_install:
 - go get github.com/Kisesy/gscan_quic

config.json

@@ -68,7 +68,7 @@
 		// 3: 测试 HTTP 连接
 		// 4: 验证是否是 NoSuchBucket 错误
 		// (2.x版默认等级为3, 所以如果lv2搜到的IP不能用, 可以改为 3)
-		"Level": 3,
+		"Level": 4,
 	},
 
 	// 暂时只支持 google IP

quic.go

@@ -11,8 +11,8 @@ import (
 	"strings"
 	"time"
 
-	quic "github.com/phuslu/quic-go"
-	"github.com/phuslu/quic-go/h2quic"
+	quic "github.com/lucas-clemente/quic-go"
+	"github.com/lucas-clemente/quic-go/h2quic"
 )
 
 var errNoSuchBucket = []byte("<?xml version='1.0' encoding='UTF-8'?><Error><Code>NoSuchBucket</Code><Message>The specified bucket does not exist.</Message></Error>")
@@ -54,7 +54,7 @@ func testQuic(ip string, config *ScanConfig, record *ScanRecord) bool {
 
 	// lv1 只会验证证书是否存在
 	cs := quicSessn.ConnectionState()
-	if cs == nil {
+	if !cs.HandshakeComplete {
 		return false
 	}
 	pcs := cs.PeerCertificates
@@ -75,17 +75,16 @@ func testQuic(ip string, config *ScanConfig, record *ScanRecord) bool {
 		tr := &h2quic.RoundTripper{DisableCompression: true}
 		defer tr.Close()
 
-		tr.DialAddr = func(hostname string, tlsConfig *tls.Config, config *quic.Config) (quic.Session, error) {
+		tr.Dial = func(network, addr string, tlsCfg *tls.Config, cfg *quic.Config) (quic.Session, error) {
 			return quicSessn, err
 		}
 		// 设置超时
-		udpConn.SetReadDeadline(time.Now().Add(config.ScanMaxRTT - time.Since(start)))
 		hclient := &http.Client{
 			Transport: tr,
 			CheckRedirect: func(req *http.Request, via []*http.Request) error {
 				return http.ErrUseLastResponse
 			},
-			// Timeout: config.ScanMaxRTT - time.Since(start),
+			Timeout: config.ScanMaxRTT - time.Since(start),
 		}
 		url := "https://" + config.HTTPVerifyHosts[rand.Intn(len(config.HTTPVerifyHosts))]
 		req, _ := http.NewRequest(http.MethodGet, url, nil)

scan.go

@@ -62,8 +62,11 @@ func testip(ip string, config *ScanConfig) *ScanRecord {
 func testip_worker(ctx context.Context, ch chan string, gcfg *GScanConfig, cfg *ScanConfig, srs *ScanRecords, wg *sync.WaitGroup) {
 	defer wg.Done()
 
-	ticker := time.NewTimer(cfg.ScanMaxRTT + 100*time.Millisecond)
-	defer ticker.Stop()
+	timer := time.NewTimer(cfg.ScanMaxRTT + 100*time.Millisecond)
+	defer timer.Stop()
+
+	ctx, cancal := context.WithCancel(ctx)
+	defer cancal()
 
 	for ip := range ch {
 		srs.IncScanCounter()
@@ -91,11 +94,11 @@ func testip_worker(ctx context.Context, ch chan string, gcfg *GScanConfig, cfg *
 			done <- struct{}{}
 		}()
 
-		ticker.Reset(cfg.ScanMaxRTT + 100*time.Millisecond)
+		timer.Reset(cfg.ScanMaxRTT + 100*time.Millisecond)
 		select {
 		case <-ctx.Done():
 			return
-		case <-ticker.C:
+		case <-timer.C:
 			log.Println(ip, "timeout")
 		case <-done:
 		}

sni.go

@@ -29,7 +29,7 @@ func testSni(ip string, config *ScanConfig, record *ScanRecord) bool {
 		}
 		if config.Level > 1 {
 			pcs := tlsconn.ConnectionState().PeerCertificates
-			if pcs == nil || len(pcs) == 0 || pcs[0].Subject.CommonName != serverName {
+			if len(pcs) == 0 || pcs[0].Subject.CommonName != serverName {
 				tlsconn.Close()
 				return false
 			}

tls.go

@@ -15,7 +15,7 @@ import (
 var (
 	g2pkp, _ = base64.StdEncoding.DecodeString("MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnCoEd1zYUJE6BqOC4NhQSLyJP/EZcBqIRn7gj8Xxic4h7lr+YQ23MkSJoHQLU09VpM6CYpXu61lfxuEFgBLEXpQ/vFtIOPRT9yTm+5HpFcTP9FMN9Er8n1Tefb6ga2+HwNBQHygwA0DaCHNRbH//OjynNwaOvUsRBOt9JN7m+fwxcfuU1WDzLkqvQtLL6sRqGrLMU90VS4sfyBlhH82dqD5jK4Q1aWWEyBnFRiL4U5W+44BKEMYq7LqXIBHHOZkQBKDwYXqVJYxOUnXitu0IyhT8ziJqs07PRgOXlwN+wLHee69FM8+6PnG33vQlJcINNYmdnfsOEXmJHjfFr45yaQIDAQAB")
 	g3pkp, _ = base64.StdEncoding.DecodeString("MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAylJL6h7/ziRrqNpyGGjVVl0OSFotNQl2Ws+kyByxqf5TifutNP+IW5+75+gAAdw1c3UDrbOxuaR9KyZ5zhVACu9RuJ8yjHxwhlJLFv5qJ2vmNnpiUNjfmonMCSnrTykUiIALjzgegGoYfB29lzt4fUVJNk9BzaLgdlc8aDF5ZMlu11EeZsOiZCx5wOdlw1aEU1pDbcuaAiDS7xpp0bCdc6LgKmBlUDHP+7MvvxGIQC61SRAPCm7cl/q/LJ8FOQtYVK8GlujFjgEWvKgaTUHFk5GiHqGL8v7BiCRJo0dLxRMB3adXEmliK+v+IO9p+zql8H4p7u2WFvexH6DkkCXgMwIDAQAB")
-	g3ecc, _ = base64.StdEncoding.DecodeString("MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEG4ANKJrwlpAPXThRcA3Z4XbkwQvWhj5J/kicXpbBQclS4uyuQ5iSOGKcuCRt8ralqREJXuRsnLZo0sIT680+VQ==")
+	// g3ecc, _ = base64.StdEncoding.DecodeString("MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEG4ANKJrwlpAPXThRcA3Z4XbkwQvWhj5J/kicXpbBQclS4uyuQ5iSOGKcuCRt8ralqREJXuRsnLZo0sIT680+VQ==")
 )
 
 func testTls(ip string, config *ScanConfig, record *ScanRecord) bool {