* Allow multiple simultaneous IPC connections. All changes necessary for

[citadel.git] / citadel / citadel_ipc.h

diff --git a/citadel/citadel_ipc.h b/citadel/citadel_ipc.h
index 565c6e541cc6d3f42843dd5e2ef9a0845baa67ec..824befc61fd20810d8f5c3ba87f25421d40db013 100644 (file)
--- a/citadel/citadel_ipc.h
+++ b/citadel/citadel_ipc.h
@@ -1,5 +1,11 @@
 /* $Id$ */
 
+#include "ipc.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct ctdlipcroom {
        char RRname[ROOMNAMELEN];       /* Name of room */
        long RRunread;                  /* Number of unread messages */
@@ -54,118 +60,119 @@ struct ctdlipcmisc {
        char needvalid;                 /* Nonzero if users need validation */
 };
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-int CtdlIPCNoop(void);
-int CtdlIPCEcho(const char *arg, char *cret);
-int CtdlIPCQuit(void);
-int CtdlIPCLogout(void);
-int CtdlIPCTryLogin(const char *username, char *cret);
-int CtdlIPCTryPassword(const char *passwd, char *cret);
-int CtdlIPCCreateUser(const char *username, int selfservice, char *cret);
-int CtdlIPCChangePassword(const char *passwd, char *cret);
-int CtdlIPCKnownRooms(int which, int floor, struct march **listing, char *cret);
-int CtdlIPCGetConfig(struct usersupp **uret, char *cret);
-int CtdlIPCSetConfig(struct usersupp *uret, char *cret);
-int CtdlIPCGotoRoom(const char *room, const char *passwd,
+int CtdlIPCNoop(CtdlIPC *ipc);
+int CtdlIPCEcho(CtdlIPC *ipc, const char *arg, char *cret);
+int CtdlIPCQuit(CtdlIPC *ipc);
+int CtdlIPCLogout(CtdlIPC *ipc);
+int CtdlIPCTryLogin(CtdlIPC *ipc, const char *username, char *cret);
+int CtdlIPCTryPassword(CtdlIPC *ipc, const char *passwd, char *cret);
+int CtdlIPCCreateUser(CtdlIPC *ipc, const char *username, int selfservice, char *cret);
+int CtdlIPCChangePassword(CtdlIPC *ipc, const char *passwd, char *cret);
+int CtdlIPCKnownRooms(CtdlIPC *ipc, int which, int floor, struct march **listing, char *cret);
+int CtdlIPCGetConfig(CtdlIPC *ipc, struct usersupp **uret, char *cret);
+int CtdlIPCSetConfig(CtdlIPC *ipc, struct usersupp *uret, char *cret);
+int CtdlIPCGotoRoom(CtdlIPC *ipc, const char *room, const char *passwd,
                struct ctdlipcroom **rret, char *cret);
-int CtdlIPCGetMessages(int which, int whicharg, const char *template,
+int CtdlIPCGetMessages(CtdlIPC *ipc, int which, int whicharg, const char *template,
                long **mret, char *cret);
-int CtdlIPCGetSingleMessage(long msgnum, int headers, int as_mime,
+int CtdlIPCGetSingleMessage(CtdlIPC *ipc, long msgnum, int headers, int as_mime,
                struct ctdlipcmessage **mret, char *cret);
-int CtdlIPCWhoKnowsRoom(char **listing, char *cret);
-int CtdlIPCServerInfo(struct CtdlServInfo *ServInfo, char *cret);
-int CtdlIPCReadDirectory(char **listing, char *cret);
-int CtdlIPCSetLastRead(long msgnum, char *cret);
-int CtdlIPCInviteUserToRoom(const char *username, char *cret);
-int CtdlIPCKickoutUserFromRoom(const char *username, char *cret);
-int CtdlIPCGetRoomAttributes(struct quickroom **qret, char *cret);
-int CtdlIPCSetRoomAttributes(int forget, struct quickroom *qret, char *cret);
-int CtdlIPCGetRoomAide(char *cret);
-int CtdlIPCSetRoomAide(const char *username, char *cret);
-int CtdlIPCPostMessage(int flag, const struct ctdlipcmessage *mr, char *cret);
-int CtdlIPCRoomInfo(char **iret, char *cret);
-int CtdlIPCDeleteMessage(long msgnum, char *cret);
-int CtdlIPCMoveMessage(int copy, long msgnum, const char *destroom, char *cret);
-int CtdlIPCDeleteRoom(int for_real, char *cret);
-int CtdlIPCCreateRoom(int for_real, const char *roomname, int type,
+int CtdlIPCWhoKnowsRoom(CtdlIPC *ipc, char **listing, char *cret);
+int CtdlIPCServerInfo(CtdlIPC *ipc, struct CtdlServInfo *ServInfo, char *cret);
+int CtdlIPCReadDirectory(CtdlIPC *ipc, char **listing, char *cret);
+int CtdlIPCSetLastRead(CtdlIPC *ipc, long msgnum, char *cret);
+int CtdlIPCInviteUserToRoom(CtdlIPC *ipc, const char *username, char *cret);
+int CtdlIPCKickoutUserFromRoom(CtdlIPC *ipc, const char *username, char *cret);
+int CtdlIPCGetRoomAttributes(CtdlIPC *ipc, struct quickroom **qret, char *cret);
+int CtdlIPCSetRoomAttributes(CtdlIPC *ipc, int forget, struct quickroom *qret, char *cret);
+int CtdlIPCGetRoomAide(CtdlIPC *ipc, char *cret);
+int CtdlIPCSetRoomAide(CtdlIPC *ipc, const char *username, char *cret);
+int CtdlIPCPostMessage(CtdlIPC *ipc, int flag, const struct ctdlipcmessage *mr, char *cret);
+int CtdlIPCRoomInfo(CtdlIPC *ipc, char **iret, char *cret);
+int CtdlIPCDeleteMessage(CtdlIPC *ipc, long msgnum, char *cret);
+int CtdlIPCMoveMessage(CtdlIPC *ipc, int copy, long msgnum, const char *destroom, char *cret);
+int CtdlIPCDeleteRoom(CtdlIPC *ipc, int for_real, char *cret);
+int CtdlIPCCreateRoom(CtdlIPC *ipc, int for_real, const char *roomname, int type,
                const char *password, int floor, char *cret);
-int CtdlIPCForgetRoom(char *cret);
-int CtdlIPCSystemMessage(const char *message, char **mret, char *cret);
-int CtdlIPCNextUnvalidatedUser(char *cret);
-int CtdlIPCGetUserRegistration(const char *username, char **rret, char *cret);
-int CtdlIPCValidateUser(const char *username, int axlevel, char *cret);
-int CtdlIPCSetRoomInfo(int for_real, const char *info, char *cret);
-int CtdlIPCUserListing(char **list, char *cret);
-int CtdlIPCSetRegistration(const char *info, char *cret);
-int CtdlIPCMiscCheck(struct ctdlipcmisc *chek, char *cret);
-int CtdlIPCDeleteFile(const char *filename, char *cret);
-int CtdlIPCMoveFile(const char *filename, const char *destroom, char *cret);
-int CtdlIPCNetSendFile(const char *filename, const char *destnode, char *cret);
-int CtdlIPCOnlineUsers(char **listing, time_t *stamp, char *cret);
-int CtdlIPCFileDownload(const char *filename, void **buf, char *cret);
-int CtdlIPCAttachmentDownload(long msgnum, const char *part, void **buf,
+int CtdlIPCForgetRoom(CtdlIPC *ipc, char *cret);
+int CtdlIPCSystemMessage(CtdlIPC *ipc, const char *message, char **mret, char *cret);
+int CtdlIPCNextUnvalidatedUser(CtdlIPC *ipc, char *cret);
+int CtdlIPCGetUserRegistration(CtdlIPC *ipc, const char *username, char **rret, char *cret);
+int CtdlIPCValidateUser(CtdlIPC *ipc, const char *username, int axlevel, char *cret);
+int CtdlIPCSetRoomInfo(CtdlIPC *ipc, int for_real, const char *info, char *cret);
+int CtdlIPCUserListing(CtdlIPC *ipc, char **list, char *cret);
+int CtdlIPCSetRegistration(CtdlIPC *ipc, const char *info, char *cret);
+int CtdlIPCMiscCheck(CtdlIPC *ipc, struct ctdlipcmisc *chek, char *cret);
+int CtdlIPCDeleteFile(CtdlIPC *ipc, const char *filename, char *cret);
+int CtdlIPCMoveFile(CtdlIPC *ipc, const char *filename, const char *destroom, char *cret);
+int CtdlIPCNetSendFile(CtdlIPC *ipc, const char *filename, const char *destnode, char *cret);
+int CtdlIPCOnlineUsers(CtdlIPC *ipc, char **listing, time_t *stamp, char *cret);
+int CtdlIPCFileDownload(CtdlIPC *ipc, const char *filename, void **buf, char *cret);
+int CtdlIPCAttachmentDownload(CtdlIPC *ipc, long msgnum, const char *part, void **buf,
                char *cret);
-int CtdlIPCImageDownload(const char *filename, void **buf, char *cret);
-int CtdlIPCFileUpload(const char *filename, const char *comment, void *buf,
+int CtdlIPCImageDownload(CtdlIPC *ipc, const char *filename, void **buf, char *cret);
+int CtdlIPCFileUpload(CtdlIPC *ipc, const char *filename, const char *comment, void *buf,
                size_t bytes, char *cret);
-int CtdlIPCImageUpload(int for_real, const char *filename, size_t bytes,
+int CtdlIPCImageUpload(CtdlIPC *ipc, int for_real, const char *filename, size_t bytes,
                char *cret);
-int CtdlIPCQueryUsername(const char *username, char *cret);
-int CtdlIPCFloorListing(char **listing, char *cret);
-int CtdlIPCCreateFloor(int for_real, const char *name, char *cret);
-int CtdlIPCDeleteFloor(int for_real, int floornum, char *cret);
-int CtdlIPCEditFloor(int floornum, const char *floorname, char *cret);
-int CtdlIPCIdentifySoftware(int developerid, int clientid, int revision,
+int CtdlIPCQueryUsername(CtdlIPC *ipc, const char *username, char *cret);
+int CtdlIPCFloorListing(CtdlIPC *ipc, char **listing, char *cret);
+int CtdlIPCCreateFloor(CtdlIPC *ipc, int for_real, const char *name, char *cret);
+int CtdlIPCDeleteFloor(CtdlIPC *ipc, int for_real, int floornum, char *cret);
+int CtdlIPCEditFloor(CtdlIPC *ipc, int floornum, const char *floorname, char *cret);
+int CtdlIPCIdentifySoftware(CtdlIPC *ipc, int developerid, int clientid, int revision,
                const char *software_name, const char *hostname, char *cret);
-int CtdlIPCSendInstantMessage(const char *username, const char *text,
+int CtdlIPCSendInstantMessage(CtdlIPC *ipc, const char *username, const char *text,
                char *cret);
-int CtdlIPCGetInstantMessage(char **listing, char *cret);
-int CtdlIPCEnableInstantMessageReceipt(int mode, char *cret);
-int CtdlIPCSetBio(char *bio, char *cret);
-int CtdlIPCGetBio(const char *username, char **listing, char *cret);
-int CtdlIPCListUsersWithBios(char **listing, char *cret);
-int CtdlIPCStealthMode(int mode, char *cret);
-int CtdlIPCTerminateSession(int sid, char *cret);
-int CtdlIPCTerminateServerNow(char *cret);
-int CtdlIPCTerminateServerScheduled(int mode, char *cret);
-int CtdlIPCEnterSystemMessage(const char *filename, const char *text,
+int CtdlIPCGetInstantMessage(CtdlIPC *ipc, char **listing, char *cret);
+int CtdlIPCEnableInstantMessageReceipt(CtdlIPC *ipc, int mode, char *cret);
+int CtdlIPCSetBio(CtdlIPC *ipc, char *bio, char *cret);
+int CtdlIPCGetBio(CtdlIPC *ipc, const char *username, char **listing, char *cret);
+int CtdlIPCListUsersWithBios(CtdlIPC *ipc, char **listing, char *cret);
+int CtdlIPCStealthMode(CtdlIPC *ipc, int mode, char *cret);
+int CtdlIPCTerminateSession(CtdlIPC *ipc, int sid, char *cret);
+int CtdlIPCTerminateServerNow(CtdlIPC *ipc, char *cret);
+int CtdlIPCTerminateServerScheduled(CtdlIPC *ipc, int mode, char *cret);
+int CtdlIPCEnterSystemMessage(CtdlIPC *ipc, const char *filename, const char *text,
                char *cret);
-int CtdlIPCChangeHostname(const char *hostname, char *cret);
-int CtdlIPCChangeRoomname(const char *roomname, char *cret);
-int CtdlIPCChangeUsername(const char *username, char *cret);
-time_t CtdlIPCServerTime(char *crert);
-int CtdlIPCAideGetUserParameters(const char *who,
+int CtdlIPCChangeHostname(CtdlIPC *ipc, const char *hostname, char *cret);
+int CtdlIPCChangeRoomname(CtdlIPC *ipc, const char *roomname, char *cret);
+int CtdlIPCChangeUsername(CtdlIPC *ipc, const char *username, char *cret);
+time_t CtdlIPCServerTime(CtdlIPC *ipc, char *crert);
+int CtdlIPCAideGetUserParameters(CtdlIPC *ipc, const char *who,
                                 struct usersupp **uret, char *cret);
-int CtdlIPCAideSetUserParameters(const struct usersupp *uret, char *cret);
-int CtdlIPCGetMessageExpirationPolicy(int which, char *cret);
-int CtdlIPCSetMessageExpirationPolicy(int which, int policy, int value,
+int CtdlIPCAideSetUserParameters(CtdlIPC *ipc, const struct usersupp *uret, char *cret);
+int CtdlIPCGetMessageExpirationPolicy(CtdlIPC *ipc, int which, char *cret);
+int CtdlIPCSetMessageExpirationPolicy(CtdlIPC *ipc, int which, int policy, int value,
                char *cret);
-int CtdlGetSystemConfig(char **listing, char *cret);
-int CtdlSetSystemConfig(const char *listing, char *cret);
-int CtdlIPCModerateMessage(long msgnum, int level, char *cret);
-int CtdlIPCRequestClientLogout(int session, char *cret);
-int CtdlIPCSetMessageSeen(long msgnum, int seen, char *cret);
-int CtdlIPCStartEncryption(char *cret);
-int CtdlIPCDirectoryLookup(const char *address, char *cret);
-int CtdlIPCSpecifyPreferredFormats(char *cret, char *formats);
+int CtdlGetSystemConfig(CtdlIPC *ipc, char **listing, char *cret);
+int CtdlSetSystemConfig(CtdlIPC *ipc, const char *listing, char *cret);
+int CtdlGetSystemConfigByType(CtdlIPC *ipc, const char *mimetype,
+               char **listing, char *cret);
+int CtdlSetSystemConfigByType(CtdlIPC *ipc, const char *mimetype,
+              const char *listing, char *cret);
+int CtdlIPCModerateMessage(CtdlIPC *ipc, long msgnum, int level, char *cret);
+int CtdlIPCRequestClientLogout(CtdlIPC *ipc, int session, char *cret);
+int CtdlIPCSetMessageSeen(CtdlIPC *ipc, long msgnum, int seen, char *cret);
+int CtdlIPCStartEncryption(CtdlIPC *ipc, char *cret);
+int CtdlIPCDirectoryLookup(CtdlIPC *ipc, const char *address, char *cret);
+int CtdlIPCSpecifyPreferredFormats(CtdlIPC *ipc, char *cret, char *formats);
+int CtdlIPCInternalProgram(CtdlIPC *ipc, int secret, char *cret);
 
 /* ************************************************************************** */
 /*             Stuff below this line is not for public consumption            */
 /* ************************************************************************** */
 
-inline void netio_lock(void);
-inline void netio_unlock(void);
-char *CtdlIPCReadListing(char *dest);
-int CtdlIPCSendListing(const char *listing);
-size_t CtdlIPCPartialRead(void **buf, size_t offset, size_t bytes, char *cret);
-int CtdlIPCEndUpload(char *cret);
-int CtdlIPCWriteUpload(void *buf, size_t bytes, char *cret);
-int CtdlIPCEndDownload(char *cret);
-int CtdlIPCReadDownload(void **buf, size_t bytes, char *cret);
-int CtdlIPCGenericCommand(const char *command, const char *to_send,
+inline void CtdlIPC_lock(CtdlIPC *ipc);
+inline void CtdlIPC_unlock(CtdlIPC *ipc);
+char *CtdlIPCReadListing(CtdlIPC *ipc, char *dest);
+int CtdlIPCSendListing(CtdlIPC *ipc, const char *listing);
+size_t CtdlIPCPartialRead(CtdlIPC *ipc, void **buf, size_t offset, size_t bytes, char *cret);
+int CtdlIPCEndUpload(CtdlIPC *ipc, char *cret);
+int CtdlIPCWriteUpload(CtdlIPC *ipc, void *buf, size_t bytes, char *cret);
+int CtdlIPCEndDownload(CtdlIPC *ipc, char *cret);
+int CtdlIPCReadDownload(CtdlIPC *ipc, void **buf, size_t bytes, char *cret);
+int CtdlIPCGenericCommand(CtdlIPC *ipc, const char *command, const char *to_send,
                size_t bytes_to_send, char **to_receive,
                size_t *bytes_to_receive, char *proto_response);