sad/soju
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add context to upstreamConn.register

Browse Source
This commit is contained in:
Simon Ser 2022-02-08 16:38:34 +01:00
parent 375ac53f74
commit e72c896bb4
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
upstream.go
View File

@ -1916,9 +1916,7 @@ func splitSpace(s string) []string {
}) })
} }
func (uc *upstreamConn) register() { func (uc *upstreamConn) register(ctx context.Context) {
ctx := context.TODO()
uc.nick = GetNick(&uc.user.User, &uc.network.Network) uc.nick = GetNick(&uc.user.User, &uc.network.Network)
uc.nickCM = uc.network.casemap(uc.nick) uc.nickCM = uc.network.casemap(uc.nick)
uc.username = GetUsername(&uc.user.User, &uc.network.Network) uc.username = GetUsername(&uc.user.User, &uc.network.Network)

2
user.go
View File

@ -220,7 +220,7 @@ func (net *network) run() {
net.user.srv.Identd.Store(uc.RemoteAddr().String(), uc.LocalAddr().String(), userIdent(&net.user.User)) net.user.srv.Identd.Store(uc.RemoteAddr().String(), uc.LocalAddr().String(), userIdent(&net.user.User))
} }
uc.register() uc.register(context.TODO())
if err := uc.runUntilRegistered(context.TODO()); err != nil { if err := uc.runUntilRegistered(context.TODO()); err != nil {
text := err.Error() text := err.Error()
temp := true temp := true