* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * InspIRCd: (C) 2002-2008 InspIRCd Development Team
* See: http://www.inspircd.org/wiki/index.php/Credits
*
* This program is free but copyrighted software; see
/* $CompileFlags: pkgconfversion("sqlite3","3.3") pkgconfincludes("sqlite3","/sqlite3.h","") */
/* $LinkerFlags: pkgconflibs("sqlite3","/libsqlite3.so","-lsqlite3") */
/* $ModDep: m_sqlv2.h */
-
+/* $NoPedantic */
class SQLConn;
class SQLite3Result;
ResultNotifier* resultnotify = NULL;
-class ResultNotifier : public InspSocket
+class ResultNotifier : public BufferedSocket
{
Module* mod;
insp_sockaddr sock_us;
public:
/* Create a socket on a random port. Let the tcp stack allocate us an available port */
#ifdef IPV6
- ResultNotifier(InspIRCd* SI, Module* m) : InspSocket(SI, "::1", 0, true, 3000), mod(m)
+ ResultNotifier(InspIRCd* SI, Module* m) : BufferedSocket(SI, "::1", 0, true, 3000), mod(m)
#else
- ResultNotifier(InspIRCd* SI, Module* m) : InspSocket(SI, "127.0.0.1", 0, true, 3000), mod(m)
+ ResultNotifier(InspIRCd* SI, Module* m) : BufferedSocket(SI, "127.0.0.1", 0, true, 3000), mod(m)
#endif
{
uslen = sizeof(sock_us);
}
}
- ResultNotifier(InspIRCd* SI, Module* m, int newfd, char* ip) : InspSocket(SI, newfd, ip), mod(m)
+ ResultNotifier(InspIRCd* SI, Module* m, int newfd, char* ip) : BufferedSocket(SI, newfd, ip), mod(m)
{
}
SQLfieldMap* fieldmap;
public:
- SQLite3Result(Module* self, Module* to, unsigned int id)
- : SQLresult(self, to, id), currentrow(0), rows(0), cols(0), fieldlist(NULL), fieldmap(NULL)
+ SQLite3Result(Module* self, Module* to, unsigned int rid)
+ : SQLresult(self, to, rid), currentrow(0), rows(0), cols(0), fieldlist(NULL), fieldmap(NULL)
{
}
{
}
- void AddRow(int colsnum, char **data, char **colname)
+ void AddRow(int colsnum, char **dat, char **colname)
{
colnames.clear();
cols = colsnum;
{
fieldlists.resize(fieldlists.size()+1);
colnames.push_back(colname[i]);
- SQLfield sf(data[i] ? data[i] : "", data[i] ? false : true);
+ SQLfield sf(dat[i] ? dat[i] : "", dat[i] ? false : true);
fieldlists[rows].push_back(sf);
}
rows++;
{
if (OpenDB() != SQLITE_OK)
{
- Instance->Log(DEFAULT, "WARNING: Could not open DB with id: " + host.id);
+ Instance->Logs->Log("m_sqlite3",DEFAULT, "WARNING: Could not open DB with id: " + host.id);
CloseDB();
}
}
ReadConf();
ServerInstance->Modules->PublishInterface("SQL", this);
+ Implementation eventlist[] = { I_OnRequest, I_OnRehash };
+ ServerInstance->Modules->Attach(eventlist, this, 2);
}
virtual ~ModuleSQLite3()
ServerInstance->Modules->DoneWithInterface("SQLutils");
}
- void Implements(char* List)
- {
- List[I_OnRequest] = List[I_OnRehash] = 1;
- }
void SendQueue()
{
host.name = conf.ReadValue("database", "name", i);
host.user = conf.ReadValue("database", "username", i);
host.pass = conf.ReadValue("database", "password", i);
- host.ssl = conf.ReadFlag("database", "ssl", "0", i);
if (h == host)
return true;
}
host.name = conf.ReadValue("database", "name", i);
host.user = conf.ReadValue("database", "username", i);
host.pass = conf.ReadValue("database", "password", i);
- host.ssl = conf.ReadFlag("database", "ssl", "0", i);
if (HasHost(host))
continue;
{
if (HasHost(hi))
{
- ServerInstance->Log(DEFAULT, "WARNING: A sqlite connection with id: %s already exists. Aborting database open attempt.", hi.id.c_str());
+ ServerInstance->Logs->Log("m_sqlite3",DEFAULT, "WARNING: A sqlite connection with id: %s already exists. Aborting database open attempt.", hi.id.c_str());
return;
}
{
if (!HostInConf(iter->second->GetConfHost()))
{
- DELETE(iter->second);
+ delete iter->second;
safei = iter;
--iter;
connections.erase(safei);
while ((i = connections.begin()) != connections.end())
{
connections.erase(i);
- DELETE(i->second);
+ delete i->second;
}
}
ReadConf();
}
- virtual char* OnRequest(Request* request)
+ virtual const char* OnRequest(Request* request)
{
if(strcmp(SQLREQID, request->GetId()) == 0)
{
((ModuleSQLite3*)mod)->SendQueue();
}
-MODULE_INIT(ModuleSQLite3);
+MODULE_INIT(ModuleSQLite3)