Fixes, including uqot, aqot, GDSS stuff, wildcards for gfsp.

[moira.git] / server / mr_server.h

diff --git a/server/mr_server.h b/server/mr_server.h
index def211c4815ec53d5e32c11fe6a45db4c8b12c18..22cef22d3de42556b8c5edabedf36fd9e4ee4efc 100644 (file)
--- a/server/mr_server.h
+++ b/server/mr_server.h
@@ -11,14 +11,14 @@
 #include <sys/uio.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
-#include "sms_proto.h"
-#include <sms_app.h>
+#include "mr_proto.h"
+#include <moira_site.h>
 #include <krb.h>
 
 typedef struct returned_tuples {
        struct returned_tuples *next;
        OPERATION op;
-       sms_params *retval;
+       mr_params *retval;
 } returned_tuples;
 
 /*
@@ -40,13 +40,13 @@ typedef struct _client {
        OPERATION pending_op;   /* Primary pending operation */
        CONNECTION con;         /* Connection to the client */
        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[MAX_K_NAME_SZ];/* Name client authenticated to */
        struct krbname kname;   /* Parsed version of the above */
-       int users_id;           /* SMS internal ID of authenticated user */
-       int client_id;          /* SMS internal ID of client for modby field */
+       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[9];         /* entity on other end of the connection */
@@ -90,7 +90,7 @@ extern int log_flags;
 extern int newqueries, oldqueries;
 
 /* Maximum and minimum values that will ever be chosen for IDs */
-#define MAX_ID_VALUE   32765
+#define MAX_ID_VALUE   31999
 #define MIN_ID_VALUE   100
 
 /* Sleepy states for the server! */
@@ -100,3 +100,7 @@ extern int newqueries, oldqueries;
 #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 */