*/
#include "../chanserv.h"
-#include "../../pqsql/pqsql.h"
#include "../../core/config.h"
#include "../../lib/sstring.h"
#include "../../parser/parser.h"
#include "../../core/events.h"
#include "../../core/nsmalloc.h"
+#include "../../lib/strlfunc.h"
+#include "../../dbapi/dbapi.h"
#include <string.h>
-#include <libpq-fe.h>
#include <stdio.h>
#include <sys/poll.h>
#include <stdarg.h>
int chanservdb_ready;
-typedef struct tabledesc {
- sstring *tablename; /* Name of table */
- PQQueryHandler init; /* Function to be called when transaction opens */
- PQQueryHandler data; /* Function to be called to load data */
- PQQueryHandler fini; /* Function to be called to clean up */
-} tabledesc;
-
regchan **allchans;
+maillock *maillocks;
int chanservext;
int chanservaext;
unsigned int lastuserID;
unsigned int lastbanID;
unsigned int lastdomainID;
+unsigned int lastmaillockID;
/* Local prototypes */
void csdb_handlestats(int hooknum, void *arg);
-void loadmessages_part1(PGconn *, void *);
-void loadmessages_part2(PGconn *, void *);
-void loadcommandsummary_real(PGconn *, void *);
-
-/* Generic loading functions */
-void loadall(char *, PQQueryHandler, PQQueryHandler, PQQueryHandler);
-void doloadall(PGconn *, void *);
+void loadmessages_part1(DBConn *, void *);
+void loadmessages_part2(DBConn *, void *);
+void loadcommandsummary_real(DBConn *, void *);
/* User loading functions */
-void loadsomeusers(PGconn *, void *);
-void loadusersdone(PGconn *, void *);
+void loadsomeusers(DBConn *, void *);
+void loadusersdone(DBConn *, void *);
/* Channel loading functions */
-void loadsomechannels(PGconn *, void *);
-void loadchannelsdone(PGconn *, void *);
+void loadsomechannels(DBConn *, void *);
+void loadchannelsdone(DBConn *, void *);
/* Chanuser loading functions */
-void loadchanusersinit(PGconn *, void *);
-void loadsomechanusers(PGconn *, void *);
-void loadchanusersdone(PGconn *, void *);
+void loadchanusersinit(DBConn *, void *);
+void loadsomechanusers(DBConn *, void *);
+void loadchanusersdone(DBConn *, void *);
/* Chanban loading functions */
-void loadsomechanbans(PGconn *, void *);
-void loadchanbansdone(PGconn *, void *);
+void loadsomechanbans(DBConn *, void *);
+void loadchanbansdone(DBConn *, void *);
/* Mail Domain loading functions */
-void loadsomemaildomains(PGconn *, void *);
-void loadmaildomainsdone(PGconn *, void *);
+void loadsomemaildomains(DBConn *, void *);
+void loadmaildomainsdone(DBConn *, void *);
+
+/* Mail lock loading functions */
+void loadsomemaillocks(DBConn *, void *);
+void loadmaillocksdone(DBConn *, void *);
/* Free sstrings in the structures */
void csdb_freestuff();
static void setuptables() {
/* Set up the tables */
/* User table */
- pqcreatequery("CREATE TABLE users ("
+ dbattach("chanserv");
+ dbcreatequery("CREATE TABLE chanserv.users ("
"ID INT NOT NULL,"
"username VARCHAR(16) NOT NULL,"
"created INT NOT NULL,"
"info VARCHAR(100),"
"PRIMARY KEY (ID))");
- pqcreatequery("CREATE INDEX user_username_index ON users (username)");
+ dbcreatequery("CREATE INDEX user_username_index ON chanserv.users (username)");
/* Channel table */
- pqcreatequery("CREATE TABLE channels ("
+ dbcreatequery("CREATE TABLE chanserv.channels ("
"ID INT NOT NULL,"
"name VARCHAR(250) NOT NULL,"
"flags INT NOT NULL,"
"PRIMARY KEY (ID))");
/* Chanuser table */
- pqcreatequery("CREATE TABLE chanusers ("
+ dbcreatequery("CREATE TABLE chanserv.chanusers ("
"userID INT NOT NULL,"
"channelID INT NOT NULL,"
"flags INT NOT NULL,"
"info VARCHAR(100) NOT NULL,"
"PRIMARY KEY (userID, channelID))");
- pqcreatequery("CREATE INDEX chanusers_userID_index on chanusers (userID)");
- pqcreatequery("CREATE INDEX chanusers_channelID_index on chanusers (channelID)");
+ dbcreatequery("CREATE INDEX chanusers_userID_index on chanserv.chanusers (userID)");
+ dbcreatequery("CREATE INDEX chanusers_channelID_index on chanserv.chanusers (channelID)");
- pqcreatequery("CREATE TABLE bans ("
+ dbcreatequery("CREATE TABLE chanserv.bans ("
"banID INT NOT NULL," /* Unique number for the ban to make
DELETEs process in finite time.. */
"channelID INT NOT NULL,"
"reason VARCHAR(200),"
"PRIMARY KEY(banID))");
- pqcreatequery("CREATE INDEX bans_channelID_index on bans (channelID)");
+ dbcreatequery("CREATE INDEX bans_channelID_index on chanserv.bans (channelID)");
- pqcreatequery("CREATE TABLE languages ("
+ dbcreatequery("CREATE TABLE chanserv.languages ("
"languageID INT NOT NULL,"
"code VARCHAR(2) NOT NULL,"
"name VARCHAR(30) NOT NULL)");
- pqcreatequery("CREATE TABLE messages ("
+ dbcreatequery("CREATE TABLE chanserv.messages ("
"languageID INT NOT NULL,"
"messageID INT NOT NULL,"
"message VARCHAR(250) NOT NULL,"
"PRIMARY KEY (languageID, messageID))");
- pqcreatequery("CREATE TABLE help ("
+ dbcreatequery("CREATE TABLE chanserv.help ("
"commandID INT NOT NULL,"
"command VARCHAR(30) NOT NULL,"
"languageID INT NOT NULL,"
"fullinfo TEXT NOT NULL,"
"PRIMARY KEY (commandID, languageID))");
- pqcreatequery("CREATE TABLE email ("
+ dbcreatequery("CREATE TABLE chanserv.email ("
"userID INT NOT NULL,"
"emailtype INT NOT NULL,"
"prevEmail VARCHAR(100),"
"mailID SERIAL,"
"PRIMARY KEY (mailID))");
- pqcreatequery("CREATE TABLE maildomain ("
+ dbcreatequery("CREATE TABLE chanserv.maildomain ("
"ID INT NOT NULL,"
"name VARCHAR NOT NULL,"
"domainlimit INT NOT NULL,"
"flags INT NOT NULL,"
"PRIMARY KEY (ID))");
- pqcreatequery("CREATE TABLE authhistory ("
+ dbcreatequery("CREATE TABLE chanserv.authhistory ("
"userID INT NOT NULL,"
"nick VARCHAR(15) NOT NULL,"
"username VARCHAR(10) NOT NULL,"
"quitreason VARCHAR(100) ,"
"PRIMARY KEY (userID, authtime))");
- pqcreatequery("CREATE INDEX authhistory_userID_index on authhistory(userID)");
- pqcreatequery("CREATE TABLE chanlevhistory ("
+ dbcreatequery("CREATE INDEX authhistory_userID_index on chanserv.authhistory(userID)");
+ dbcreatequery("CREATE TABLE chanserv.chanlevhistory ("
"userID INT NOT NULL,"
"channelID INT NOT NULL,"
"targetID INT NOT NULL,"
"oldflags INT NOT NULL,"
"newflags INT NOT NULL)");
- pqcreatequery("CREATE INDEX chanlevhistory_userID_index on chanlevhistory(userID)");
- pqcreatequery("CREATE INDEX chanlevhistory_channelID_index on chanlevhistory(channelID)");
- pqcreatequery("CREATE INDEX chanlevhistory_targetID_index on chanlevhistory(targetID)");
+ dbcreatequery("CREATE INDEX chanlevhistory_userID_index on chanserv.chanlevhistory(userID)");
+ dbcreatequery("CREATE INDEX chanlevhistory_channelID_index on chanserv.chanlevhistory(channelID)");
+ dbcreatequery("CREATE INDEX chanlevhistory_targetID_index on chanserv.chanlevhistory(targetID)");
- pqcreatequery("CREATE TABLE accounthistory ("
+ dbcreatequery("CREATE TABLE chanserv.accounthistory ("
"userID INT NOT NULL,"
"changetime INT NOT NULL,"
"authtime INT NOT NULL,"
"newemail VARCHAR(100),"
"PRIMARY KEY (userID, changetime))");
- pqcreatequery("CREATE INDEX accounthistory_userID_index on accounthistory(userID)");
+ dbcreatequery("CREATE INDEX accounthistory_userID_index on chanserv.accounthistory(userID)");
+
+ dbcreatequery("CREATE TABLE chanserv.maillocks ("
+ "ID INT NOT NULL,"
+ "pattern VARCHAR NOT NULL,"
+ "reason VARCHAR NOT NULL,"
+ "createdby INT NOT NULL,"
+ "created INT NOT NULL,"
+ "PRIMARY KEY (ID))");
}
void _init() {
/* And the messages */
initmessages();
- if (pqconnected() && (chanservext!=-1) && (chanservaext!=-1)) {
+ if (dbconnected() && (chanservext!=-1) && (chanservaext!=-1)) {
registerhook(HOOK_CORE_STATSREQUEST, csdb_handlestats);
setuptables();
lastuserID=lastchannelID=lastdomainID=0;
- loadall("users",NULL,loadsomeusers,loadusersdone);
- loadall("channels",NULL,loadsomechannels,loadchannelsdone);
- loadall("chanusers",loadchanusersinit,loadsomechanusers,loadchanusersdone);
- loadall("bans",NULL,loadsomechanbans,loadchanbansdone);
- loadall("maildomain",NULL, loadsomemaildomains,loadmaildomainsdone);
+ dbloadtable("chanserv.users",NULL,loadsomeusers,loadusersdone);
+ dbloadtable("chanserv.channels",NULL,loadsomechannels,loadchannelsdone);
+ dbloadtable("chanserv.chanusers",loadchanusersinit,loadsomechanusers,loadchanusersdone);
+ dbloadtable("chanserv.bans",NULL,loadsomechanbans,loadchanbansdone);
+ dbloadtable("chanserv.maildomain",NULL, loadsomemaildomains,loadmaildomainsdone);
+ dbloadtable("chanserv.maillocks",NULL, loadsomemaillocks,loadmaillocksdone);
loadmessages();
}
}
void _fini() {
+ deregisterhook(HOOK_CORE_STATSREQUEST, csdb_handlestats);
+
+ csdb_freestuff();
+
if (chanservext!=-1)
releasechanext(chanservext);
if (chanservaext!=-1)
releaseauthnameext(chanservaext);
- csdb_freestuff();
nsfreeall(POOL_CHANSERVDB);
+ dbdetach("chanserv");
}
void csdb_handlestats(int hooknum, void *arg) {
}
-/*
- * loadall():
- * Generic function to handle load of an entire table..
- */
-
-void loadall(char *table, PQQueryHandler init, PQQueryHandler data, PQQueryHandler fini) {
- tabledesc *thedesc;
-
- thedesc=malloc(sizeof(tabledesc));
-
- thedesc->tablename=getsstring(table,100);
- thedesc->init=init;
- thedesc->data=data;
- thedesc->fini=fini;
-
- pqasyncquery(doloadall, thedesc, "SELECT count(*) FROM %s",thedesc->tablename->content);
-}
-
-void doloadall(PGconn *dbconn, void *arg) {
- PGresult *pgres;
- int i,count;
- tabledesc *thedesc=arg;
-
- pgres=PQgetResult(dbconn);
-
- if (PQresultStatus(pgres) != PGRES_TUPLES_OK) {
- Error("chanserv",ERR_ERROR,"Error getting row count for %s.",thedesc->tablename->content);
- return;
- }
-
- if (PQnfields(pgres)!=1) {
- Error("chanserv",ERR_ERROR,"Count query format error for %s.",thedesc->tablename->content);
- return;
- }
-
- count=strtoul(PQgetvalue(pgres,0,0),NULL,10);
-
- PQclear(pgres);
-
- Error("chanserv",ERR_INFO,"Found %d entries in table %s, scheduling load.",count,
- thedesc->tablename->content);
-
- pqasyncquery(thedesc->init, NULL, "BEGIN");
- pqquery("DECLARE mycurs CURSOR FOR SELECT * from %s",
- thedesc->tablename->content);
-
- for (i=0;(count-i)>1000;i+=1000) {
- pqasyncquery(thedesc->data, NULL, "FETCH 1000 FROM mycurs");
- }
-
- pqasyncquery(thedesc->data, NULL, "FETCH ALL FROM mycurs");
-
- pqquery("CLOSE mycurs");
- pqasyncquery(thedesc->fini, NULL, "COMMIT");
-
- /* Free structures.. */
- freesstring(thedesc->tablename);
- free(thedesc);
-}
-
/*
* loadsomeusers():
* Loads some users in from the SQL DB
*/
-void loadsomeusers(PGconn *dbconn, void *arg) {
- PGresult *pgres;
+void loadsomeusers(DBConn *dbconn, void *arg) {
+ DBResult *pgres;
reguser *rup;
- unsigned int i,num;
char *local;
+ char mailbuf[1024];
- pgres=PQgetResult(dbconn);
+ pgres=dbgetresult(dbconn);
- if (PQresultStatus(pgres) != PGRES_TUPLES_OK) {
+ if (!dbquerysuccessful(pgres)) {
Error("chanserv",ERR_ERROR,"Error loading user DB");
return;
}
- if (PQnfields(pgres)!=18) {
+ if (dbnumfields(pgres)!=18) {
Error("chanserv",ERR_ERROR,"User DB format error");
return;
}
- num=PQntuples(pgres);
-
- for(i=0;i<num;i++) {
+ while(dbfetchrow(pgres)) {
rup=getreguser();
rup->status=0;
- rup->ID=strtoul(PQgetvalue(pgres,i,0),NULL,10);
- strncpy(rup->username,PQgetvalue(pgres,i,1),NICKLEN); rup->username[NICKLEN]='\0';
- rup->created=strtoul(PQgetvalue(pgres,i,2),NULL,10);
- rup->lastauth=strtoul(PQgetvalue(pgres,i,3),NULL,10);
- rup->lastemailchange=strtoul(PQgetvalue(pgres,i,4),NULL,10);
- rup->flags=strtoul(PQgetvalue(pgres,i,5),NULL,10);
- rup->languageid=strtoul(PQgetvalue(pgres,i,6),NULL,10);
- rup->suspendby=strtoul(PQgetvalue(pgres,i,7),NULL,10);
- rup->suspendexp=strtoul(PQgetvalue(pgres,i,8),NULL,10);
- rup->suspendtime=strtoul(PQgetvalue(pgres,i,9),NULL,10);
- rup->lockuntil=strtoul(PQgetvalue(pgres,i,10),NULL,10);
- strncpy(rup->password,PQgetvalue(pgres,i,11),PASSLEN); rup->password[PASSLEN]='\0';
- rup->email=getsstring(PQgetvalue(pgres,i,12),100);
+ rup->ID=strtoul(dbgetvalue(pgres,0),NULL,10);
+ strncpy(rup->username,dbgetvalue(pgres,1),NICKLEN); rup->username[NICKLEN]='\0';
+ rup->created=strtoul(dbgetvalue(pgres,2),NULL,10);
+ rup->lastauth=strtoul(dbgetvalue(pgres,3),NULL,10);
+ rup->lastemailchange=strtoul(dbgetvalue(pgres,4),NULL,10);
+ rup->flags=strtoul(dbgetvalue(pgres,5),NULL,10);
+ rup->languageid=strtoul(dbgetvalue(pgres,6),NULL,10);
+ rup->suspendby=strtoul(dbgetvalue(pgres,7),NULL,10);
+ rup->suspendexp=strtoul(dbgetvalue(pgres,8),NULL,10);
+ rup->suspendtime=strtoul(dbgetvalue(pgres,9),NULL,10);
+ rup->lockuntil=strtoul(dbgetvalue(pgres,10),NULL,10);
+ strncpy(rup->password,dbgetvalue(pgres,11),PASSLEN); rup->password[PASSLEN]='\0';
+ rup->email=getsstring(dbgetvalue(pgres,12),100);
if (rup->email) {
rup->domain=findorcreatemaildomain(rup->email->content);
addregusertomaildomain(rup, rup->domain);
-
- char *dupemail = strdup(rup->email->content);
- if((local=strchr(dupemail, '@'))) {
+
+ strlcpy(mailbuf, rup->email->content, sizeof(mailbuf));
+ if((local=strchr(mailbuf, '@'))) {
*(local++)='\0';
- rup->localpart=getsstring(dupemail,EMAILLEN);
+ rup->localpart=getsstring(mailbuf,EMAILLEN);
} else {
rup->localpart=NULL;
}
- free(dupemail);
} else {
rup->domain=NULL;
rup->localpart=NULL;
}
- rup->lastemail=getsstring(PQgetvalue(pgres,i,13),100);
- rup->lastuserhost=getsstring(PQgetvalue(pgres,i,14),75);
- rup->suspendreason=getsstring(PQgetvalue(pgres,i,15),250);
- rup->comment=getsstring(PQgetvalue(pgres,i,16),250);
- rup->info=getsstring(PQgetvalue(pgres,i,17),100);
+ rup->lastemail=getsstring(dbgetvalue(pgres,13),100);
+ rup->lastuserhost=getsstring(dbgetvalue(pgres,14),75);
+ rup->suspendreason=getsstring(dbgetvalue(pgres,15),250);
+ rup->comment=getsstring(dbgetvalue(pgres,16),250);
+ rup->info=getsstring(dbgetvalue(pgres,17),100);
rup->knownon=NULL;
rup->checkshd=NULL;
rup->stealcount=0;
}
}
- PQclear(pgres);
+ dbclear(pgres);
}
-void loadusersdone(PGconn *conn, void *arg) {
+void loadusersdone(DBConn *conn, void *arg) {
Error("chanserv",ERR_INFO,"Load users done (highest ID was %d)",lastuserID);
}
* Channel loading functions
*/
-void loadsomechannels(PGconn *dbconn, void *arg) {
- PGresult *pgres;
+void loadsomechannels(DBConn *dbconn, void *arg) {
+ DBResult *pgres;
regchan *rcp;
- int i,num;
+ int j;
chanindex *cip;
time_t now=time(NULL);
- pgres=PQgetResult(dbconn);
+ pgres=dbgetresult(dbconn);
- if (PQresultStatus(pgres) != PGRES_TUPLES_OK) {
+ if (!dbquerysuccessful(pgres)) {
Error("chanserv",ERR_ERROR,"Error loading channel DB");
return;
}
- if (PQnfields(pgres)!=27) {
+ if (dbnumfields(pgres)!=27) {
Error("chanserv",ERR_ERROR,"Channel DB format error");
return;
}
- num=PQntuples(pgres);
-
- for(i=0;i<num;i++) {
- cip=findorcreatechanindex(PQgetvalue(pgres,i,1));
+ while(dbfetchrow(pgres)) {
+ cip=findorcreatechanindex(dbgetvalue(pgres,1));
if (cip->exts[chanservext]) {
Error("chanserv",ERR_WARNING,"%s in database twice - this WILL cause problems later.",cip->name->content);
continue;
rcp=getregchan();
cip->exts[chanservext]=rcp;
- rcp->ID=strtoul(PQgetvalue(pgres,i,0),NULL,10);
+ rcp->ID=strtoul(dbgetvalue(pgres,0),NULL,10);
rcp->index=cip;
- rcp->flags=strtoul(PQgetvalue(pgres,i,2),NULL,10);
+ rcp->flags=strtoul(dbgetvalue(pgres,2),NULL,10);
rcp->status=0; /* Non-DB field */
rcp->lastbancheck=0;
rcp->lastcountersync=now;
rcp->lastpart=0;
rcp->bans=NULL;
- rcp->forcemodes=strtoul(PQgetvalue(pgres,i,3),NULL,10);
- rcp->denymodes=strtoul(PQgetvalue(pgres,i,4),NULL,10);
- rcp->limit=strtoul(PQgetvalue(pgres,i,5),NULL,10);
- rcp->autolimit=strtoul(PQgetvalue(pgres,i,6),NULL,10);
- rcp->banstyle=strtoul(PQgetvalue(pgres,i,7),NULL,10);
- rcp->created=strtoul(PQgetvalue(pgres,i,8),NULL,10);
- rcp->lastactive=strtoul(PQgetvalue(pgres,i,9),NULL,10);
- rcp->statsreset=strtoul(PQgetvalue(pgres,i,10),NULL,10);
- rcp->banduration=strtoul(PQgetvalue(pgres,i,11),NULL,10);
- rcp->founder=strtol(PQgetvalue(pgres,i,12),NULL,10);
- rcp->addedby=strtol(PQgetvalue(pgres,i,13),NULL,10);
- rcp->suspendby=strtol(PQgetvalue(pgres,i,14),NULL,10);
- rcp->suspendtime=strtol(PQgetvalue(pgres,i,15),NULL,10);
- rcp->chantype=strtoul(PQgetvalue(pgres,i,16),NULL,10);
- rcp->totaljoins=strtoul(PQgetvalue(pgres,i,17),NULL,10);
- rcp->tripjoins=strtoul(PQgetvalue(pgres,i,18),NULL,10);
- rcp->maxusers=strtoul(PQgetvalue(pgres,i,19),NULL,10);
- rcp->tripusers=strtoul(PQgetvalue(pgres,i,20),NULL,10);
- rcp->welcome=getsstring(PQgetvalue(pgres,i,21),500);
- rcp->topic=getsstring(PQgetvalue(pgres,i,22),TOPICLEN);
- rcp->key=getsstring(PQgetvalue(pgres,i,23),KEYLEN);
- rcp->suspendreason=getsstring(PQgetvalue(pgres,i,24),250);
- rcp->comment=getsstring(PQgetvalue(pgres,i,25),250);
+ rcp->forcemodes=strtoul(dbgetvalue(pgres,3),NULL,10);
+ rcp->denymodes=strtoul(dbgetvalue(pgres,4),NULL,10);
+ rcp->limit=strtoul(dbgetvalue(pgres,5),NULL,10);
+ rcp->autolimit=strtoul(dbgetvalue(pgres,6),NULL,10);
+ rcp->banstyle=strtoul(dbgetvalue(pgres,7),NULL,10);
+ rcp->created=strtoul(dbgetvalue(pgres,8),NULL,10);
+ rcp->lastactive=strtoul(dbgetvalue(pgres,9),NULL,10);
+ rcp->statsreset=strtoul(dbgetvalue(pgres,10),NULL,10);
+ rcp->banduration=strtoul(dbgetvalue(pgres,11),NULL,10);
+ rcp->founder=strtol(dbgetvalue(pgres,12),NULL,10);
+ rcp->addedby=strtol(dbgetvalue(pgres,13),NULL,10);
+ rcp->suspendby=strtol(dbgetvalue(pgres,14),NULL,10);
+ rcp->suspendtime=strtol(dbgetvalue(pgres,15),NULL,10);
+ rcp->chantype=strtoul(dbgetvalue(pgres,16),NULL,10);
+ rcp->totaljoins=strtoul(dbgetvalue(pgres,17),NULL,10);
+ rcp->tripjoins=strtoul(dbgetvalue(pgres,18),NULL,10);
+ rcp->maxusers=strtoul(dbgetvalue(pgres,19),NULL,10);
+ rcp->tripusers=strtoul(dbgetvalue(pgres,20),NULL,10);
+ rcp->welcome=getsstring(dbgetvalue(pgres,21),500);
+ rcp->topic=getsstring(dbgetvalue(pgres,22),TOPICLEN);
+ rcp->key=getsstring(dbgetvalue(pgres,23),KEYLEN);
+ rcp->suspendreason=getsstring(dbgetvalue(pgres,24),250);
+ rcp->comment=getsstring(dbgetvalue(pgres,25),250);
rcp->checksched=NULL;
- rcp->ltimestamp=strtoul(PQgetvalue(pgres,i,26),NULL,10);
+ rcp->ltimestamp=strtoul(dbgetvalue(pgres,26),NULL,10);
memset(rcp->regusers,0,REGCHANUSERHASHSIZE*sizeof(reguser *));
if (rcp->ID > lastchannelID)
if (CIsAutoLimit(rcp))
rcp->limit=0;
+
+ for (j=0;j<CHANOPHISTORY;j++) {
+ rcp->chanopnicks[j][0]='\0';
+ rcp->chanopaccts[j]=0;
+ }
+ rcp->chanoppos=0;
}
- PQclear(pgres);
+ dbclear(pgres);
}
-void loadchannelsdone(PGconn *dbconn, void *arg) {
+void loadchannelsdone(DBConn *dbconn, void *arg) {
Error("chanserv",ERR_INFO,"Channel load done (highest ID was %d)",lastchannelID);
}
-void loadchanusersinit(PGconn *dbconn, void *arg) {
+void loadchanusersinit(DBConn *dbconn, void *arg) {
int i;
chanindex *cip;
regchan *rcp;
}
}
-void loadsomechanusers(PGconn *dbconn, void *arg) {
- PGresult *pgres;
+void loadsomechanusers(DBConn *dbconn, void *arg) {
+ DBResult *pgres;
regchanuser *rcup;
- int i,num;
regchan *rcp;
reguser *rup;
authname *anp;
int total=0;
/* Set up the allchans array */
- pgres=PQgetResult(dbconn);
+ pgres=dbgetresult(dbconn);
- if (PQresultStatus(pgres) != PGRES_TUPLES_OK) {
+ if (!dbquerysuccessful(pgres)) {
Error("chanserv",ERR_ERROR,"Error loading chanusers.");
return;
}
- if (PQnfields(pgres)!=6) {
+ if (dbnumfields(pgres)!=6) {
Error("chanserv",ERR_ERROR,"Chanusers format error");
return;
}
- num=PQntuples(pgres);
-
- for(i=0;i<num;i++) {
- uid=strtol(PQgetvalue(pgres,i,0),NULL,10);
- cid=strtol(PQgetvalue(pgres,i,1),NULL,10);
+ while(dbfetchrow(pgres)) {
+ uid=strtol(dbgetvalue(pgres,0),NULL,10);
+ cid=strtol(dbgetvalue(pgres,1),NULL,10);
if (!(anp=findauthname(uid)) || !(rup=anp->exts[chanservaext])) {
Error("chanserv",ERR_WARNING,"Skipping channeluser for unknown user %d",uid);
if (rup==NULL || rcp==NULL) {
Error("chanserv",ERR_ERROR,"Can't add user %s on channel %s",
- PQgetvalue(pgres,i,0),PQgetvalue(pgres,i,1));
+ dbgetvalue(pgres,0),dbgetvalue(pgres,1));
} else {
rcup=getregchanuser();
rcup->user=rup;
rcup->chan=rcp;
- rcup->flags=strtol(PQgetvalue(pgres,i,2),NULL,10);
- rcup->changetime=strtol(PQgetvalue(pgres,i,3),NULL,10);
- rcup->usetime=strtol(PQgetvalue(pgres,i,4),NULL,10);
- rcup->info=getsstring(PQgetvalue(pgres,i,5),100);
+ rcup->flags=strtol(dbgetvalue(pgres,2),NULL,10);
+ rcup->changetime=strtol(dbgetvalue(pgres,3),NULL,10);
+ rcup->usetime=strtol(dbgetvalue(pgres,4),NULL,10);
+ rcup->info=getsstring(dbgetvalue(pgres,5),100);
addregusertochannel(rcup);
total++;
}
}
- PQclear(pgres);
+ dbclear(pgres);
}
-void loadchanusersdone(PGconn *dbconn, void *arg) {
+void loadchanusersdone(DBConn *dbconn, void *arg) {
Error("chanserv",ERR_INFO,"Channel user load done.");
}
-void loadsomechanbans(PGconn *dbconn, void *arg) {
- PGresult *pgres;
+void loadsomechanbans(DBConn *dbconn, void *arg) {
+ DBResult *pgres;
regban *rbp;
- int i,num;
regchan *rcp;
int uid,cid,bid;
time_t expiry,now;
int total=0;
- pgres=PQgetResult(dbconn);
+ pgres=dbgetresult(dbconn);
- if (PQresultStatus(pgres) != PGRES_TUPLES_OK) {
+ if (!dbquerysuccessful(pgres)) {
Error("chanserv",ERR_ERROR,"Error loading bans.");
return;
}
- if (PQnfields(pgres)!=6) {
+ if (dbnumfields(pgres)!=6) {
Error("chanserv",ERR_ERROR,"Ban format error");
return;
}
- num=PQntuples(pgres);
-
now=time(NULL);
- for(i=0;i<num;i++) {
- bid=strtoul(PQgetvalue(pgres,i,0),NULL,10);
- cid=strtoul(PQgetvalue(pgres,i,1),NULL,10);
- uid=strtoul(PQgetvalue(pgres,i,2),NULL,10);
- expiry=strtoul(PQgetvalue(pgres,i,4),NULL,10);
+ while(dbfetchrow(pgres)) {
+ bid=strtoul(dbgetvalue(pgres,0),NULL,10);
+ cid=strtoul(dbgetvalue(pgres,1),NULL,10);
+ uid=strtoul(dbgetvalue(pgres,2),NULL,10);
+ expiry=strtoul(dbgetvalue(pgres,4),NULL,10);
if (cid>lastchannelID || !(rcp=allchans[cid])) {
Error("chanserv",ERR_WARNING,"Skipping ban for unknown chan %d",cid);
rbp->setby=uid;
rbp->ID=bid;
rbp->expiry=expiry;
- rbp->reason=getsstring(PQgetvalue(pgres,i,5),200);
- rbp->cbp=makeban(PQgetvalue(pgres,i,3));
+ rbp->reason=getsstring(dbgetvalue(pgres,5),200);
+ rbp->cbp=makeban(dbgetvalue(pgres,3));
rbp->next=rcp->bans;
rcp->bans=rbp;
lastbanID=bid;
}
- PQclear(pgres);
+ dbclear(pgres);
}
-void loadchanbansdone(PGconn *dbconn, void *arg) {
+void loadchanbansdone(DBConn *dbconn, void *arg) {
free(allchans);
Error("chanserv",ERR_INFO,"Channel ban load done, highest ID was %d",lastbanID);
}
void loadmessages() {
- pqasyncquery(loadmessages_part1, NULL, "SELECT * from languages");
+ dbasyncquery(loadmessages_part1, NULL, "SELECT * from chanserv.languages");
}
-void loadmessages_part1(PGconn *dbconn, void *arg) {
+void loadmessages_part1(DBConn *dbconn, void *arg) {
int i,j;
- PGresult *pgres;
- int num;
+ DBResult *pgres;
/* Firstly, clear up any stale messages */
for (i=0;i<MAXLANG;i++) {
}
}
- pgres=PQgetResult(dbconn);
+ pgres=dbgetresult(dbconn);
- if (PQresultStatus(pgres) != PGRES_TUPLES_OK) {
+ if (!dbquerysuccessful(pgres)) {
Error("chanserv",ERR_ERROR,"Error loading language list.");
return;
}
- if (PQnfields(pgres)!=3) {
+ if (dbnumfields(pgres)!=3) {
Error("chanserv",ERR_ERROR,"Language list format error.");
return;
}
- num=PQntuples(pgres);
-
- for (i=0;i<num;i++) {
- j=strtol(PQgetvalue(pgres,i,0),NULL,10);
+ while(dbfetchrow(pgres)) {
+ j=strtol(dbgetvalue(pgres,0),NULL,10);
if (j<MAXLANG && j>=0) {
cslanguages[j]=(cslang *)malloc(sizeof(cslang));
- strncpy(cslanguages[j]->code,PQgetvalue(pgres,i,1),2); cslanguages[j]->code[2]='\0';
- cslanguages[j]->name=getsstring(PQgetvalue(pgres,i,2),30);
+ strncpy(cslanguages[j]->code,dbgetvalue(pgres,1),2); cslanguages[j]->code[2]='\0';
+ cslanguages[j]->name=getsstring(dbgetvalue(pgres,2),30);
}
}
- PQclear(pgres);
+ dbclear(pgres);
if (i>MAXLANG)
Error("chanserv",ERR_ERROR,"Found too many languages (%d > %d)",i,MAXLANG);
- pqasyncquery(loadmessages_part2, NULL, "SELECT * from messages");
+ dbasyncquery(loadmessages_part2, NULL, "SELECT * from chanserv.messages");
}
-void loadmessages_part2(PGconn *dbconn, void *arg) {
- PGresult *pgres;
- int i,j,k,num;
+void loadmessages_part2(DBConn *dbconn, void *arg) {
+ DBResult *pgres;
+ int j,k;
- pgres=PQgetResult(dbconn);
+ pgres=dbgetresult(dbconn);
- if (PQresultStatus(pgres) != PGRES_TUPLES_OK) {
+ if (!dbquerysuccessful(pgres)) {
Error("chanserv",ERR_ERROR,"Error loading message list.");
return;
}
- if (PQnfields(pgres)!=3) {
+ if (dbnumfields(pgres)!=3) {
Error("chanserv",ERR_ERROR,"Message list format error.");
return;
}
- num=PQntuples(pgres);
-
- for (i=0;i<num;i++) {
- k=strtol(PQgetvalue(pgres,i,0),NULL,10);
- j=strtol(PQgetvalue(pgres,i,1),NULL,10);
+ while(dbfetchrow(pgres)) {
+ k=strtol(dbgetvalue(pgres,0),NULL,10);
+ j=strtol(dbgetvalue(pgres,1),NULL,10);
if (k<0 || k >= MAXLANG) {
Error("chanserv",ERR_WARNING,"Language ID out of range on message: %d",k);
continue;
}
- csmessages[k][j]=getsstring(PQgetvalue(pgres,i,2),250);
+ csmessages[k][j]=getsstring(dbgetvalue(pgres,2),250);
}
- PQclear(pgres);
+ dbclear(pgres);
}
void loadcommandsummary(Command *cmd) {
- pqasyncquery(loadcommandsummary_real, (void *)cmd,
- "SELECT languageID,summary from help where lower(command) = lower('%s')",cmd->command->content);
+ dbasyncquery(loadcommandsummary_real, (void *)cmd,
+ "SELECT languageID,summary from chanserv.help where lower(command) = lower('%s')",cmd->command->content);
}
-void loadcommandsummary_real(PGconn *dbconn, void *arg) {
- int i,j,num;
- PGresult *pgres;
+void loadcommandsummary_real(DBConn *dbconn, void *arg) {
+ int i,j;
+ DBResult *pgres;
cmdsummary *cs;
Command *cmd=arg;
freesstring(cs->bylang[i]);
}
- pgres=PQgetResult(dbconn);
+ pgres=dbgetresult(dbconn);
- if (PQresultStatus(pgres) != PGRES_TUPLES_OK) {
+ if (!dbquerysuccessful(pgres)) {
Error("chanserv",ERR_ERROR,"Error loading command summary.");
return;
}
- if (PQnfields(pgres)!=2) {
+ if (dbnumfields(pgres)!=2) {
Error("chanserv",ERR_ERROR,"Command summary format error.");
- PQclear(pgres);
+ dbclear(pgres);
return;
}
- num=PQntuples(pgres);
-
- for (i=0;i<num;i++) {
- j=strtol(PQgetvalue(pgres,i,0),NULL,10);
+ while(dbfetchrow(pgres)) {
+ j=strtol(dbgetvalue(pgres,0),NULL,10);
if (j<MAXLANG && j>=0) {
- cs->bylang[j]=getsstring(PQgetvalue(pgres,i,1),200);
+ cs->bylang[j]=getsstring(dbgetvalue(pgres,1),200);
}
}
- PQclear(pgres);
+ dbclear(pgres);
}
void csdb_freestuff() {
regchanuser *rcup;
regban *rbp;
maildomain *mdp;
+ maillock *mlp, *nmlp;
for (i=0;i<REGUSERHASHSIZE;i++) {
for (rup=regusernicktable[i];rup;rup=rup->nextbyname) {
freesstring(rup->email);
+ freesstring(rup->localpart);
freesstring(rup->lastemail);
freesstring(rup->lastuserhost);
freesstring(rup->suspendreason);
for (mdp=maildomainnametable[i]; mdp; mdp=mdp->nextbyname)
freesstring(mdp->name);
}
+
+ for(mlp=maillocks;mlp;mlp=nmlp) {
+ nmlp=mlp->next;
+ freemaillock(mlp);
+ }
+ maillocks=NULL;
}
-void loadsomemaildomains(PGconn *dbconn,void *arg) {
- PGresult *pgres;
+void loadsomemaildomains(DBConn *dbconn,void *arg) {
+ DBResult *pgres;
maildomain *mdp;
- unsigned int i,num;
char *domain;
- pgres=PQgetResult(dbconn);
+ pgres=dbgetresult(dbconn);
- if (PQresultStatus(pgres) != PGRES_TUPLES_OK) {
+ if (!dbquerysuccessful(pgres)) {
Error("chanserv",ERR_ERROR,"Error loading maildomain DB");
return;
- }
+ }
- if (PQnfields(pgres)!=5) {
+ if (dbnumfields(pgres)!=5) {
Error("chanserv",ERR_ERROR,"Mail Domain DB format error");
+ dbclear(pgres);
return;
}
- num=PQntuples(pgres);
lastdomainID=0;
- for(i=0;i<num;i++) {
- domain=strdup(PQgetvalue(pgres,i,1));
+ while(dbfetchrow(pgres)) {
+ domain=dbgetvalue(pgres,1);
mdp=findorcreatemaildomain(domain); //@@@ LEN
- mdp->ID=strtoul(PQgetvalue(pgres,i,0),NULL,10);
- mdp->limit=strtoul(PQgetvalue(pgres,i,2),NULL,10);
- mdp->actlimit=strtoul(PQgetvalue(pgres,i,3),NULL,10);
- mdp->flags=strtoul(PQgetvalue(pgres,i,4),NULL,10);
+ mdp->ID=strtoul(dbgetvalue(pgres,0),NULL,10);
+ mdp->limit=strtoul(dbgetvalue(pgres,2),NULL,10);
+ mdp->actlimit=strtoul(dbgetvalue(pgres,3),NULL,10);
+ mdp->flags=strtoul(dbgetvalue(pgres,4),NULL,10);
if (mdp->ID > lastdomainID) {
lastdomainID=mdp->ID;
}
}
- PQclear(pgres);
+ dbclear(pgres);
}
-void loadmaildomainsdone(PGconn *dbconn, void *arg) {
+void loadmaildomainsdone(DBConn *dbconn, void *arg) {
Error("chanserv",ERR_INFO,"Load Mail Domains done (highest ID was %d)",lastdomainID);
}
+void loadsomemaillocks(DBConn *dbconn,void *arg) {
+ DBResult *pgres;
+ maillock *mlp;
+ pgres=dbgetresult(dbconn);
+
+ if (!dbquerysuccessful(pgres)) {
+ Error("chanserv",ERR_ERROR,"Error loading maillock DB");
+ return;
+ }
+
+ if (dbnumfields(pgres)!=5) {
+ Error("chanserv",ERR_ERROR,"Maillock DB format error");
+ dbclear(pgres);
+ return;
+ }
+ lastmaillockID=0;
+
+ while(dbfetchrow(pgres)) {
+ mlp=getmaillock();
+ mlp->id=strtoul(dbgetvalue(pgres,0),NULL,10);
+ mlp->pattern=getsstring(dbgetvalue(pgres,1), 300);
+ mlp->reason=getsstring(dbgetvalue(pgres,2), 300);
+ mlp->createdby=strtoul(dbgetvalue(pgres,3),NULL,10);
+ mlp->created=strtoul(dbgetvalue(pgres,4),NULL,10);
+ mlp->next=maillocks;
+ maillocks=mlp;
+
+ if (mlp->id > lastmaillockID)
+ lastmaillockID=mlp->id;
+ }
+
+ dbclear(pgres);
+}
+
+void loadmaillocksdone(DBConn *dbconn, void *arg) {
+ Error("chanserv",ERR_INFO,"Load Mail Locks done (highest ID was %d)",lastmaillockID);
+}
+
projects / irc / quakenet / newserv.git / blobdiff