Changeset 276 in code for trunk/downstream.go

Timestamp:

Apr 29, 2020, 5:34:44 PM (5 years ago)

Author:

contact

Message:

Add support for away-notify

This makes use of cap-notify to dynamically advertise support for
away-notify. away-notify is advertised to downstream connections if all
upstreams support it.

File:

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

trunk/downstream.go

@@ -54 +54 @@
 // capabilities.
 var permanentDownstreamCaps = map[string]string{
-        "batch": "",
-        "cap-notify": "",
+        "batch":        "",
+        "cap-notify":   "",
         "echo-message": "",
         "message-tags": "",
-        "sasl": "PLAIN",
-        "server-time": "",
+        "sasl":         "PLAIN",
+        "server-time":  "",
 }
 
@@ -89 +89 @@
         logger := &prefixLogger{srv.Logger, fmt.Sprintf("downstream %q: ", netConn.RemoteAddr())}
         dc := &downstreamConn{
-                conn: *newConn(srv, netConn, logger),
-                id:   id,
+                conn:          *newConn(srv, netConn, logger),
+                id:            id,
                 supportedCaps: make(map[string]string),
-                caps: make(map[string]bool),
+                caps:          make(map[string]bool),
         }
         dc.hostname = netConn.RemoteAddr().String()
@@ -459 +459 @@
                 for k, v := range dc.supportedCaps {
                         if dc.capVersion >= 302 && v != "" {
-                                caps = append(caps, k + "=" + v)
+                                caps = append(caps, k+"="+v)
                         } else {
                                 caps = append(caps, k)
@@ -594 +594 @@
                 Params:  []string{replyTo, "DEL", name},
         })
+}
+
+func (dc *downstreamConn) updateSupportedCaps() {
+        awayNotifySupported := true
+        dc.forEachUpstream(func(uc *upstreamConn) {
+                awayNotifySupported = awayNotifySupported && uc.awayNotifySupported
+        })
+
+        if awayNotifySupported {
+                dc.setSupportedCap("away-notify", "")
+        } else {
+                dc.unsetSupportedCap("away-notify")
+        }
 }