Merge chanserv-live into default.

[irc/quakenet/newserv.git] / trusts / trusts.h

diff --git a/trusts/trusts.h b/trusts/trusts.h
index d7708734ce28c03b995e7067aa76778161247fbe..386cbe9579160199b016f4e8d67fb648102508db 100644 (file)
--- a/trusts/trusts.h
+++ b/trusts/trusts.h
@@ -18,15 +18,38 @@
 
 #define MAXTGEXTS 5
 
-#define MAXTRUSTEDFOR 50000
+#define MAXTRUSTEDFOR 5000
 #define MAXDURATION 365 * 86400 * 20
 #define MAXPERIDENT 1000
+#define MAXPERNODE 1000
 
 #define TABLES_REGULAR 0
 #define TABLES_MIGRATION 1
 #define TABLES_REPLICATION 2
 
-#define CLEANUP_TH_INACTIVE 30
+#define CLEANUP_TH_INACTIVE 60
+
+#define POLICY_GLINE_DURATION 1800
+
+#define POLICY_SUCCESS 0
+#define POLICY_FAILURE_NODECOUNT 1
+#define POLICY_FAILURE_GROUPCOUNT 2
+#define POLICY_FAILURE_IDENTD 3
+#define POLICY_FAILURE_IDENTCOUNT 4
+
+#define DEFAULT_TRUSTPORT 5776
+
+#define TRUST_ENFORCE_IDENT 1 /* This must be 1 for compatibility with O. */
+#define TRUST_NO_CLEANUP 2
+#define TRUST_PROTECTED 4
+#define TRUST_RELIABLE_USERNAME 8
+#define TRUST_UNTHROTTLE 16
+
+#define TRUST_MIN_UNPRIVILEGED_BITS_IPV4 (96 + 20)
+#define TRUST_MIN_UNPRIVILEGED_BITS_IPV6 32
+
+#define TRUST_MIN_UNPRIVILEGED_NODEBITS_IPV4 (96 + 24)
+#define TRUST_MIN_UNPRIVILEGED_NODEBITS_IPV6 48
 
 struct trustmigration;
 
@@ -61,8 +84,8 @@ typedef struct trustgroup {
 
   sstring *name;
   unsigned int trustedfor;
-  int mode;
-  unsigned int maxperident;
+  int flags;
+  int maxperident;
   unsigned int maxusage;
   time_t expires;
   time_t lastseen;
@@ -93,7 +116,6 @@ int trusts_fullyonline(void);
 
 /* formats.c */
 char *trusts_timetostr(time_t);
-char *trusts_cidr2str(struct irc_in_addr *ip, unsigned char);
 char *dumpth(trusthost *, int);
 char *dumptg(trustgroup *, int);
 int parseth(char *, trusthost *, unsigned int *, int);
@@ -120,6 +142,7 @@ unsigned int nexttgmarker(void);
 unsigned int nextthmarker(void);
 trusthost *th_getbyid(unsigned int);
 int tg_modify(trustgroup *, trustgroup *);
+int th_modify(trusthost *, trusthost *);
 
 /* migration.c */
 typedef void (*TrustMigrationGroup)(void *, trustgroup *);
@@ -138,6 +161,7 @@ trustgroup *tg_copy(trustgroup *);
 trusthost *th_copy(trusthost *);
 void tg_update(trustgroup *);
 void tg_delete(trustgroup *);
+void th_update(trusthost *);
 void th_delete(trusthost *);
 void trustlog(trustgroup *tg, const char *user, const char *format, ...);
 void trustlogspewid(nick *np, unsigned int groupid, unsigned int limit);
@@ -163,7 +187,6 @@ void trusts_lostnick(nick *, int);
 
 /* trusts_api.c */
 int istrusted(nick *);
-int trustgline(trustgroup *tg, const char *ident, int duration, const char *reason);
-int trustungline(trustgroup *tg, const char *ident, int duration, const char *reason);
+unsigned char getnodebits(struct irc_in_addr *ip);
 
 #endif