Changeset 690 for trunk/s2s/out.c

Timestamp:

20/08/08 10:50:40 (5 months ago)

Author:

smoku

Message:

Detecting unrecoverable stream errors on establishing an outgoing s2s connection. Refs #244

Files:

• trunk/s2s/out.c (modified) (1 diff)

trunk/s2s/out.c

@@ -1358 +1358 @@
             log_write(out->s2s->log, LOG_NOTICE, "[%d] [%s, port=%d] error: %s (%s)", out->fd->fd, out->ip, out->port, sxe->generic, sxe->specific);
 
-            if (!out->online) {
+            /* mark as bad if we did not manage to connect or there is unrecoverable stream error */
+            if (!out->online ||
+                    (sxe->code == SX_ERR_STREAM &&
+                        (strstr(sxe->specific, "host-gone") ||        /* it's not there now */
+                         strstr(sxe->specific, "host-unknown") ||     /* they do not service the host */
+                         strstr(sxe->specific, "not-authorized") ||   /* they do not want us there */
+                         strstr(sxe->specific, "see-other-host") ||   /* we do not support redirections yet */
+                         strstr(sxe->specific, "system-shutdown") ||  /* they are going down */
+                         strstr(sxe->specific, "unsupported-version") /* they do not support our stream version */
+                        )))
+            {
                 dnsres_t bad;
                 char *ipport;