The user principal identity is now used as the JID in all XMPP protocol stanzas.

[citadel.git] / citadel / context.h

diff --git a/citadel/context.h b/citadel/context.h
index 37ce184061791cad5179b058cda0e97209dab51e..e76d7acb024a3cf7d676c34b126eb7ef9db42b7d 100644 (file)
--- a/citadel/context.h
+++ b/citadel/context.h
@@ -57,7 +57,7 @@ struct CitContext {
        StrBuf *sMigrateBuf;    /* Our block buffered read buffer */
 
        int client_socket;
-       int is_local_socket;    /* set to 1 if client is on unix domain sock */
+       int is_local_client;    /* set to 1 if client is running on the same host */
        /* Redirect this session's output to a memory buffer? */
        StrBuf *redirect_buffer;                /* the buffer */
        StrBuf *StatusMessage;
@@ -91,6 +91,7 @@ struct CitContext {
        char cs_addr[64];       /* address logged in from */
 
        /* The Internet type of thing */
+       char cs_principal_id[256];              /* User principal identity for XMPP, ActivityPub, etc. */
        char cs_inet_email[128];                /* Return address of outbound Internet mail */
        char cs_inet_other_emails[1024];        /* User's other valid Internet email addresses */
        char cs_inet_fn[128];                   /* Friendly-name of outbound Internet mail */
@@ -113,11 +114,6 @@ struct CitContext {
        int disable_exp;        /* Set to 1 to disable incoming pages */
        int newmail;            /* Other sessions increment this */
 
-       /* Masqueraded values in the 'who is online' list */
-       char fake_username[USERNAME_SIZE];
-       char fake_hostname[64];
-       char fake_roomname[ROOMNAMELEN];
-
        /* Preferred MIME formats */
        char preferred_formats[256];
        int msg4_dont_decode;