Tidy redirect.go

master
HimbeerserverDE 2021-03-02 17:37:40 +01:00
parent 9985e37274
commit aa12ddcee7
No known key found for this signature in database
GPG Key ID: 1A651504791E6A8B
1 changed files with 4 additions and 7 deletions

View File

@ -2,16 +2,13 @@ package main
import (
"encoding/binary"
"errors"
"fmt"
"log"
"net"
"github.com/anon55555/mt/rudp"
)
var ErrServerDoesNotExist = errors.New("server doesn't exist")
var ErrAlreadyConnected = errors.New("already connected to server")
var onRedirectDone []func(*Peer, string, bool)
// RegisterOnRedirectDone registers a callback function that is called
@ -48,11 +45,11 @@ func (p *Peer) Redirect(newsrv string) error {
straddr, ok := GetConfKey("servers:" + newsrv + ":address").(string)
if !ok {
return ErrServerDoesNotExist
return fmt.Errorf("server %s does not exist", newsrv)
}
if p.Server().Addr().String() == straddr {
return ErrAlreadyConnected
if p.ServerName() == newsrv {
return fmt.Errorf("already connected to server %s", newsrv)
}
srvaddr, err := net.ResolveUDPAddr("udp", straddr)