Changeset 73 in code for trunk/server.go

Timestamp:

Mar 4, 2020, 2:44:13 PM (5 years ago)

Author:

contact

Message:

Allow clients to specify an upstream name in their username

File:

• trunk/server.go (modified) (2 diffs)

trunk/server.go

@@ -83 +83 @@
 }
 
-func (u *user) getChannel(name string) (*upstreamChannel, error) {
+func (u *user) getChannel(name string, upstream *Upstream) (*upstreamChannel, error) {
         var channel *upstreamChannel
         var err error
         u.forEachUpstream(func(uc *upstreamConn) {
                 if err != nil {
+                        return
+                }
+                if upstream != nil && uc.upstream != upstream {
                         return
                 }
@@ -197 +200 @@
 }
 
+func (s *Server) getUpstream(name string) *Upstream {
+        for i, upstream := range s.Upstreams {
+                if upstream.Addr == name {
+                        return &s.Upstreams[i]
+                }
+        }
+        return nil
+}
+
 func (s *Server) Serve(ln net.Listener) error {
         for {