From: pk910 <philipp@zoelle1.de>
Date: Wed, 26 Dec 2012 07:19:51 +0000 (+0100)
Subject: implemented custom KeepConn Time Mode (+K <time>) and relay command for external... 
X-Git-Url: http://git.pk910.de/?p=ircu2.10.12-pk.git;a=commitdiff_plain;h=0c50183c885701a84e7369ca05739fec052b7ecc

implemented custom KeepConn Time Mode (+K <time>) and relay command for external management (srvx)
---

diff --git a/include/client.h b/include/client.h
index a86633d..36060fe 100644
--- a/include/client.h
+++ b/include/client.h
@@ -138,6 +138,7 @@ enum Priv
     PRIV_UNLIMITED_TARGET, /**< unlimited target changes */
     PRIV_UMODE_OVERRIDECC, /**< can set umode +c (override cmodes +cC) */
     PRIV_NOAMSG_OVERRIDE, /**< can override the +M channelmode */
+    PRIV_SET_KEEPCONN, /**< can set KeepConn time by its own */
     PRIV_LAST_PRIV /**< number of privileges */
   };
 
@@ -192,6 +193,7 @@ enum Flag
     FLAG_WEBIRC,                    /**< Is a WebIRC client with spoofed host/ip */
     FLAG_SEE_IDLETIME,              /**< Can see idletime of +I users. */
 	FLAG_SECURITY_SERV,             /**< Securityflag, that can only be set by IAuth */
+    FLAG_KEEPCONN_ENABLED,          /**< special KeepConn time is set */
     FLAG_LAST_FLAG,                 /**< number of flags */
     FLAG_LOCAL_UMODES = FLAG_LOCOP, /**< First local mode flag */
     FLAG_GLOBAL_UMODES = FLAG_OPER  /**< First global mode flag */
@@ -277,7 +279,8 @@ struct Client {
   char cli_webirc[NICKLEN + 1];   /**< Contains the name of the WebIRC block */
   char           cli_yxx[4];      /**< Numeric Nick: YY if this is a
                                      server, XXX if this is a user */
-  unsigned int maxchans;
+  unsigned int maxchans : 8;
+  unsigned int keepconn : 24;
   char cli_connclass[NICKLEN + 1];
   time_t         cli_firsttime;   /**< time client was created */
   time_t         cli_lastnick;    /**< TimeStamp on nick */
@@ -649,10 +652,12 @@ struct Client {
 #define IsWebIRC(x)             HasFlag(x, FLAG_WEBIRC)
 /** Return non-zero if the client can see idletime of +I users. */
 #define IsSeeIdletime(x)        HasFlag(x, FLAG_SEE_IDLETIME)
-#define IsSecurityServ(x)        HasFlag(x, FLAG_SECURITY_SERV)
+#define IsSecurityServ(x)       HasFlag(x, FLAG_SECURITY_SERV)
+/** Return non-zero if the client has a special KeepConn Time set. */
+#define IsKeepConnEnabled(x)    HasFlag(x, FLAG_KEEPCONN_ENABLED)
 /** Return non-zero if the client has a fakehost. */
 #define IsFakeHost(x)           HasFlag(x, FLAG_FAKEHOST)
-#define IsFakeIdent(x)           HasFlag(x, FLAG_FAKEIDENT)
+#define IsFakeIdent(x)          HasFlag(x, FLAG_FAKEIDENT)
 
 /** Return non-zero if the client has operator or server privileges. */
 #define IsPrivileged(x)         (IsAnOper(x) || IsServer(x))
@@ -725,6 +730,8 @@ struct Client {
 /** Mark a client as being able to see idletime of +I users. */
 #define SetSeeIdletime(x)       SetFlag(x, FLAG_SEE_IDLETIME)
 #define SetSecurityServ(x)      SetFlag(x, FLAG_SECURITY_SERV)
+/** Mark a client as having a special KeepConn Time set. */
+#define SetKeepConnEnabled(x)   SetFlag(x, FLAG_KEEPCONN_ENABLED)
 
 /** Return non-zero if \a sptr sees \a acptr as an operator. */
 #define SeeOper(sptr,acptr) ((IsAnOper(acptr) && \
@@ -785,6 +792,8 @@ struct Client {
 /** Make client no longer being able to see idletime of +I users. */
 #define ClearSeeIdletime(x)     ClrFlag(x, FLAG_SEE_IDLETIME)
 #define ClearSecurityServ(x)    ClrFlag(x, FLAG_SECURITY_SERV)
+/** Remove the client's mark of having a special KeepConn Time set. */
+#define ClearKeepConnEnabled(x) ClrFlag(x, FLAG_KEEPCONN_ENABLED)
 
 /* free flags */
 #define FREEFLAG_SOCKET	0x0001	/**< socket needs to be freed */
diff --git a/ircd/ircd.c b/ircd/ircd.c
index ad6ae5f..2b6427d 100644
--- a/ircd/ircd.c
+++ b/ircd/ircd.c
@@ -343,11 +343,10 @@ static void check_pings(struct Event* ev) {
     /* We don't need to check zombies here */
     if (IsNotConn(cptr)) {
       assert(IsUser(cptr));
-      /* for now: reap after fixed time (5 minutes) */
-      if ((CurrentTime - cli_user(cptr)->last) >= 300) {
+      if ((CurrentTime - cli_user(cptr)->last) >= (IsKeepConnEnabled(cptr) ? cptr->keepconn : 300)) {
         SetFlag(cptr, FLAG_DEADSOCKET);
         /* this will be used as exit message */
-        ircd_strncpy(cli_info(cptr), "Ping timeout", REALLEN);
+        ircd_strncpy(cli_info(cptr), "Zombie timeout", REALLEN);
       } else
         continue;
     }
diff --git a/ircd/m_quit.c b/ircd/m_quit.c
index 9c06b31..0aff8f0 100644
--- a/ircd/m_quit.c
+++ b/ircd/m_quit.c
@@ -105,7 +105,7 @@ int m_quit(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
   assert(0 != sptr);
   assert(cptr == sptr);
 
-  if (!ircd_strcmp(parv[parc - 1], "ZOMBIE")) {
+  if (IsKeepConnEnabled(sptr) || !ircd_strcmp(parv[parc - 1], "ZOMBIE")) {
     zombie_client(&me, &me, sptr);
     return 0;
   }
diff --git a/ircd/m_relay.c b/ircd/m_relay.c
index 3f0dcf6..b31f7d7 100644
--- a/ircd/m_relay.c
+++ b/ircd/m_relay.c
@@ -240,8 +240,17 @@ signed int ms_relay(struct Client* cptr, struct Client* sptr, signed int parc, c
                 mode_a_check_altchan(acptr,chptr->mode.altchan);
             send_reply(acptr, ERR_JOINACCESS, parv[3], feature_str(FEAT_ERR_JOINACCESS));
         }
+    } else if(strcmp("KC", parv[2]) == 0 && parc > 2) {
+        struct Client *acptr;
+        if(acptr = findNUser(parv[1])) {
+            char *args[4];
+            args[0] = NULL;
+            args[1] = NULL;
+            args[2] = "+K";
+            args[3] = parv[3];
+            set_user_mode(sptr, acptr, 4, args, ALLOWMODES_ANY);
+        }
     }
-
     return 0;
 }
 
diff --git a/ircd/s_bsd.c b/ircd/s_bsd.c
index fb84276..542a412 100644
--- a/ircd/s_bsd.c
+++ b/ircd/s_bsd.c
@@ -967,7 +967,9 @@ void client_sock_callback(struct Event* ev)
 
   assert(0 == cptr || 0 == cli_connect(cptr) || con == cli_connect(cptr));
 
-  if (fallback) {
+  if (fallback && IsKeepConnEnabled(cptr)) {
+    zombie_client(&me, &me, cptr);
+  } else if (fallback) {
     const char* msg = (cli_error(cptr)) ? strerror(cli_error(cptr)) : fallback;
     if (!msg)
       msg = "Unknown error";
diff --git a/ircd/s_user.c b/ircd/s_user.c
index 96d88a1..6014487 100644
--- a/ircd/s_user.c
+++ b/ircd/s_user.c
@@ -589,6 +589,7 @@ static const struct UserMode {
   { FLAG_WEBIRC,      'W' },
   { FLAG_SEE_IDLETIME,'t' },
   { FLAG_SECURITY_SERV,'D' },
+  { FLAG_KEEPCONN_ENABLED, 'K' },
   { FLAG_HIDDENHOST,  'x' },
   { FLAG_NOTCONN,     'Z' }
 };
@@ -1135,7 +1136,7 @@ int set_user_mode(struct Client *cptr, struct Client *sptr, int parc,
   char buf[BUFSIZE];
   int prop = 0;
   int do_host_hiding = 0;
-  char* account = NULL, *fakehost = NULL;
+  char* account = NULL, *fakehost = NULL, *keepconn = NULL;
   struct Membership *chan;
 
   what = MODE_ADD;
@@ -1307,6 +1308,16 @@ int set_user_mode(struct Client *cptr, struct Client *sptr, int parc,
         else
           ClearWebIRC(sptr);
         break;
+      case 'K':
+        if (what == MODE_ADD) {
+          if(*(p + 1) == 0)
+            break;
+          keepconn = *(++p);
+          SetKeepConnEnabled(sptr);
+        } else {
+          ClearKeepConnEnabled(sptr);
+        }
+        break;
       case 'r':
         if (*(p + 1) && (what == MODE_ADD)) {
           account = *(++p);
@@ -1383,6 +1394,8 @@ int set_user_mode(struct Client *cptr, struct Client *sptr, int parc,
       ClearHiddenOper(sptr);
     if (!FlagHas(&setflags, FLAG_OVERRIDECC) && IsOverrideCC(sptr) && !HasPriv(sptr, PRIV_UMODE_OVERRIDECC))
       ClearOverrideCC(sptr);
+    if (!FlagHas(&setflags, FLAG_KEEPCONN_ENABLED) && IsKeepConnEnabled(sptr) && !HasPriv(sptr, PRIV_SET_KEEPCONN))
+      ClearKeepConnEnabled(sptr);
     /* Opers are able to fake the webirc usermode only if FEAT_FAKE_WEBIRC is true. */
     if (!FlagHas(&setflags, FLAG_WEBIRC) && IsWebIRC(sptr) && !(feature_bool(FEAT_FAKE_WEBIRC) && IsOper(sptr)))
       ClearWebIRC(sptr);
@@ -1443,6 +1456,9 @@ int set_user_mode(struct Client *cptr, struct Client *sptr, int parc,
   if (!FlagHas(&setflags, FLAG_FAKEHOST) && IsFakeHost(sptr)) {
     ircd_strncpy(cli_user(sptr)->fakehost, fakehost, HOSTLEN);
   }
+  if (!FlagHas(&setflags, FLAG_KEEPCONN_ENABLED) && IsKeepConnEnabled(sptr)) {
+    sptr->keepconn = atoi(keepconn);
+  }
 
   if (IsRegistered(sptr)) {
     if(do_host_hiding)