#include "commands.h"
#include "xline.h"
#include "inspstring.h"
-#include "dnsqueue.h"
#include "helperfuncs.h"
#include "hashcomp.h"
#include "socketengine.h"
case X_ESTAB_DNS:
/* Handles instances of the Resolver class,
- * a simple class extended by modules for
+ * a simple class extended by modules and the core for
* nonblocking resolving of addresses.
*/
-
- dns_deal_with_classes(activefds[activefd]);
+ this->Res->MarshallReads(activefds[activefd]);
break;
case X_LISTEN:
}
stats->statsAccept++;
#ifdef IPV6
+ log(DEBUG,"Add ipv6 client");
AddClient(incomingSockfd, in_port, false, client.sin6_addr);
#else
+ log(DEBUG,"Add ipv4 client");
AddClient(incomingSockfd, in_port, false, client.sin_addr);
#endif
- log(DEBUG,"Adding client on port %lu fd=%lu",(unsigned long)in_port,(unsigned long)incomingSockfd);
+ log(DEBUG,"Adding client on port %d fd=%d",in_port,incomingSockfd);
}
else
{
- log(DEBUG,"Accept failed on fd %lu: %s",(unsigned long)incomingSockfd,strerror(errno));
+ log(DEBUG,"Accept failed on fd %d: %s",incomingSockfd,strerror(errno));
shutdown(incomingSockfd,2);
close(incomingSockfd);
stats->statsRefused++;
{
/* Until THIS point, ServerInstance == NULL */
- init_dns();
+ this->Res = new DNS();
LoadAllModules(this);
int main(int argc, char** argv)
{
- /* TEST SUITE FOR TOKENSTREAM
- *
- * Expected output:
- *
- * String: 'PRIVMSG #test FOO BAR'
- * Token 0 = 'PRIVMSG'
- * Token 1 = '#test'
- * Token 2 = 'FOO'
- * Token 3 = 'BAR'
- * String: 'PRIVMSG #test :FOO BAR BAZ'
- * Token 0 = 'PRIVMSG'
- * Token 1 = '#test'
- * Token 2 = 'FOO BAR BAZ'
- * String: ':PRIVMSG #test :FOO BAR BAZ'
- * Token 0 = ':PRIVMSG'
- * String: 'AAAAAAA'
- * Token 0 = 'AAAAAAA'
- * String: ''
- * NumItems = 0
- *
- std::string a = "PRIVMSG #test FOO BAR";
- printf("String: '%s'\n",a.c_str());
- irc::tokenstream test(a);
- printf("Token 0 = '%s'\n",test.GetToken().c_str());
- printf("Token 1 = '%s'\n",test.GetToken().c_str());
- printf("Token 2 = '%s'\n",test.GetToken().c_str());
- printf("Token 3 = '%s'\n",test.GetToken().c_str());
- printf("Token 4 = '%s'\n",test.GetToken().c_str());
-
- std::string b = "PRIVMSG #test :FOO BAR BAZ";
- printf("String: '%s'\n",b.c_str());
- irc::tokenstream test2(b);
- printf("Token 0 = '%s'\n",test2.GetToken().c_str());
- printf("Token 1 = '%s'\n",test2.GetToken().c_str());
- printf("Token 2 = '%s'\n",test2.GetToken().c_str());
- printf("Token 3 = '%s'\n",test2.GetToken().c_str());
-
- std::string c = ":PRIVMSG #test :FOO BAR BAZ";
- printf("String: '%s'\n",c.c_str());
- irc::tokenstream test3(c);
- printf("Token 0 = '%s'\n",test3.GetToken().c_str());
-
- c = "AAAAAAA";
- printf("String: '%s'\n",c.c_str());
- irc::tokenstream test4(c);
- printf("Token 0 = '%s'\n",test4.GetToken().c_str());
- printf("Token 1 = '%s'\n",test4.GetToken().c_str());
-
- c = "";
- printf("String: '%s'\n",c.c_str());
- irc::tokenstream test5(c);
- printf("Token 0 = '%s'\n",test5.GetToken().c_str());
-
- exit(0);
- */
+ /* This is a MatchCIDR() test suite -
+ printf("Should be 0: %d\n",MatchCIDR("127.0.0.1","1.2.3.4/8"));
+ printf("Should be 1: %d\n",MatchCIDR("127.0.0.1","127.0.0.0/8"));
+ printf("Should be 1: %d\n",MatchCIDR("127.0.0.1","127.0.0.0/18"));
+ printf("Should be 0: %d\n",MatchCIDR("3ffe::0","2fc9::0/16"));
+ printf("Should be 1: %d\n",MatchCIDR("3ffe:1:3::0", "3ffe:1::0/32"));
+ exit(0); */
+
try
{
ServerInstance = new InspIRCd(argc, argv);