Changeset 684 in code for trunk/user.go

Timestamp:

Nov 15, 2021, 1:34:04 PM (4 years ago)

Author:

contact

Message:

Add support for MONITOR

Add support for MONITOR in single-upstream mode.

Each downstream has its own set of monitored targets. These sets
are merged together to compute the MONITOR commands to send to
upstream.

Each upstream has a set of monitored targets accepted by the server
alongside with their status (online/offline). This is used to
directly send replies to downstreams adding a target another
downstream has already added, and send MONITOR S[TATUS] replies.

Co-authored-by: delthas <delthas@…>

File:

• trunk/user.go (modified) (4 diffs)

trunk/user.go

@@ -343 +343 @@
         net.channels.SetCasemapping(newCasemap)
         net.delivered.m.SetCasemapping(newCasemap)
-        if net.conn != nil {
-                net.conn.channels.SetCasemapping(newCasemap)
-                for _, entry := range net.conn.channels.innerMap {
+        if uc := net.conn; uc != nil {
+                uc.channels.SetCasemapping(newCasemap)
+                for _, entry := range uc.channels.innerMap {
                         uch := entry.value.(*upstreamChannel)
                         uch.Members.SetCasemapping(newCasemap)
                 }
-        }
+                uc.monitored.SetCasemapping(newCasemap)
+        }
+        net.forEachDownstream(func(dc *downstreamConn) {
+                dc.monitored.SetCasemapping(newCasemap)
+        })
 }
 
@@ -520 +524 @@
 
                         uc.updateAway()
+                        uc.updateMonitor()
 
                         netIDStr := fmt.Sprintf("%v", uc.network.ID)
@@ -589 +594 @@
                         dc := e.dc
 
+                        if dc.network != nil {
+                                dc.monitored.SetCasemapping(dc.network.casemap)
+                        }
+
                         if err := dc.welcome(); err != nil {
                                 dc.logger.Printf("failed to handle new registered connection: %v", err)
@@ -621 +630 @@
                         u.forEachUpstream(func(uc *upstreamConn) {
                                 uc.updateAway()
+                                uc.updateMonitor()
                         })
                 case eventDownstreamMessage: