Merge chanserv-live into default.

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

diff --git a/trusts/trusts.h b/trusts/trusts.h
index 3f3f14cc5914d97b6dfb755d996ceb3618b959cc..386cbe9579160199b016f4e8d67fb648102508db 100644 (file)
--- a/trusts/trusts.h
+++ b/trusts/trusts.h
@@ -18,7 +18,7 @@
 
 #define MAXTGEXTS 5
 
-#define MAXTRUSTEDFOR 50000
+#define MAXTRUSTEDFOR 5000
 #define MAXDURATION 365 * 86400 * 20
 #define MAXPERIDENT 1000
 #define MAXPERNODE 1000
@@ -29,10 +29,27 @@
 
 #define CLEANUP_TH_INACTIVE 60
 
-#define POLICY_GLINE_DURATION 18
+#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;
 
@@ -68,7 +85,7 @@ typedef struct trustgroup {
   sstring *name;
   unsigned int trustedfor;
   int flags;
-  unsigned int maxperident;
+  int maxperident;
   unsigned int maxusage;
   time_t expires;
   time_t lastseen;
@@ -99,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);