Author: Isomer <isomer@coders.net>

[ircu2.10.12-pk.git] / ircd / m_away.c

diff --git a/ircd/m_away.c b/ircd/m_away.c
index db726ffce8c45998e0546db758ab8df2dc24ebcb..79127a30c8b9fba17d69fb975ca2759e8f9f73bd 100644 (file)
--- a/ircd/m_away.c
+++ b/ircd/m_away.c
@@ -89,6 +89,7 @@
 #endif /* 0 */
 #include "client.h"
 #include "ircd.h"
+#include "ircd_alloc.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
 #include "msg.h"
@@ -99,12 +100,61 @@
 
 #include <assert.h>
 
+/*
+ * user_set_away - set user away state
+ * returns 1 if client is away or changed away message, 0 if 
+ * client is removing away status.
+ * NOTE: this function may modify user and message, so they
+ * must be mutable.
+ */
+static int user_set_away(struct User* user, char* message)
+{
+  char* away;
+  assert(0 != user);
+
+  away = user->away;
+
+  if (EmptyString(message)) {
+    /*
+     * Marking as not away
+     */
+    if (away) {
+      MyFree(away);
+      user->away = 0;
+    }
+  }
+  else {
+    /*
+     * Marking as away
+     */
+    unsigned int len = strlen(message);
+
+    if (len > TOPICLEN) {
+      message[TOPICLEN] = '\0';
+      len = TOPICLEN;
+    }
+    if (away)
+      away = (char*) MyRealloc(away, len + 1);
+    else
+      away = (char*) MyMalloc(len + 1);
+    assert(0 != away);
+
+    user->away = away;
+    strcpy(away, message);
+  }
+  return (user->away != 0);
+}
+
+
 /*
  * m_away - generic message handler template
  * - Added 14 Dec 1988 by jto.
  *
  * parv[0] = sender prefix
  * parv[1] = away message
+ *
+ * TODO: Throttle aways - many people have a script which resets the away
+ *       message every 10 seconds which really chews the bandwidth.
  */
 int m_away(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
 {
@@ -113,7 +163,7 @@ int m_away(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
   assert(0 != cptr);
   assert(cptr == sptr);
 
-  if (user_set_away(sptr->user, away_message)) {
+  if (user_set_away(cli_user(sptr), away_message)) {
     sendcmdto_serv_butone(sptr, CMD_AWAY, cptr, ":%s", away_message);
     send_reply(sptr, RPL_NOWAWAY);
   }
@@ -141,9 +191,9 @@ int ms_away(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
    * servers can't set away
    */
   if (IsServer(sptr))
-    return 0;
+    return protocol_violation(sptr,"Server trying to set itself away");
 
-  if (user_set_away(sptr->user, away_message))
+  if (user_set_away(cli_user(sptr), away_message))
     sendcmdto_serv_butone(sptr, CMD_AWAY, cptr, ":%s", away_message);
   else
     sendcmdto_serv_butone(sptr, CMD_AWAY, cptr, "");