Changeset 347 in code

Timestamp:

Jul 1, 2020, 3:02:37 PM (5 years ago)

Author:

contact

Message:

Add RemoteAddr to ircConn interface

Location:

trunk

Files:

• conn.go (modified) (3 diffs)
• downstream.go (modified) (1 diff)
• server.go (modified) (3 diffs)

trunk/conn.go

@@ -21 +21 @@
         SetReadDeadline(time.Time) error
         SetWriteDeadline(time.Time) error
+        RemoteAddr() net.Addr
 }
 
@@ -34 +35 @@
         conn                        *websocket.Conn
         readDeadline, writeDeadline time.Time
+        remoteAddr                  string
 }
 
-func newWebsocketIRCConn(c *websocket.Conn) ircConn {
-        return websocketIRCConn{conn: c}
+func newWebsocketIRCConn(c *websocket.Conn, remoteAddr string) ircConn {
+        return websocketIRCConn{conn: c, remoteAddr: remoteAddr}
 }
 
@@ -82 +84 @@
         wic.writeDeadline = t
         return nil
+}
+
+func (wic websocketIRCConn) RemoteAddr() net.Addr {
+        return websocketAddr(wic.remoteAddr)
+}
+
+type websocketAddr string
+
+func (websocketAddr) Network() string {
+        return "ws"
+}
+
+func (wa websocketAddr) String() string {
+        return string(wa)
 }
 

trunk/downstream.go

@@ -100 +100 @@
 }
 
-func newDownstreamConn(srv *Server, ic ircConn, remoteAddr string, id uint64) *downstreamConn {
+func newDownstreamConn(srv *Server, ic ircConn, id uint64) *downstreamConn {
+        remoteAddr := ic.RemoteAddr().String()
         logger := &prefixLogger{srv.Logger, fmt.Sprintf("downstream %q: ", remoteAddr)}
         dc := &downstreamConn{

trunk/server.go

@@ -118 +118 @@
 var lastDownstreamID uint64 = 0
 
-func (s *Server) handle(ic ircConn, remoteAddr string) {
+func (s *Server) handle(ic ircConn) {
         id := atomic.AddUint64(&lastDownstreamID, 1)
-        dc := newDownstreamConn(s, ic, remoteAddr, id)
+        dc := newDownstreamConn(s, ic, id)
         if err := dc.runUntilRegistered(); err != nil {
                 dc.logger.Print(err)
@@ -140 +140 @@
                 }
 
-                go s.handle(newNetIRCConn(conn), conn.RemoteAddr().String())
+                go s.handle(newNetIRCConn(conn))
         }
 }
@@ -169 +169 @@
         }
 
-        s.handle(newWebsocketIRCConn(conn), remoteAddr)
+        s.handle(newWebsocketIRCConn(conn, remoteAddr))
 }