/*
* InspIRCd -- Internet Relay Chat Daemon
*
- * Copyright (C) 2015 Attila Molnar <attilamolnar@hush.com>
+ * Copyright (C) 2015-2016 Attila Molnar <attilamolnar@hush.com>
*
* This file is part of InspIRCd. InspIRCd is free software: you can
* redistribute it and/or modify it under the terms of the GNU General Public
namespace Numeric
{
class WriteNumericSink;
+ class WriteRemoteNumericSink;
template <char Sep, bool SendEmpty, typename Sink>
class GenericBuilder;
template <char Sep = ',', bool SendEmpty = false>
class Builder;
+
+ template <unsigned int NumStaticParams, bool SendEmpty, typename Sink>
+ class GenericParamBuilder;
+
+ template <unsigned int NumStaticParams, bool SendEmpty = false>
+ class ParamBuilder;
}
class Numeric::WriteNumericSink
{
}
- void operator()(unsigned int numeric, const std::string& params) const
+ void operator()(Numeric& numeric) const
+ {
+ user->WriteNumeric(numeric);
+ }
+};
+
+class Numeric::WriteRemoteNumericSink
+{
+ User* const user;
+
+ public:
+ WriteRemoteNumericSink(User* u)
+ : user(u)
+ {
+ }
+
+ void operator()(Numeric& numeric) const
{
- user->WriteNumeric(numeric, params);
+ user->WriteRemoteNumeric(numeric);
}
};
class Numeric::GenericBuilder
{
Sink sink;
- std::string data;
- const unsigned int numeric;
+ Numeric numeric;
const std::string::size_type max;
- std::string::size_type beginpos;
bool HasRoom(const std::string::size_type additional) const
{
- return (data.size() + additional <= max);
+ return (numeric.GetParams().back().size() + additional <= max);
}
public:
GenericBuilder(Sink s, unsigned int num, bool addparam = true, size_t additionalsize = 0)
: sink(s)
, numeric(num)
- , max(ServerInstance->Config->Limits.MaxLine - ServerInstance->Config->ServerName.size() - additionalsize - 9)
+ , max(ServerInstance->Config->Limits.MaxLine - ServerInstance->Config->ServerName.size() - additionalsize - 10)
{
if (addparam)
- data.push_back(':');
- SaveBeginPos();
+ numeric.push(std::string());
}
- std::string& GetNumeric() { return data; }
+ Numeric& GetNumeric() { return numeric; }
void Add(const std::string& entry)
{
if (!HasRoom(entry.size()))
Flush();
- data.append(entry).push_back(Sep);
+ numeric.GetParams().back().append(entry).push_back(Sep);
}
void Add(const std::string& entry1, const std::string& entry2)
{
if (!HasRoom(entry1.size() + entry2.size()))
Flush();
- data.append(entry1).append(entry2).push_back(Sep);
+ numeric.GetParams().back().append(entry1).append(entry2).push_back(Sep);
}
void Flush()
{
+ std::string& data = numeric.GetParams().back();
if (IsEmpty())
{
if (!SendEmpty)
data.erase(data.size()-1);
}
- sink(numeric, data);
- if (data.size() > beginpos)
- data.erase(beginpos);
+ sink(numeric);
+ data.clear();
}
- bool IsEmpty() const { return (data.size() == beginpos); }
- void SaveBeginPos() { beginpos = data.size(); }
+ bool IsEmpty() const { return (numeric.GetParams().back().empty()); }
};
template <char Sep, bool SendEmpty>
{
public:
Builder(LocalUser* user, unsigned int num, bool addparam = true, size_t additionalsize = 0)
- : GenericBuilder<Sep, SendEmpty, WriteNumericSink>(WriteNumericSink(user), num, addparam, additionalsize + user->nick.size())
+ : ::Numeric::GenericBuilder<Sep, SendEmpty, WriteNumericSink>(WriteNumericSink(user), num, addparam, additionalsize + user->nick.size())
+ {
+ }
+};
+
+template <unsigned int NumStaticParams, bool SendEmpty, typename Sink>
+class Numeric::GenericParamBuilder
+{
+ Sink sink;
+ Numeric numeric;
+ std::string::size_type currlen;
+ std::string::size_type max;
+
+ bool HasRoom(const std::string::size_type additional) const
+ {
+ return (currlen + additional <= max);
+ }
+
+ public:
+ GenericParamBuilder(Sink s, unsigned int num, size_t additionalsize)
+ : sink(s)
+ , numeric(num)
+ , currlen(0)
+ , max(ServerInstance->Config->Limits.MaxLine - ServerInstance->Config->ServerName.size() - additionalsize - 10)
+ {
+ }
+
+ void AddStatic(const std::string& entry)
+ {
+ max -= (entry.length() + 1);
+ numeric.GetParams().push_back(entry);
+ }
+
+ void Add(const std::string& entry)
+ {
+ if (!HasRoom(entry.size()))
+ Flush();
+
+ currlen += entry.size() + 1;
+ numeric.GetParams().push_back(entry);
+ }
+
+ void Flush()
+ {
+ if ((!SendEmpty) && (IsEmpty()))
+ return;
+
+ sink(numeric);
+ currlen = 0;
+ numeric.GetParams().erase(numeric.GetParams().begin() + NumStaticParams, numeric.GetParams().end());
+ }
+
+ bool IsEmpty() const { return (numeric.GetParams().size() <= NumStaticParams); }
+};
+
+template <unsigned int NumStaticParams, bool SendEmpty>
+class Numeric::ParamBuilder : public GenericParamBuilder<NumStaticParams, SendEmpty, WriteNumericSink>
+{
+ public:
+ ParamBuilder(LocalUser* user, unsigned int num)
+ : ::Numeric::GenericParamBuilder<NumStaticParams, SendEmpty, WriteNumericSink>(WriteNumericSink(user), num, user->nick.size())
{
}
};