summaryrefslogtreecommitdiff
path: root/src/modules/m_spanningtree
diff options
context:
space:
mode:
authorAttila Molnar <attilamolnar@hush.com>2013-05-21 17:09:56 -0700
committerAttila Molnar <attilamolnar@hush.com>2013-05-21 17:09:56 -0700
commit4710844dcae83f54acd89d84a9c8dad607dfa17d (patch)
treef0f10444087fcf5b5c63c7ed1a672cb6ff550f5a /src/modules/m_spanningtree
parent994787e907cee7f6ed1b8f0ddbec95900a0f470a (diff)
parent48033e9b3a708f265c0bc2d62460a6cefa70dd45 (diff)
Merge pull request #522 from SaberUK/master+xline-displayable
Convert XLine::Displayable to return a std::string.
Diffstat (limited to 'src/modules/m_spanningtree')
-rw-r--r--src/modules/m_spanningtree/netburst.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/modules/m_spanningtree/netburst.cpp b/src/modules/m_spanningtree/netburst.cpp
index c22ad3acb..639a397c6 100644
--- a/src/modules/m_spanningtree/netburst.cpp
+++ b/src/modules/m_spanningtree/netburst.cpp
@@ -120,7 +120,6 @@ void TreeSocket::SendFJoins(Channel* c)
void TreeSocket::SendXLines()
{
char data[MAXBUF];
- const char* sn = ServerInstance->Config->GetSID().c_str();
std::vector<std::string> types = ServerInstance->XLines->GetAllTypes();
@@ -140,7 +139,10 @@ void TreeSocket::SendXLines()
if (!i->second->IsBurstable())
break;
- snprintf(data,MAXBUF,":%s ADDLINE %s %s %s %lu %lu :%s",sn, it->c_str(), i->second->Displayable(),
+ snprintf(data, MAXBUF, ":%s ADDLINE %s %s %s %lu %lu :%s",
+ ServerInstance->Config->GetSID().c_str(),
+ it->c_str(),
+ i->second->Displayable().c_str(),
i->second->source.c_str(),
(unsigned long)i->second->set_time,
(unsigned long)i->second->duration,