Bump quic-go (#241)

* Bump inet.af/netaddr

* Bump quic-go

* Remove unnecessary time.Duration

* Formatting changes to please linter

* Adapt to changes in quic http3 types

* Add nolint:contextcheck in some places

* Formatting changes in _examples dir too

* Comment out ifshort linter to avoid deprecation warning

* Revert duplicating comments

* Bump golangci version in setup_lint in Makefile

* Mention new Go version requirement in README

* Bump Go version in CI build task

* Bump machine and Go version in CI integration task

* Try building SCION and scion-apps with different versions of Go

* Try again, placing Go where I have permission

* Try again...

* Try the other way around, using old machine image, but newer Go for scion-apps

Author: leonrinkel

.circleci/config.yml

@@ -2,7 +2,7 @@ version: 2
 jobs:
   build:
     docker:
-      - image: cimg/go:1.17
+      - image: cimg/go:1.20
     steps:
       - run:
           name: Go version
@@ -92,6 +92,13 @@ jobs:
           name: Install libpam0g-dev
           command:
             sudo apt-get update && sudo apt-get install -y libpam0g-dev
+      # Use different Go version to build scion-apps
+      - run:
+          name: Install Go 1.20.7 to build scion-apps
+          command: |
+            wget https://go.dev/dl/go1.20.7.linux-amd64.tar.gz
+            sudo rm -rf /usr/local/go
+            sudo tar -C /usr/local -xzf go1.20.7.linux-amd64.tar.gz
       - run:
           name: Integration tests
           command: |

.golangci.yml

@@ -24,7 +24,7 @@ linters:
     - exportloopref
     - gci
     - gofmt
-    - ifshort
+    #- ifshort
     - importas
     - makezero
     - misspell

Makefile

@@ -38,7 +38,7 @@ test:
 
 setup_lint:
 	@# Install golangci-lint (as dumb as this looks, this is the recommended way to install)
-	curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b ${DESTDIR} v1.43.0
+	curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b ${DESTDIR} v1.53.3
 
 lint:
 	@type golangci-lint > /dev/null || ( echo "golangci-lint not found. Install it manually or by running 'make setup_lint'."; exit 1 )

README.md

@@ -17,7 +17,7 @@ sudo apt install scion-apps-*
 
 ### Build:
 
-1. Install go 1.16
+1. Install Go. We currently support Go versions 1.19 and 1.20.
 
     See e.g. https://github.com/golang/go/wiki/Ubuntu
 

_examples/.golangci.yml

@@ -24,7 +24,7 @@ linters:
     - exportloopref
     - gci
     - gofmt
-    - ifshort
+    #- ifshort
     - importas
     - makezero
     - misspell
@@ -47,4 +47,4 @@ linters-settings:
     default-signifies-exhaustive: true
 
 run:
-  build-tags: integration
+  build-tags: integration

_examples/go.mod

@@ -5,11 +5,11 @@ go 1.16
 require (
 	github.com/golang/protobuf v1.5.2
 	github.com/gorilla/handlers v1.5.1
-	github.com/lucas-clemente/quic-go v0.23.0
 	github.com/netsec-ethz/scion-apps v0.5.1-0.20220504120040-79211109ed3f
+	github.com/quic-go/quic-go v0.34.0
 	github.com/scionproto/scion v0.6.1-0.20220202161514-5883c725f748
 	google.golang.org/grpc v1.40.0
-	google.golang.org/protobuf v1.27.1
+	google.golang.org/protobuf v1.28.0
 	inet.af/netaddr v0.0.0-20230525184311-b8eac61e914a
 )
 

_examples/go.sum

@@ -24,9 +24,9 @@ import (
 	"os"
 	"time"
 
-	"github.com/lucas-clemente/quic-go"
 	"github.com/netsec-ethz/scion-apps/pkg/pan"
 	"github.com/netsec-ethz/scion-apps/pkg/quicutil"
+	"github.com/quic-go/quic-go"
 	"inet.af/netaddr"
 )
 
@@ -80,7 +80,7 @@ func runServer(listen netaddr.IPPort) error {
 	}
 }
 
-func workSession(session quic.Session) error {
+func workSession(session quic.Connection) error {
 	for {
 		stream, err := session.AcceptStream(context.Background())
 		if err != nil {

_examples/helloquic/helloquic.go

@@ -9,9 +9,9 @@ import (
 	"net"
 	"time"
 
-	"github.com/lucas-clemente/quic-go"
 	"github.com/netsec-ethz/scion-apps/pkg/pan"
 	"github.com/netsec-ethz/scion-apps/pkg/quicutil"
+	"github.com/quic-go/quic-go"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
 	"inet.af/netaddr"
@@ -31,7 +31,7 @@ func NewPanQuicDialer(tlsCfg *tls.Config) func(context.Context, string) (net.Con
 			return nil, err
 		}
 
-		clientQuicConfig := &quic.Config{KeepAlive: true}
+		clientQuicConfig := &quic.Config{KeepAlivePeriod: 15 * time.Second}
 		session, err := pan.DialQUIC(ctx, netaddr.IPPort{}, panAddr, nil, nil, "", tlsCfg, clientQuicConfig)
 		if err != nil {
 			return nil, fmt.Errorf("did not dial: %w", err)

_examples/sgrpc/client/main.go

@@ -180,8 +180,8 @@ func startBwtestBackground(serverCCAddr pan.UDPAddr, clientCCAddr pan.UDPAddr,
 
 // writeResponseN writes the response to an 'N' (new bandwidth test) request.
 // The waitTime field is
-//  - 0:   Ok, the test starts immediately
-//  - N>0: please try again in N seconds
+//   - 0:   Ok, the test starts immediately
+//   - N>0: please try again in N seconds
 func writeResponseN(ccConn net.PacketConn, addr net.Addr, waitTime byte) {
 	var response [2]byte
 	response[0] = 'N'
@@ -191,9 +191,9 @@ func writeResponseN(ccConn net.PacketConn, addr net.Addr, waitTime byte) {
 
 // writeResponseN writes the response to an 'R' (fetch results) request.
 // The code field is
-//  - 0:   Ok, the rest of the response is the encoded result
-//  - N>0: please try again in N seconds
-//  - 127: error, go away (why 127? I guess we have 7-bit bytes or something...)
+//   - 0:   Ok, the rest of the response is the encoded result
+//   - N>0: please try again in N seconds
+//   - 127: error, go away (why 127? I guess we have 7-bit bytes or something...)
 func writeResponseR(ccConn net.PacketConn, addr net.Addr, code byte, res *bwtest.Result) {
 	response := make([]byte, 2000)
 	response[0] = 'R'