--- trunk/Mix/Src/chain.c	2003/05/03 13:54:51	508
+++ trunk/Mix/Src/chain.c	2003/05/05 10:53:00	509
@@ -6,7 +6,7 @@
    details.
 
    Prepare messages for remailer chain
-   $Id: chain.c,v 1.10 2003/05/03 06:15:09 weaselp Exp $ */
+   $Id: chain.c,v 1.11 2003/05/05 10:53:00 weaselp Exp $ */
 
 
 #include "mix3.h"
@@ -86,6 +86,16 @@
       badchains[lefti][righti] = 1;
     }
   }
+  /* If some broken chain includes all remailers (*) mark it broken for
+   * every single remailer - this simplifies handling in other places */
+  for (i=1; i < maxrem; i++ ) {
+    if (badchains[0][i])
+      for (j=1; j < maxrem; j++ )
+	badchains[j][i] = 1;
+    if (badchains[i][0])
+      for (j=1; j < maxrem; j++ )
+	badchains[i][j] = 1;
+  }
   fclose(list);
 }
 
@@ -190,10 +200,8 @@
 	(type == MSG_NULL || !remailer[i].flags.middle) &&   /* remailer is not middleman */
 	!remailer[i].flags.star_ex &&                        /* remailer is not excluded from random selection */
 	(remailer[i].flags.post || type != MSG_POST) &&      /* remailer supports post when this is a post */
-	((secondtolasthop == -1) ||
-	   (!badchains[secondtolasthop][i] &&
-	    !badchains[secondtolasthop][0] &&
-	    !badchains[0][i]));/* we only have hop or the previous one can send to this (may be random) */
+	((secondtolasthop == -1) || !badchains[secondtolasthop][i]);
+	                             /* we only have hop or the previous one can send to this (may be random) */
     num += select[i];
   }
   if (num == 0)
@@ -234,11 +242,8 @@
 	  !remailer[i].flags.star_ex &&                          /* remailer is not excluded from random selection */
 	  remailer[i].info[t].latency <= MAXLAT &&               /* remailer has small enough latency */
 	  !badchains[i][0] && !badchains[i][thischain[hop-1]] && /* remailer can send to the next one */
-	                      !badchains[0][thischain[hop-1]] &&
-	  (hop == chainlen-1 ||
-	     ( !badchains[thischain[hop+1]][i] &&
-	       !badchains[thischain[hop+1]][0] &&
-	       !badchains[0][i] ));/* we are at the first hop or the previous one can send to this (may be random) */
+	  (hop == chainlen-1 || !badchains[thischain[hop+1]][i]);
+	                           /* we are at the first hop or the previous one can send to this (may be random) */
 	randavail += select[i];
       }