Fix CAP REQ to be atomic like the standard dictates.

[user/henk/code/inspircd.git] / src / modules / m_cap.h

diff --git a/src/modules/m_cap.h b/src/modules/m_cap.h
index 0fc782b97c6f9b53bf9c08837700eb3aba4cf740..23cf8cf69a748ef9a373340c1f3e5745b5340e2f 100644 (file)
--- a/src/modules/m_cap.h
+++ b/src/modules/m_cap.h
@@ -21,18 +21,25 @@
 #ifndef M_CAP_H
 #define M_CAP_H
 
-#include <map>
-#include <string>
+class GenericCap;
 
 class CapEvent : public Event
 {
  public:
-       irc::string type;
+       enum CapEventType
+       {
+               CAPEVENT_REQ,
+               CAPEVENT_LS,
+               CAPEVENT_LIST,
+               CAPEVENT_CLEAR
+       };
+
+       CapEventType type;
        std::vector<std::string> wanted;
        std::vector<std::string> ack;
+       std::vector<std::pair<GenericCap*, int> > changed; // HACK: clean this up before 2.2
        User* user;
-       Module* creator;
-       CapEvent(Module* sender, const std::string& t) : Event(sender, t) {}
+       CapEvent(Module* sender, User* u, CapEventType capevtype) : Event(sender, "cap_request"), type(capevtype), user(u) {}
 };
 
 class GenericCap
@@ -42,36 +49,42 @@ class GenericCap
        const std::string cap;
        GenericCap(Module* parent, const std::string &Cap) : ext("cap_" + Cap, parent), cap(Cap)
        {
-               ServerInstance->Extensions.Register(&ext);
+               ServerInstance->Modules->AddService(ext);
        }
 
        void HandleEvent(Event& ev)
        {
+               if (ev.id != "cap_request")
+                       return;
+
                CapEvent *data = static_cast<CapEvent*>(&ev);
-               if (ev.id == "cap_req")
+               if (data->type == CapEvent::CAPEVENT_REQ)
                {
-                       std::vector<std::string>::iterator it;
-                       if ((it = std::find(data->wanted.begin(), data->wanted.end(), cap)) != data->wanted.end())
+                       for (std::vector<std::string>::iterator it = data->wanted.begin(); it != data->wanted.end(); ++it)
                        {
-                               // we can handle this, so ACK it, and remove it from the wanted list
-                               data->ack.push_back(*it);
-                               data->wanted.erase(it);
-                               ext.set(data->user, 1);
+                               if (it->empty())
+                                       continue;
+                               bool enablecap = ((*it)[0] != '-');
+                               if (((enablecap) && (*it == cap)) || (*it == "-" + cap))
+                               {
+                                       // we can handle this, so ACK it, and remove it from the wanted list
+                                       data->ack.push_back(*it);
+                                       data->wanted.erase(it);
+                                       data->changed.push_back(std::make_pair(this, ext.set(data->user, enablecap ? 1 : 0)));
+                                       break;
+                               }
                        }
                }
-
-               if (ev.id == "cap_ls")
+               else if (data->type == CapEvent::CAPEVENT_LS)
                {
                        data->wanted.push_back(cap);
                }
-
-               if (ev.id == "cap_list")
+               else if (data->type == CapEvent::CAPEVENT_LIST)
                {
                        if (ext.get(data->user))
                                data->wanted.push_back(cap);
                }
-
-               if (ev.id == "cap_clear")
+               else if (data->type == CapEvent::CAPEVENT_CLEAR)
                {
                        data->ack.push_back("-" + cap);
                        ext.set(data->user, 0);