fixed header again - tom

[moira.git] / server / mr_server.h

diff --git a/server/mr_server.h b/server/mr_server.h
index f25d46bf872183d24e4e355fb8bb650374dab3ff..2ceddd528dee4c23b9254a1fe47479924fc9b60b 100644 (file)
--- a/server/mr_server.h
+++ b/server/mr_server.h
@@ -11,13 +11,15 @@
 #include <sys/uio.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
-#include "sms_proto.h"
+#include "mr_proto.h"
+#include <moira_site.h>
 #include <krb.h>
+#include "malloc.h"
 
 typedef struct returned_tuples {
        struct returned_tuples *next;
        OPERATION op;
-       sms_params *retval;
+       mr_params *retval;
 } returned_tuples;
 
 /*
@@ -34,22 +36,21 @@ struct krbname {
  * This structure holds all per-client information; one of these is
  * allocated for each active client.
  */
-   
+
 typedef struct _client {
        OPERATION pending_op;   /* Primary pending operation */
        CONNECTION con;         /* Connection to the client */
-       int state;              /* XXX this is really superfluous and should */
-                               /* be removed */
        int action;             /* what action is pending? */
-       sms_params *args, reply;
+       mr_params *args, reply;
        int id;                 /* Unique id of client */
        struct sockaddr_in haddr; /* IP address of client */
-       char *clname;           /* Name client authenticated to */
-       int users_id;           /* SMS internal ID of authenticated user */
+       char clname[MAX_K_NAME_SZ];/* Name client authenticated to */
        struct krbname kname;   /* Parsed version of the above */
+       int users_id;           /* MR internal ID of authenticated user */
+       int client_id;          /* MR internal ID of client for modby field */
        returned_tuples *first, *last;
        time_t last_time_used;  /* Last time connection used */
-       char *entity;           /* entity on other end of the connection */
+       char entity[9];         /* entity on other end of the connection */
 } client;
 
 /*
@@ -80,11 +81,31 @@ extern int log_flags;
 #define LOG_ARGS               0x0004
 #define LOG_RESP               0x0008
 #define LOG_RES                        0x0010
+#define LOG_VALID              0x0020
+#define LOG_SQL                        0x0040
+#define LOG_GDSS               0x0080
 
 
 /* max length of query argument allowed */
-#define ARGLEN 128
+#define ARGLEN 257
+/* Used to setup static argv, maximum argc */
+#define QMAXARGS       22
 
 /* statistics on number of queries by version number */
 extern int newqueries, oldqueries;
 
+/* Maximum and minimum values that will ever be chosen for IDs */
+#define MAX_ID_VALUE   31999
+#define MIN_ID_VALUE   100
+
+/* Sleepy states for the server! */
+#define AWAKE 0
+#define SLEEPY 1
+#define ASLEEP 2
+#define GROGGY 3
+extern int dormant;
+
+/* state for the incremental update system */
+extern int inc_running, inc_pid;
+extern time_t inc_started, now;
+#define INC_TIMEOUT (3 * 60)   /* 3 minutes */