|
@@ -18,6 +18,7 @@ func (d *DefaultDialer) dialParallelInterface(ctx context.Context, dialer net.Di
|
|
|
if len(primaryInterfaces)+len(fallbackInterfaces) == 0 {
|
|
|
return nil, false, E.New("no available network interface")
|
|
|
}
|
|
|
+ defaultInterface := d.networkManager.InterfaceMonitor().DefaultInterface()
|
|
|
if fallbackDelay == 0 {
|
|
|
fallbackDelay = N.DefaultFallbackDelay
|
|
|
}
|
|
@@ -31,7 +32,9 @@ func (d *DefaultDialer) dialParallelInterface(ctx context.Context, dialer net.Di
|
|
|
results := make(chan dialResult) // unbuffered
|
|
|
startRacer := func(ctx context.Context, primary bool, iif adapter.NetworkInterface) {
|
|
|
perNetDialer := dialer
|
|
|
- perNetDialer.Control = control.Append(perNetDialer.Control, control.BindToInterface(nil, iif.Name, iif.Index))
|
|
|
+ if defaultInterface == nil || iif.Index != defaultInterface.Index {
|
|
|
+ perNetDialer.Control = control.Append(perNetDialer.Control, control.BindToInterface(nil, iif.Name, iif.Index))
|
|
|
+ }
|
|
|
conn, err := perNetDialer.DialContext(ctx, network, addr)
|
|
|
if err != nil {
|
|
|
select {
|
|
@@ -89,6 +92,7 @@ func (d *DefaultDialer) dialParallelInterfaceFastFallback(ctx context.Context, d
|
|
|
if len(primaryInterfaces)+len(fallbackInterfaces) == 0 {
|
|
|
return nil, false, E.New("no available network interface")
|
|
|
}
|
|
|
+ defaultInterface := d.networkManager.InterfaceMonitor().DefaultInterface()
|
|
|
if fallbackDelay == 0 {
|
|
|
fallbackDelay = N.DefaultFallbackDelay
|
|
|
}
|
|
@@ -103,7 +107,9 @@ func (d *DefaultDialer) dialParallelInterfaceFastFallback(ctx context.Context, d
|
|
|
results := make(chan dialResult) // unbuffered
|
|
|
startRacer := func(ctx context.Context, primary bool, iif adapter.NetworkInterface) {
|
|
|
perNetDialer := dialer
|
|
|
- perNetDialer.Control = control.Append(perNetDialer.Control, control.BindToInterface(nil, iif.Name, iif.Index))
|
|
|
+ if defaultInterface == nil || iif.Index != defaultInterface.Index {
|
|
|
+ perNetDialer.Control = control.Append(perNetDialer.Control, control.BindToInterface(nil, iif.Name, iif.Index))
|
|
|
+ }
|
|
|
conn, err := perNetDialer.DialContext(ctx, network, addr)
|
|
|
if err != nil {
|
|
|
select {
|
|
@@ -149,10 +155,13 @@ func (d *DefaultDialer) listenSerialInterfacePacket(ctx context.Context, listene
|
|
|
if len(primaryInterfaces)+len(fallbackInterfaces) == 0 {
|
|
|
return nil, E.New("no available network interface")
|
|
|
}
|
|
|
+ defaultInterface := d.networkManager.InterfaceMonitor().DefaultInterface()
|
|
|
var errors []error
|
|
|
for _, primaryInterface := range primaryInterfaces {
|
|
|
perNetListener := listener
|
|
|
- perNetListener.Control = control.Append(perNetListener.Control, control.BindToInterface(nil, primaryInterface.Name, primaryInterface.Index))
|
|
|
+ if defaultInterface == nil || primaryInterface.Index != defaultInterface.Index {
|
|
|
+ perNetListener.Control = control.Append(perNetListener.Control, control.BindToInterface(nil, primaryInterface.Name, primaryInterface.Index))
|
|
|
+ }
|
|
|
conn, err := perNetListener.ListenPacket(ctx, network, addr)
|
|
|
if err == nil {
|
|
|
return conn, nil
|
|
@@ -161,7 +170,9 @@ func (d *DefaultDialer) listenSerialInterfacePacket(ctx context.Context, listene
|
|
|
}
|
|
|
for _, fallbackInterface := range fallbackInterfaces {
|
|
|
perNetListener := listener
|
|
|
- perNetListener.Control = control.Append(perNetListener.Control, control.BindToInterface(nil, fallbackInterface.Name, fallbackInterface.Index))
|
|
|
+ if defaultInterface == nil || fallbackInterface.Index != defaultInterface.Index {
|
|
|
+ perNetListener.Control = control.Append(perNetListener.Control, control.BindToInterface(nil, fallbackInterface.Name, fallbackInterface.Index))
|
|
|
+ }
|
|
|
conn, err := perNetListener.ListenPacket(ctx, network, addr)
|
|
|
if err == nil {
|
|
|
return conn, nil
|