tris: fix mint interop

This commit is contained in:
Filippo Valsorda 2016-11-30 01:00:17 +00:00 committed by Peter Wu
parent 180bfdbd68
commit 2b667f2952
3 changed files with 7 additions and 4 deletions

View File

@ -24,7 +24,6 @@ matrix:
- env: MODE=interop CLIENT=boring REVISION=origin/master - env: MODE=interop CLIENT=boring REVISION=origin/master
- env: MODE=interop CLIENT=tstclnt ZRTT=1 # tstclnt races and doesn't resend - env: MODE=interop CLIENT=tstclnt ZRTT=1 # tstclnt races and doesn't resend
- env: MODE=interop CLIENT=tstclnt REVISION=default ZRTT=1 - env: MODE=interop CLIENT=tstclnt REVISION=default ZRTT=1
- env: MODE=interop CLIENT=mint # broken resumption client
install: install:
- if [ "$MODE" = "interop" ]; then ./_dev/tris-localserver/start.sh -d && docker ps -a; fi - if [ "$MODE" = "interop" ]; then ./_dev/tris-localserver/start.sh -d && docker ps -a; fi

View File

@ -7,9 +7,9 @@ RUN apk add --update \
RUN go get github.com/bifurcation/mint RUN go get github.com/bifurcation/mint
# Draft 18 # Draft 18
ARG REVISION=271abd1 ARG REVISION=52f9f98
RUN cd /go/src/github.com/bifurcation/mint && git fetch RUN cd /go/src/github.com/bifurcation/mint && git fetch https://github.com/FiloSottile/mint
RUN cd /go/src/github.com/bifurcation/mint && git checkout $REVISION RUN cd /go/src/github.com/bifurcation/mint && git checkout $REVISION
ADD mint-client.go /mint-client.go ADD mint-client.go /mint-client.go

View File

@ -10,9 +10,13 @@ import (
) )
func main() { func main() {
c := &mint.Config{
PSKs: &mint.PSKMapCache{},
}
tr := &http.Transport{ tr := &http.Transport{
DialTLS: func(network, addr string) (net.Conn, error) { DialTLS: func(network, addr string) (net.Conn, error) {
return mint.Dial(network, addr, nil) return mint.Dial(network, addr, c)
}, },
DisableKeepAlives: true, DisableKeepAlives: true,
} }