X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fcontext.h;h=e76d7acb024a3cf7d676c34b126eb7ef9db42b7d;hb=1ab27069271df6ed100343866c93c0ef2eb2a888;hp=6d93249b93423e7fdbe6a7c2ddb672a314fb709b;hpb=f58faf3ad329f15d74f0ff1205942dcbedd9f57c;p=citadel.git

diff --git a/citadel/context.h b/citadel/context.h
index 6d93249b9..e76d7acb0 100644
--- a/citadel/context.h
+++ b/citadel/context.h
@@ -28,21 +28,14 @@ typedef enum __CCState {
 	CON_SYS                 /* This is a system context and mustn't be purged */
 } CCState;
 
-#ifndef __ASYNCIO__
-#define __ASYNCIO__
-typedef struct AsyncIO AsyncIO; /* forward declaration for event_client.h */
-#endif
 #ifndef __CIT_CONTEXT__
 #define __CIT_CONTEXT__
 typedef struct CitContext CitContext;
 #endif
 
 /*
- * Here's the big one... the Citadel context structure.
- *
  * This structure keeps track of all information relating to a running 
- * session on the server.  We keep one of these for each session thread.
- *
+ * session on the server.  We keep one of these for each session.
  */
 struct CitContext {
 	CitContext *prev;	/* Link to previous session in list */
@@ -50,21 +43,21 @@ struct CitContext {
 
 	int cs_pid;		/* session ID */
 	int dont_term;		/* for special activities like artv so we don't get killed */
-	double created;      /* time of birth */
+	double created;		/* time of birth */
 	time_t lastcmd;		/* time of last command executed */
 	time_t lastidle;	/* For computing idle time */
 	CCState state;		/* thread state (see CON_ values below) */
 	int kill_me;		/* Set to nonzero to flag for termination */
 
-	IOBuffer SendBuf, /* Our write Buffer */
-		RecvBuf, /* Our block buffered read buffer */
-		SBuf; /* Our block buffered read buffer for clients */
+	IOBuffer SendBuf,	/* Our write Buffer */
+		RecvBuf,	/* Our block buffered read buffer */
+		SBuf;		/* Our block buffered read buffer for clients */
 
-	StrBuf *MigrateBuf;        /* Our block buffered read buffer */
-	StrBuf *sMigrateBuf;        /* Our block buffered read buffer */
+	StrBuf *MigrateBuf;	/* Our block buffered read buffer */
+	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;
@@ -74,13 +67,11 @@ struct CitContext {
 #endif
 
 	char curr_user[USERNAME_SIZE];	/* name of current user */
-	int logged_in;		/* logged in */
-	int internal_pgm;	/* authenticated as internal program */
+	int logged_in;		/* logged in? */
+	int internal_pgm;	/* authenticated as internal program? */
 	int nologin;		/* not allowed to log in */
 	int curr_view;		/* The view type for the current user/room */
-	int is_master;		/* Is this session logged in using the master user? */
 
-	char net_node[32]	;/* Is the client another Citadel server? */
 	time_t previous_login;	/* Date/time of previous login */
 	char lastcmdname[5];	/* name of last command executed */
 	unsigned cs_flags;	/* miscellaneous flags */
@@ -100,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,8 +105,6 @@ struct CitContext {
 	char upl_comment[256];
 	char upl_filedir[PATH_MAX];
 	char upl_mimetype[64];
-	char dl_is_net;
-	char upload_type;
 
 	struct ctdluser user;	/* Database record buffers */
 	struct ctdlroom room;
@@ -124,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;
@@ -149,14 +134,11 @@ struct CitContext {
 	long *cached_msglist;			/* results of the previous CtdlForEachMessage() */
 	int cached_num_msgs;
 
-	AsyncIO *IO;				/* if this session has AsyncIO going on... */
+	char vcard_updated_by_ldap;		/* !0 iff ldap changed the vcard, treat as aide update */
 };
 
-
-
 #define CC MyContext()
 
-
 extern pthread_key_t MyConKey;			/* TSD key for MyContext() */
 extern int num_sessions;
 extern CitContext masterCC;
@@ -191,32 +173,7 @@ int CtdlTerminateOtherSession (int session_num);
  * Bind a thread to a context.  (It's inline merely to speed things up.)
  */
 static INLINE void become_session(CitContext *which_con) {
-/*
-	pid_t tid = syscall(SYS_gettid);
-*/
 	pthread_setspecific(MyConKey, (void *)which_con );
-/*
-	syslog(LOG_DEBUG, "[%d]: Now doing %s\n", 
-		      (int) tid, 
-		      ((which_con != NULL) && (which_con->ServiceName != NULL)) ? 
-		      which_con->ServiceName:"");
-*/
 }
 
-
-
-/* typedef void (*CtdlDbgFunction) (const int); */
-
-extern int DebugSession;
-#define CONDBGLOG(LEVEL) if ((LEVEL != LOG_DEBUG) || (DebugSession != 0))
-
-#define CON_syslog(LEVEL, FORMAT, ...)				\
-	CONDBGLOG(LEVEL) syslog(LEVEL,				\
-				"Context: " FORMAT, __VA_ARGS__)
-
-#define CONM_syslog(LEVEL, FORMAT)			\
-	CONDBGLOG(LEVEL) syslog(LEVEL,			\
-				"Context: " FORMAT);
-
-
 #endif /* CONTEXT_H */