X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=submit%2Fsubmitd.h;h=db7a62eccf92e01a27aa5df3cea848014e2b38f0;hb=1720c3b23dc805b9af4862a09b0d2f17859b9999;hp=e3ae41ed5dee0942f3a98a5a0e71c7c6d1c43ca6;hpb=40dcc618718643313b8f222717c4502ed33081fe;p=moe.git

diff --git a/submit/submitd.h b/submit/submitd.h
index e3ae41e..db7a62e 100644
--- a/submit/submitd.h
+++ b/submit/submitd.h
@@ -14,9 +14,14 @@
 #include <gnutls/gnutls.h>
 #include <gnutls/x509.h>
 
-struct access_rule {
+struct ip_node {
   cnode n;
   struct ip_addrmask addrmask;
+};
+
+struct access_rule {
+  cnode n;
+  clist ip_list;
   uns allow_admin;
   uns plain_text;
   uns max_conn;
@@ -26,12 +31,12 @@ struct conn {
   // Set up by the master process
   cnode n;
   u32 ip;
-  byte *ip_string;			// (xmalloced)
+  char *ip_string;			// (xmalloced)
   pid_t pid;
   uns id;
   struct access_rule *rule;		// Rule matched by this connection
   int sk;				// Client socket
-  byte *cert_name;			// Client name from the certificate (NULL if no TLS) (xmalloced)
+  char *cert_name;			// Client name from the certificate (NULL if no TLS) (xmalloced)
 
   // Used by the child process
   gnutls_session_t tls;			// TLS session
@@ -41,10 +46,12 @@ struct conn {
   struct odes *reply;
   struct odes *task_status;
   int task_lock_fd;
-  byte *user;
+  char *user;
 };
 
 extern uns max_request_size, max_attachment_size, trace_commands;
+extern uns max_versions;
+extern char *history_format;
 
 /* submitd.c */
 
@@ -59,7 +66,7 @@ int process_command(struct conn *c);
 
 struct task {
   cnode n;
-  byte *name;
+  char *name;
   uns open_data;	// Number of parts for open-data tasks
   uns max_size;		// Maximum size (0=use global default)
   clist parts;		// List of parts of this task (simp_nodes)
@@ -69,19 +76,19 @@ struct task {
 extern clist task_list;
 extern struct cf_section tasks_conf;
 
-struct task *task_find(byte *name);
-int part_exists_p(struct task *t, byte *name);
-int user_exists_p(byte *user);
-int ext_exists_p(struct task *t, byte *ext);
+struct task *task_find(char *name);
+int part_exists_p(struct task *t, char *name);
+int user_exists_p(char *user);
+int ext_exists_p(struct task *t, char *ext);
 
 void task_lock_status(struct conn *c);
 void task_unlock_status(struct conn *c, uns write_back);
 void task_load_status(struct conn *c);
 
 struct odes *task_status_find_task(struct conn *c, struct task *t, uns create);
-struct odes *task_status_find_part(struct odes *t, byte *part, uns create);
+struct odes *task_status_find_part(struct odes *t, char *part, uns create);
 
-void task_submit_part(byte *user, byte *task, byte *part, byte *ext, uns version, struct fastbuf *fb);
-void task_delete_part(byte *user, byte *task, byte *part, byte *ext, uns version);
+void task_submit_part(char *user, char *task, char *part, char *ext, uns version, struct fastbuf *fb);
+void task_delete_part(char *user, char *task, char *part, char *ext, uns version);
 
 #endif