give em ciphers

world/net/circuit.c

@@ -151,7 +151,7 @@ void pushback(string failmc) {
 					  // name in this case (especially if
 					  // we decide that source shouldn't
 					  // be the original target)?
-	       "Could not establish a circuit to [_host] in order to deliver a [_method_relay] to [_source].",
+	       0, // "Could not establish a circuit to [_host] in order to deliver a [_method_relay] to [_source].",
 	       ([ "_method_relay": t[1],
 		  "_data_relay" : t[2],
 		// we used to add the vars to the error message,

world/net/include/place.gen

@@ -502,6 +502,9 @@ enter(source, mc, data, vars) {
 	if (!((objectp(source) &&
 		// should use trustworthy level 9 instead? if so.. how?
 	       (query_ip_number(source) == "127.0.0.1"
+#  ifdef SECURE_IP_NUMBER
+	     || SECURE_IP_NUMBER(query_ip_number(source))
+#  endif
 	     || query_ip_number(source) == __HOST_IP_NUMBER__ ))
 #  if __EFUN_DEFINED__(tls_query_connection_state)
 		// psyc client.. may also one day be a psyc server, in that

world/net/psyc/circuit.c

@@ -212,7 +212,7 @@ int logon(int neverfails) {
 	if (tls_available() && tls_query_connection_state(ME) == 1) {
 	    if (t = tls_bad_cipher(ME, "psyc")) {
 		croak("_error_circuit_encryption_cipher",
-		  "Your cipher choice does not provide forward secrecy.",
+  "Your [_circuit_encryption_cipher] cipher does not provide forward secrecy.",
 		    ([ "_circuit_encryption_cipher": t ]));
 		QUIT
 	    }

world/net/spyc/circuit.c

@@ -121,7 +121,7 @@ int logon(int failure) {
 		    P0(("certinfo: %O\n", certinfo))
 		    if (t = tls_bad_cipher(ME, "psyc")) {
 			    croak("_error_circuit_encryption_cipher",
-		      "Your cipher choice does not provide forward secrecy.",
+  "Your [_circuit_encryption_cipher] cipher does not provide forward secrecy.",
 				([ "_circuit_encryption_cipher": t ]));
 			    //destruct(ME);
 		    }