mirrors/uquic
1
0
Fork 0
mirror of https://github.com/refraction-networking/uquic.git synced 2025-04-04 04:37:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

proxy: remove QuicProxy.LocalPort method (#4920)

Browse source
This commit is contained in:
Marten Seemann 2025-01-25 04:18:22 +01:00 • committed by GitHub
parent 79003d1618
commit f5145eb627
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 6 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

3
integrationtests/self/http_test.go
View file

@ -870,7 +870,8 @@ func TestHTTP0RTT(t *testing.T) {
}
defer tr.Close()
req, err := http.NewRequest(http3.MethodGet0RTT, fmt.Sprintf("https://localhost:%d/0rtt", proxy.LocalPort()), nil)
proxyPort := proxy.LocalAddr().(*net.UDPAddr).Port
req, err := http.NewRequest(http3.MethodGet0RTT, fmt.Sprintf("https://localhost:%d/0rtt", proxyPort), nil)
require.NoError(t, err)
rsp, err := tr.RoundTrip(req)
require.NoError(t, err)

14
integrationtests/self/mitm_test.go
View file

@ -215,12 +215,7 @@ func runMITMTest(t *testing.T, serverTr, clientTr *quic.Transport, rtt time.Dura
ctx, cancel := context.WithTimeout(context.Background(), scaleDuration(time.Second))
defer cancel()
conn, err := clientTr.Dial(
ctx,
&net.UDPAddr{IP: net.IPv4(127, 0, 0, 1), Port: proxy.LocalPort()},
getTLSClientConfig(),
getQuicConfig(nil),
)
conn, err := clientTr.Dial(ctx, proxy.LocalAddr(), getTLSClientConfig(), getQuicConfig(nil))
require.NoError(t, err)
defer conn.CloseWithError(0, "")
@ -428,12 +423,7 @@ func runMITMTestSuccessful(t *testing.T, serverTransport, clientTransport *quic.
ctx, cancel := context.WithTimeout(context.Background(), scaleDuration(50*time.Millisecond))
defer cancel()
_, err = clientTransport.Dial(
ctx,
&net.UDPAddr{IP: net.IPv4(127, 0, 0, 1), Port: proxy.LocalPort()},
getTLSClientConfig(),
getQuicConfig(nil),
)
_, err = clientTransport.Dial(ctx, proxy.LocalAddr(), getTLSClientConfig(), getQuicConfig(nil))
require.Error(t, err)
return err
}

6
integrationtests/tools/proxy/proxy.go
View file

@ -209,6 +209,7 @@ func NewQuicProxy(local string, opts *Opts) (*QuicProxy, error) {
func (p *QuicProxy) Close() error {
p.mutex.Lock()
defer p.mutex.Unlock()
close(p.closeChan)
for _, c := range p.clientDict {
if err := c.ServerConn.Close(); err != nil {
@ -225,11 +226,6 @@ func (p *QuicProxy) LocalAddr() net.Addr {
return p.conn.LocalAddr()
}
// LocalPort is the UDP port number the proxy is listening on.
func (p *QuicProxy) LocalPort() int {
return p.conn.LocalAddr().(*net.UDPAddr).Port
}
func (p *QuicProxy) newConnection(cliAddr *net.UDPAddr) (*connection, error) {
conn, err := net.DialUDP("udp", nil, p.serverAddr)
if err != nil {

28
integrationtests/tools/proxy/proxy_test.go
View file

@ -2,9 +2,7 @@ package quicproxy
import (
"bytes"
"fmt"
"net"
"runtime"
"runtime/pprof"
"strconv"
"strings"
@ -49,27 +47,6 @@ func readPacketNumber(t *testing.T, b []byte) protocol.PacketNumber {
return extHdr.PacketNumber
}
func TestProxySetupt(t *testing.T) {
proxy, err := NewQuicProxy("localhost:0", nil)
require.NoError(t, err)
require.Len(t, proxy.clientDict, 0)
// Check that the proxy port is in use
addr, err := net.ResolveUDPAddr("udp", "localhost:"+strconv.Itoa(proxy.LocalPort()))
require.NoError(t, err)
_, err = net.ListenUDP("udp", addr)
if runtime.GOOS == "windows" {
require.EqualError(t, err, fmt.Sprintf("listen udp 127.0.0.1:%d: bind: Only one usage of each socket address (protocol/network address/port) is normally permitted.", proxy.LocalPort()))
} else {
require.EqualError(t, err, fmt.Sprintf("listen udp 127.0.0.1:%d: bind: address already in use", proxy.LocalPort()))
}
require.Equal(t, "127.0.0.1:"+strconv.Itoa(proxy.LocalPort()), proxy.LocalAddr().String())
require.NotZero(t, proxy.LocalPort())
require.NoError(t, proxy.Close())
}
func TestProxyShutdown(t *testing.T) {
isProxyRunning := func() bool {
var b bytes.Buffer
@ -79,7 +56,6 @@ func TestProxyShutdown(t *testing.T) {
proxy, err := NewQuicProxy("localhost:0", nil)
require.NoError(t, err)
port := proxy.LocalPort()
require.Eventually(t, func() bool { return isProxyRunning() }, time.Second, 10*time.Millisecond)
conn, err := net.DialUDP("udp", nil, proxy.LocalAddr().(*net.UDPAddr))
@ -90,11 +66,9 @@ func TestProxyShutdown(t *testing.T) {
require.NoError(t, proxy.Close())
// check that the proxy port is not in use anymore
addr, err := net.ResolveUDPAddr("udp", "localhost:"+strconv.Itoa(port))
require.NoError(t, err)
// sometimes it takes a while for the OS to free the port
require.Eventually(t, func() bool {
ln, err := net.ListenUDP("udp", addr)
ln, err := net.ListenUDP("udp", proxy.LocalAddr().(*net.UDPAddr))
if err != nil {
return false
}