mike/biboumi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

optional identd

Browse Source
This commit is contained in:
Ailin Nemui
2018-03-13 11:25:50 +01:00
parent 9b17a96187
commit cf618d5572
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main.cpp
+6 -4
View File
@@ -135,7 +135,9 @@ int main(int ac, char** av)
std::make_shared<BiboumiComponent>(p, hostname, password); std::make_shared<BiboumiComponent>(p, hostname, password);
xmpp_component->start(); xmpp_component->start();
IdentdServer identd(*xmpp_component, p, static_cast<uint16_t>(Config::get_int("identd_port", 113))); std::unique_ptr<IdentdServer> identd;
if (Config::get_int("identd_port", 113) != 0)
identd = std::make_unique<IdentdServer>(*xmpp_component, p, static_cast<uint16_t>(Config::get_int("identd_port", 113)));
auto timeout = TimedEventsManager::instance().get_timeout(); auto timeout = TimedEventsManager::instance().get_timeout();
while (p->poll(timeout) != -1) while (p->poll(timeout) != -1)
@@ -144,7 +146,7 @@ int main(int ac, char** av)
// Check for empty irc_clients (not connected, or with no joined // Check for empty irc_clients (not connected, or with no joined
// channel) and remove them // channel) and remove them
xmpp_component->clean(); xmpp_component->clean();
identd.clean(); if (identd) identd->clean();
if (stop) if (stop)
{ {
log_info("Signal received, exiting..."); log_info("Signal received, exiting...");
@@ -157,7 +159,7 @@ int main(int ac, char** av)
#ifdef UDNS_FOUND #ifdef UDNS_FOUND
dns_handler.destroy(); dns_handler.destroy();
#endif #endif
identd.shutdown(); if (identd) identd->shutdown();
// Cancel the timer for a potential reconnection // Cancel the timer for a potential reconnection
TimedEventsManager::instance().cancel("XMPP reconnection"); TimedEventsManager::instance().cancel("XMPP reconnection");
} }
@@ -199,7 +201,7 @@ int main(int ac, char** av)
#ifdef UDNS_FOUND #ifdef UDNS_FOUND
dns_handler.destroy(); dns_handler.destroy();
#endif #endif
identd.shutdown(); if (identd) identd->shutdown();
} }
} }
// If the only existing connection is the one to the XMPP component: // If the only existing connection is the one to the XMPP component: