Merge remote-tracking branch 'fly/master'

place/notify.c

@@ -0,0 +1,16 @@
+// typical quiet pubsub place for receiving git2psyc notifications
+
+#include <net.h>
+
+#define NAME "notify"
+#define SILENT
+#define PLACE_HISTORY_EXPORT
+#define HISTORY_METHOD	"_notice_update"
+#define HISTORY_GLIMPSE 4
+
+// allow notifications from anywhere.. you may want to restrict this.
+// see wikinotify.c and http://about.psyc.eu/create_place about that.
+#define ALLOW_EXTERNAL
+
+#include <place.gen>
+

place/remotor.c

@@ -10,13 +10,14 @@
 #endif
 
 #define NAME	"remoTor"
-#define PRIVATE
+//#define PRIVATE
 #define SECURE
+#define SILENT
 //#define RESTRICTED
 
 #define PLACE_HISTORY_EXPORT
 #define HISTORY_GLIMPSE 7
-#define HISTORY_METHOD  "_warning_remotor"
+#define HISTORY_METHOD  "_notice"
 
 #ifdef BRAIN
 # define ALLOW_EXTERNAL_FROM	"psyc://psyced.org"

world/net/spyc/circuit.c

@@ -101,7 +101,7 @@ void sender_verification(string sourcehost, mixed targethost)
 
 // gets called during socket logon
 int logon(int failure) {
-    string t;
+    mixed t;
     sAuthHosts(([ ])); // reset authhosts 
     legal_senders = ([ ]);
     instate = ([ "_INTERNAL_origin" : ME ]);
@@ -140,7 +140,7 @@ int logon(int failure) {
     unless(isServer()) {
 	emit("|\n"); // initial greeting
 	if (sizeof(verify_queue)) {
-	    foreach(mixed t : verify_queue) {
+	    foreach(t : verify_queue) {
 		sender_verification(t[0], t[1]);
 	    }
 	    verify_queue = ({ });

world/net/spyc/psyc.h

@@ -39,7 +39,7 @@
 #define PSYCPARSE_STATE_GREET 3
 
 #define DISPATCHERROR(reason) { \
-    debug_message("SPYC DISPATCH ERROR: " reason);    \
+    debug_message("SPYC DISPATCH ERROR: " reason "\n");    \
     croak("_error_dispatch", "dispatch error: "       \
 	    reason);                                   \
     return;                                           \

world/net/user.c

@@ -758,6 +758,7 @@ case "_message_echo_private":
 		}
 		return 0; // dont walk into _message_public if !pal
 #else
+		if (!objectp(source)) vars["_nick_target"] = nick; //FIXME BETTER
 		break;
 #endif
 case "_message_public_question":