* Add an AllFloors parameter to the citadel IPC API

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 653c06ee41555dfcc883d28018cdc2fed2e39e3c..d12e2163bc71a789c4399eac9e5503bb8718eebc 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,7 @@
  $Log$
+ Revision 601.101  2003/01/05 07:35:03  error
+ * Add an AllFloors parameter to the citadel IPC API
+
  Revision 601.100  2003/01/01 08:07:46  error
  * commands.c: bugfix for reading from FILE pointers; affected quote, print
    and external editor.
@@ -4346,3 +4349,4 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import
+

diff --git a/citadel/Makefile.in b/citadel/Makefile.in
index 5ab914811c071994fd3e414130fa43bc95f6e50f..95bbcba384a3aa76fec582e4da4d548943decdf2 100644 (file)
--- a/citadel/Makefile.in
+++ b/citadel/Makefile.in
@@ -110,15 +110,13 @@ serv_modules: $(SERV_MODULES)
 #
 #
 
-citadel$(EXEEXT): ipc_c_tcp.o citadel.o rooms.o routines.o \
-       routines2.o messages.o screen.o citadel_ipc.o \
-       client_passwords.o md5.o html.o \
-       commands.o client_chat.o tools.o $(LIBOBJS)
-       $(CC) ipc_c_tcp.o citadel.o rooms.o routines.o \
-       routines2.o messages.o screen.o citadel_ipc.o \
-       commands.o client_chat.o tools.o html.o \
-       client_passwords.o md5.o \
-       $(LIBOBJS) $(LDFLAGS) -o citadel $(LIBS)
+citadel$(EXEEXT): citadel.o citadel_ipc.o client_chat.o client_passwords.o \
+       commands.o html.o ipc_c_tcp.o md5.o messages.o rooms.o routines.o \
+       routines2.o screen.o sstring.o tools.o $(LIBOBJS)
+       $(CC) citadel.o citadel_ipc.o client_chat.o client_passwords.o \
+       commands.o html.o ipc_c_tcp.o md5.o messages.o rooms.o routines.o \
+       routines2.o screen.o sstring.o tools.o $(LIBOBJS) \
+       $(LDFLAGS) -o citadel $(LIBS)
 
 .y.c:
        $(YACC) $(YFLAGS) $<

diff --git a/citadel/citadel.c b/citadel/citadel.c
index be0a3740b496efc324605f05886ec59ca1786d1e..a260b42f4581ecd02a395765ec1c7c0292362e34 100644 (file)
--- a/citadel/citadel.c
+++ b/citadel/citadel.c
@@ -386,7 +386,7 @@ void dotgoto(CtdlIPC *ipc, char *towhere, int display_name, int fromungoto)
                best_match = 0;
                strcpy(bbb, "");
 
-               r = CtdlIPCKnownRooms(ipc, AllAccessibleRooms, -1, &march, aaa);
+               r = CtdlIPCKnownRooms(ipc, AllAccessibleRooms, AllFloors, &march, aaa);
                if (r / 100 == 1) {
                        /* Run the roomlist; free the data as we go */
                        struct march *mp = march;       /* Current */
@@ -498,7 +498,7 @@ void gotonext(CtdlIPC *ipc)
         * If it is, pop the first room off the list and go there.
         */
        if (march == NULL) {
-               r = CtdlIPCKnownRooms(ipc, SubscribedRoomsWithNewMessages, -1, &march, buf);
+               r = CtdlIPCKnownRooms(ipc, SubscribedRoomsWithNewMessages, AllFloors, &march, buf);
 /* add _BASEROOM_ to the end of the march list, so the user will end up
  * in the system base room (usually the Lobby>) at the end of the loop
  */
@@ -758,8 +758,9 @@ void get_serv_info(CtdlIPC *ipc, char *supplied_hostname)
        /* be nice and identify ourself to the server */
        CtdlIPCIdentifySoftware(ipc, SERVER_TYPE, 0, REV_LEVEL,
                 (ipc->isLocal ? "local" : CITADEL),
-                (supplied_hostname) ? supplied_hostname : "", buf);
-                /* (locate_host(buf), buf)); */
+                (supplied_hostname) ? supplied_hostname : 
+                /* Look up the , in the bible if you're confused */
+                (locate_host(buf), buf), buf);
 
        /* Tell the server what our preferred content formats are */
        if ((CtdlIPCSpecifyPreferredFormats(ipc, buf, "text/html|text/plain") / 100 )== 2) {

diff --git a/citadel/citadel_ipc.h b/citadel/citadel_ipc.h
index 50814094043d286427051e5d9c547ba2003ee55a..a7e1b7b0ac58a079943e5f5d178bb77251559b9e 100644 (file)
--- a/citadel/citadel_ipc.h
+++ b/citadel/citadel_ipc.h
@@ -131,6 +131,7 @@ enum RoomList {
        AllAccessibleRooms,
        AllPublicRooms,
 };
+#define AllFloors -1
        
 /* Shared Diffie-Hellman parameters */
 #define DH_P           "1A74527AEE4EE2568E85D4FB2E65E18C9394B9C80C42507D7A6A0DBE9A9A54B05A9A96800C34C7AA5297095B69C88901EEFD127F969DCA26A54C0E0B5C5473EBAEB00957D2633ECAE3835775425DE66C0DE6D024DBB17445E06E6B0C78415E589B8814F08531D02FD43778451E7685541079CFFB79EF0D26EFEEBBB69D1E80383"