From 1f2399de364c09adcce4193895cd362d80ffdfc5 Mon Sep 17 00:00:00 2001 From: Adam Date: Sun, 25 Sep 2011 04:19:15 -0400 Subject: Added a new database format and sqlite support. Also moved db-convert to a module. --- src/access.cpp | 1 - src/base.cpp | 16 + src/bin/CMakeLists.txt | 2 +- src/bin/cp-recursive | 21 - src/bin/langtool | 239 ----------- src/bin/mydbgen | 148 ------- src/bots.cpp | 23 ++ src/hostserv.cpp | 2 +- src/init.cpp | 4 +- src/main.cpp | 1 + src/memoserv.cpp | 32 ++ src/misc.cpp | 13 + src/modes.cpp | 2 +- src/nickalias.cpp | 44 ++ src/nickcore.cpp | 51 +++ src/operserv.cpp | 41 +- src/regchannel.cpp | 221 +++++++++- src/tools/db-convert.cpp | 1032 ---------------------------------------------- src/tools/db-convert.h | 975 ------------------------------------------- 19 files changed, 438 insertions(+), 2430 deletions(-) delete mode 100755 src/bin/cp-recursive delete mode 100755 src/bin/langtool delete mode 100755 src/bin/mydbgen delete mode 100644 src/tools/db-convert.cpp delete mode 100644 src/tools/db-convert.h (limited to 'src') diff --git a/src/access.cpp b/src/access.cpp index 8a293a42d..d519abf39 100644 --- a/src/access.cpp +++ b/src/access.cpp @@ -11,7 +11,6 @@ #include "services.h" #include "modules.h" -#include "access.h" enum { diff --git a/src/base.cpp b/src/base.cpp index 0aec072a1..18450ef90 100644 --- a/src/base.cpp +++ b/src/base.cpp @@ -1,6 +1,22 @@ #include "services.h" #include "modules.h" +std::vector serialized_types; +std::list serialized_items; + +void RegisterTypes() +{ + Serializable::Alloc.Register("NickCore"); + Serializable::Alloc.Register("NickAlias"); + Serializable::Alloc.Register("BotInfo"); + Serializable::Alloc.Register("ChannelInfo"); + Serializable::Alloc.Register("LogSetting"); + Serializable::Alloc.Register("ModeLock"); + Serializable::Alloc.Register("AutoKick"); + Serializable::Alloc.Register("BadWord"); + Serializable::Alloc.Register("Memo"); +} + Base::Base() { } diff --git a/src/bin/CMakeLists.txt b/src/bin/CMakeLists.txt index 7c6fe514b..cb110edb5 100644 --- a/src/bin/CMakeLists.txt +++ b/src/bin/CMakeLists.txt @@ -1,7 +1,7 @@ # If not on Windows, generate anoperc and install it along with mydbgen if(NOT WIN32) configure_file(${Anope_SOURCE_DIR}/src/bin/anoperc.in ${Anope_BINARY_DIR}/src/bin/anoperc) - install (PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/anoperc ${CMAKE_CURRENT_SOURCE_DIR}/mydbgen + install (PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/anoperc DESTINATION bin ) diff --git a/src/bin/cp-recursive b/src/bin/cp-recursive deleted file mode 100755 index e51230db7..000000000 --- a/src/bin/cp-recursive +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -if [ $1 = "-t" ] ; then - shift -fi -if [ ! "$2" ] ; then - echo >&2 Usage: $0 ' ' - exit 1 -fi -if [ -d "$1" ] ; then - dir="$1" -else - dir="`echo $1 | sed 's#\(.*\)/.*#\1#'`" -fi -while [ "$2" ] ; do - shift -done -if [ ! -d $1 ] ; then - mkdir -p $1 || exit 1 -fi -/bin/tar -Ccf $dir - . | /bin/tar -Cxf $1 - diff --git a/src/bin/langtool b/src/bin/langtool deleted file mode 100755 index c1072760c..000000000 --- a/src/bin/langtool +++ /dev/null @@ -1,239 +0,0 @@ -#!/usr/bin/perl -# -# Ribosome's all in one language tool -# 1) Compares to check for missing lines -# 2) Compares to check for equal lines -# 3) Fixes (on request) missing lines -# 4) Checks for errors in lines -# 5) Checks for long lines (>60 characters) -# - -# Check to see if we have received arguments -if (!$ARGV[0]) { -print "Usage: $0 [language file]\n"; -exit; -} - -# If yes, set $sourcefile to the language filename -$testagainst = $ARGV[0]; - -# Set $sourcefile to en_us language file -$sourcefile = "en_us.l"; - -# Number of Keys in File, Number of Equal Lines, Number of Missing Lines -# Fixed Lines (optional) and Number of Format Error Lines, Number of Long Lines -my $numberlines = 0; -my $equallines = 0; -my $missinglines = 0; -my $fixedlines = 0; -my $errorline = 0; -my $longlines = 0; - -# Array to hold the lines from the source file and explosion array for long line check - -my @sourcearray; -my @explosion; - -# Create associative arrays which will contain keys and definitions -# One for the control source and one for what is being tested against - -my %sourcehash= (); -my %testhash= (); - -# Check if Files Exist - -if (! -f $sourcefile) { -print "Critical Error: The source file does not exist or is unreadable.\nNote: This tool must be run from the language directory.\n"; -exit; -} - -if (! -f $testagainst) { -print "Critical Error: The language file does not exist or is unreadable\n"; -exit; -} -########################################### -# Function to load sourcefile into memory # -########################################### - -sub load_sourcefile { - - my $_key; # This variable will hold the key - my $_def; # This variable will hold the definition - my $line; # This variable will hold the current line - - open (SOURCEFILE, "< $sourcefile"); # Open the source file - while () { # For each line the source file - $line = $_; # $line is set to the line in the source file - - # Skip comments - if (/^#/) { # This checks for # which indicates comment - next; # If detected, the next line is skipped to - } - - # Start of a key - if (/^[A-Z]/) { # Checks to see if the line is a key - chomp($line); # Removes things that shouldn't be at the end - push (@sourcearray, $line); # Puts the line into the source array - # If a key is defined, load definition into the hash - if ($_key ne undef) { # If the key is defined - $sourcehash{$_key} = $_def; # Add the definition to the associative array - } - $_key=$line; # Set the key to the line - $_def=""; # Reset the definition - next; # Move onto the next line - } - - if ($_key ne undef) { # If the key is set already - $_def.=$line; # The definition is the current line - } - - $sourcehash{$_key} = $_def; # Load the definition into the associative array - } # End of while which reads lines - - close (SOURCEFILE); # Close the source file - -} # End of load_sourcefile function - -################################################# -# Function to load testagainst file into memory # -################################################# - -sub load_testagainst { - - my $_key; # This variable will hold the key - my $_def; # This variable will hold the definition - my $line; # This variable will hold the current line - - open (TESTAGAINSTFILE, "< $testagainst"); # Open the file containing the control lines - while () { # For each line in the file - $line = $_; # $line is set to the lines value - - - # Skip comments - if (/^#/) { # This checks for # which indicates comment - next; # If detected, the next line is skipped to - } - - # Start of a key - if (/^[A-Z]/) { # Checks to see if the line is a key - chomp($line); # Removes things that shouldn't be at the end - - - if ($_key ne undef) { # If the key is defined - $testhash{$_key} = $_def; # Add the definition to the associative array - } - $_key=$line; # Set the key to the line - $_def=""; # Reset the definition - next; # Move onto the next line - } - - if ($_key ne undef) { # If the key is set already - $_def.=$line; # The definition is the current line - } - - $testhash{$_key} = $_def; # Load the definition into the associative array - } # End of while which reads lines - close (TESTAGAINSTFILE); # Close the source file - -} - - -sub get_format { # Function to get the formatting from a string - my $fmt=""; - my $str=shift; # Get the input - - while ($str =~ m/%\w/g) { - $fmt .= $&; - } - - return $fmt; # Return the formatting -} - - -load_sourcefile; # Call function to load the source file -load_testagainst; # Call function to load the test file - -if (!grep(/^LANG_NAME/,%testhash)) { -print "Critical Error: $ARGV[0] is not a valid language file!\n"; -exit; -} - -open (LOG,"> langcheck.log"); # Open logfile for writing - -foreach $sourcearray (@sourcearray) { # For each key stored in the source array - my $_key=$_; # Store key from source array in $_key - - if ((get_format($sourcehash{$sourcearray})) ne (get_format($testhash{$sourcearray}))) { - if ($sourcearray !~ STRFTIME ) { - $errorline++; - print LOG "FORMAT: $sourcearray - (expecting '".get_format($sourcehash{$sourcearray})."' and got '".get_format($testhash{$sourcearray})."')\n"; - } } - - if ($testhash{$sourcearray} eq $sourcehash{$sourcearray} ) { - # If the definitions between the source and the test are equal - $equallines++; # Number of equal lines increases - print LOG "EQUAL: $sourcearray\n"; # Line is written to logfile - } - - if (!grep(/^$sourcearray/,%testhash)) { # If the key is found in the testhash associative array - $missinglines++; # Increase missing lines - print LOG "MISSING: $sourcearray\n"; # Line is written to logfile - } - - @explosion = split(/\n/, $testhash{$sourcearray}); - foreach $explosion (@explosion) { - $explosion =~ s/\002//g; - $explosion =~ s/\037//g; - if (length($explosion) > 61) { - print LOG "LONGLINE: $sourcearray (".substr($explosion,1,30)."...)\n"; - $longlines++; - } - } - -$numberlines++; # Increase the number of lines tested by 1 -} -close (LOG); # Close the logfile - - -######################### -# Show the test results # -######################### - -print "Calculation Results:\n"; -print "----------------------------------\n"; -print "[$numberlines] line(s) were compared\n"; -print "[$equallines] line(s) were found to equal their $sourcefile counterpart(s)\n"; -print "[$missinglines] line(s) were found to be missing\n"; -print "[$longlines] line(s) were found to be long (>60 chars)\n"; -print "[$errorline] line(s) were found to have formatting errors\n"; -print "The specific details of the test have been saved in langcheck.log\n"; - -if ($missinglines) { # If missing lines exist -print "----------------------------------\n"; -print "Missing line(s) have been detected in this test, would you like to fix the file?\n"; -print "This automatically inserts values from the control file ($sourcefile) for the missing values\n"; -print "y/N? (Default: No) "; - -my $input = ; # Ask if the file should be fixed -if ((substr($input,0,1) eq "y") || (substr($input,0,1) eq "Y")) { # If Yes... - -open (FIX, ">> $testagainst"); # Open the file and append changes - -foreach $sourcearray (@sourcearray) { # For each key stored in the source array - my $_key=$_; # Store key from source array in $_key - - if (!grep(/^$sourcearray/,%testhash)) { # If the key is not found in the testhash associative array - print FIX "$sourcearray\n$sourcehash{$sourcearray}"; # Add the line(s) to the language file - $fixedlines++; # Increase the fixed line count - } -} - -close (FIX); # Close file after fixing - -print "Fixing Compete. [$fixedlines] line(s) fixed.\n"; -exit; # And Exit! -} - # Otherwise, quit without fixing -print "Exiting. The language file has NOT been fixed.\n"; - -} diff --git a/src/bin/mydbgen b/src/bin/mydbgen deleted file mode 100755 index 12bee8063..000000000 --- a/src/bin/mydbgen +++ /dev/null @@ -1,148 +0,0 @@ -#!/bin/sh -# - -# Location of the .sql file with the schema -DBSQL="tables.sql" - -# Schema Version -SVER="2" - -# Local Version, defaults to 0 -LVER="0" - -TFILE="/tmp/.anopedb.$$" - -if [ "`eval echo -n 'a'`" = "-n a" ] ; then - c="\c" -else - n="-n" -fi - -DBFILE=../data/$DBSQL - -if [ ! -f "./$DBFILE" ] ; then - echo "Error: Required file $DBSQL was not found!"; - exit -fi - -echo "" -echo "This script will guide you through the process of configuring your Anope" -echo "installation to make use of MySQL support. This script must be used for both" -echo "new installs as well as for upgrading for users who have a previous version" -echo "of Anope installed" - -while [ -z "$SQLHOST" ] ; do - echo "" - echo "What is the hostname of your MySQL server?" - echo $n "-> $c" - read cc - if [ ! -z "$cc" ] ; then - SQLHOST=$cc - fi -done - -while [ -z "$SQLUSER" ] ; do - echo "" - echo "What is your MySQL username?" - echo $n "-> $c" - read cc - if [ ! -z "$cc" ] ; then - SQLUSER=$cc - fi -done - -OLD_TTY=`stty -g` - -echo "" -echo "What is your MySQL password?" -echo $n "-> $c" -stty -echo echonl -read cc -SQLPASS_PREFIX="" -if [ ! -z "$cc" ] ; then - SQLPASS_PREFIX="-p" - SQLPASS=$cc -fi -stty $OLD_TTY - -mysqlshow -h$SQLHOST -u$SQLUSER $SQLPASS_PREFIX$SQLPASS >/dev/null 2>&1 -if test "$?" = "1" ; then - echo "Error: Unable to login, verify your login/password and hostname" - exit -fi - -while [ -z "$SQLDB" ] ; do - echo "" - echo "What is the name of the Anope SQL database?" - echo $n "-> $c" - read cc - if [ ! -z "$cc" ] ; then - SQLDB=$cc - fi -done - -MYSQLDUMP="mysqldump -h$SQLHOST -u$SQLUSER $SQLPASS_PREFIX$SQLPASS $SQLDB" -MYSQLSHOW="mysqlshow -h$SQLHOST -u$SQLUSER $SQLPASS_PREFIX$SQLPASS $SQLDB" -MYSQL="mysql -h$SQLHOST -u$SQLUSER $SQLPASS_PREFIX$SQLPASS $SQLDB" - -echo "" - -$MYSQLSHOW | grep -q $SQLDB -if test "$?" = "1" ; then - echo -n "Unable to find databse, creating... " - mysql -h$SQLHOST -u$SQLUSER $SQLPASS_PREFIX$SQLPASS -Bs -e "create database $SQLDB" >/dev/null 2>&1 - if test "$?" = "0" ; then - echo "done!" - else - echo "failed!" - FAILED="$FAILED 'database creation'" - fi -fi - -$MYSQL -Bs -e "show tables like 'anope_os_core'" | grep -q anope_os_core -if test "$?" = "1" ; then - echo -n "Unable to find Anope schema, creating... " - $MYSQL < $DBFILE - if test "$?" = "0" ; then - echo "done!" - else - echo "failed!" - FAILED="$FAILED 'schema creation'" - fi -else - echo "done!" -fi - -echo "" - -if [ $LVER -ne $SVER ]; then -echo -n "Inserting initial version number... " -$MYSQL -Bs -e "delete from anope_info" -echo "INSERT INTO anope_info (version, date) VALUES ($SVER, now())" > $TFILE -$MYSQL < $TFILE >/dev/null 2>&1 -if test "$?" = "0" ; then - echo "done!" -else - echo "failed!" - FAILED="$FAILED 'version insert'" -fi -fi - -rm -f $TFILE -if test "x$FAILED" = "x" ; then - # Try to find out more about this installation - SQLPORT="$(mysql_config --port 2> /dev/null)" - if test "$SQLPORT" = "0" ; then - SQLPORT=3306 - fi - echo "" - echo "Your MySQL setup is complete and your Anope schema is up to date. Make" - echo "sure you configure MySQL on your services.conf file prior to launching" - echo "Anope with MySQL support." - echo "" -else - echo "The following operations failed:" - echo "$FAILED" -fi - -exit diff --git a/src/bots.cpp b/src/bots.cpp index 390fc6a69..928dcb2c1 100644 --- a/src/bots.cpp +++ b/src/bots.cpp @@ -64,6 +64,29 @@ BotInfo::~BotInfo() BotListByUID.erase(this->uid); } +SerializableBase::serialized_data BotInfo::serialize() +{ + SerializableBase::serialized_data data; + + data["nick"] << this->nick; + data["user"] << this->ident; + data["host"] << this->host; + data["realname"] << this->realname; + data["created"] << this->created; + data["chancount"] << this->chancount; + + return data; +} + +void BotInfo::unserialize(SerializableBase::serialized_data &data) +{ + BotInfo *bi = findbot(data["nick"].astr()); + if (bi == NULL) + bi = new BotInfo(data["nick"].astr(), data["user"].astr(), data["host"].astr(), data["realname"].astr()); + data["created"] >> bi->created; + data["chancount"] >> bi->chancount; +} + void BotInfo::GenerateUID() { if (!this->uid.empty()) diff --git a/src/hostserv.cpp b/src/hostserv.cpp index d3000d552..55cbaff29 100644 --- a/src/hostserv.cpp +++ b/src/hostserv.cpp @@ -72,7 +72,7 @@ const Anope::string &HostInfo::GetCreator() const /** Retrieve when the vhost was crated * @return the time it was created */ -const time_t HostInfo::GetTime() const +time_t HostInfo::GetTime() const { return Time; } diff --git a/src/init.cpp b/src/init.cpp index beb34aafb..c4cd62b07 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -241,6 +241,8 @@ void Init(int ac, char **av) #endif if (set_group() < 0) throw FatalException("set_group() fail"); + + RegisterTypes(); /* Parse command line arguments */ ParseCommandLineArguments(ac, av); @@ -442,8 +444,6 @@ void Init(int ac, char **av) EventReturn MOD_RESULT; FOREACH_RESULT(I_OnLoadDatabase, OnLoadDatabase()); Log() << "Databases loaded"; - - FOREACH_MOD(I_OnPostLoadDatabases, OnPostLoadDatabases()); } /*************************************************************************/ diff --git a/src/main.cpp b/src/main.cpp index aab9edce5..5d3b5e3de 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -375,6 +375,7 @@ int main(int ac, char **av, char **envp) ModuleManager::UnloadModule(m, NULL); ModuleManager::CleanupRuntimeDirectory(); + serialized_items.clear(); #ifdef _WIN32 OnShutdown(); diff --git a/src/memoserv.cpp b/src/memoserv.cpp index 21940aca1..faaca180b 100644 --- a/src/memoserv.cpp +++ b/src/memoserv.cpp @@ -11,9 +11,41 @@ #include "services.h" #include "modules.h" +#include "memoserv.h" Memo::Memo() : Flags(MemoFlagStrings) { } +SerializableBase::serialized_data Memo::serialize() +{ + serialized_data data; + + data["owner"] << this->owner; + data["time"] << this->time; + data["sender"] << this->sender; + data["text"] << this->text; + + return data; +} + +void Memo::unserialize(SerializableBase::serialized_data &data) +{ + if (!memoserv) + return; + + bool ischan; + MemoInfo *mi = memoserv->GetMemoInfo(data["owner"].astr(), ischan); + if (!mi) + return; + + Memo *m = new Memo(); + data["owner"] >> m->owner; + data["time"] >> m->time; + data["sender"] >> m->sender; + data["text"] >> m->text; + + mi->memos.push_back(m); +} + unsigned MemoInfo::GetIndex(Memo *m) const { for (unsigned i = 0; i < this->memos.size(); ++i) diff --git a/src/misc.cpp b/src/misc.cpp index 5e41d42b7..0090dfa3b 100644 --- a/src/misc.cpp +++ b/src/misc.cpp @@ -14,6 +14,19 @@ #include "version.h" #include "modules.h" +ExtensibleItem::ExtensibleItem() +{ +} + +ExtensibleItem::~ExtensibleItem() +{ +} + +void ExtensibleItem::OnDelete() +{ + delete this; +} + struct arc4_stream { uint8 i; diff --git a/src/modes.cpp b/src/modes.cpp index 4fc5d6483..e6f3a27a1 100644 --- a/src/modes.cpp +++ b/src/modes.cpp @@ -54,7 +54,7 @@ void SetDefaultMLock(ServerConfig *config) if (cm->Type != MODE_LIST) // Only MODE_LIST can have duplicates def_mode_locks.erase(cm->Name); - def_mode_locks.insert(std::make_pair(cm->Name, ModeLock(adding == 1, cm->Name, param))); + def_mode_locks.insert(std::make_pair(cm->Name, ModeLock(NULL, adding == 1, cm->Name, param))); } } } diff --git a/src/nickalias.cpp b/src/nickalias.cpp index f5269cc9f..7b07a4af3 100644 --- a/src/nickalias.cpp +++ b/src/nickalias.cpp @@ -102,3 +102,47 @@ void NickAlias::OnCancel(User *) new NickServRelease(this, Config->NSReleaseTimeout); } } + +SerializableBase::serialized_data NickAlias::serialize() +{ + serialized_data data; + + data["nick"].setKey().setMax(Config->NickLen) << this->nick; + data["last_quit"] << this->last_quit; + data["last_realname"] << this->last_realname; + data["last_usermask"] << this->last_usermask; + data["last_realhost"] << this->last_realhost; + data["time_registered"].setType(Serialize::DT_INT) << this->time_registered; + data["last_seen"].setType(Serialize::DT_INT) << this->last_seen; + data["nc"] << this->nc->display; + + if (this->hostinfo.HasVhost()) + { + data["vhost_ident"] << this->hostinfo.GetIdent(); + data["vhost_host"] << this->hostinfo.GetHost(); + data["vhost_creator"] << this->hostinfo.GetCreator(); + data["vhost_time"] << this->hostinfo.GetTime(); + } + + return data; +} + +void NickAlias::unserialize(SerializableBase::serialized_data &data) +{ + NickCore *core = findcore(data["nc"].astr()); + if (core == NULL) + return; + + NickAlias *na = new NickAlias(data["nick"].astr(), core); + data["last_quit"] >> na->last_quit; + data["last_realname"] >> na->last_realname; + data["last_usermask"] >> na->last_usermask; + data["last_realhost"] >> na->last_realhost; + data["time_registered"] >> na->time_registered; + data["last_seen"] >> na->last_seen; + + time_t vhost_time; + data["vhost_time"] >> vhost_time; + na->hostinfo.SetVhost(data["vhost_ident"].astr(), data["vhost_host"].astr(), data["vhost_creator"].astr(), vhost_time); +} + diff --git a/src/nickcore.cpp b/src/nickcore.cpp index a33382f06..968e4d0e9 100644 --- a/src/nickcore.cpp +++ b/src/nickcore.cpp @@ -45,6 +45,57 @@ NickCore::~NickCore() } } +SerializableBase::serialized_data NickCore::serialize() +{ + serialized_data data; + + data["display"].setKey().setMax(Config->NickLen) << this->display; + data["pass"] << this->pass; + data["email"] << this->email; + data["greet"] << this->greet; + data["language"] << this->language; + for (unsigned i = 0; i < this->access.size(); ++i) + data["access"] << this->access[i] << " "; + for (unsigned i = 0; i < this->cert.size(); ++i) + data["cert"] << this->cert[i] << " "; + data["memomax"] << this->memos.memomax; + for (unsigned i = 0; i < this->memos.ignores.size(); ++i) + data["memoignores"] << this->memos.ignores[i] << " "; + + return data; +} + +void NickCore::unserialize(serialized_data &data) +{ + NickCore *nc = new NickCore(data["display"].astr()); + data["pass"] >> nc->pass; + data["email"] >> nc->email; + data["greet"] >> nc->greet; + data["language"] >> nc->language; + { + Anope::string buf; + data["access"] >> buf; + spacesepstream sep(buf); + while (sep.GetToken(buf)) + nc->access.push_back(buf); + } + { + Anope::string buf; + data["cert"] >> buf; + spacesepstream sep(buf); + while (sep.GetToken(buf)) + nc->access.push_back(buf); + } + data["memomax"] >> nc->memos.memomax; + { + Anope::string buf; + data["memoignores"] >> buf; + spacesepstream sep(buf); + while (sep.GetToken(buf)) + nc->memos.ignores.push_back(buf); + } +} + bool NickCore::IsServicesOper() const { return this->o != NULL; diff --git a/src/operserv.cpp b/src/operserv.cpp index b17f9e0ad..b0db3aee1 100644 --- a/src/operserv.cpp +++ b/src/operserv.cpp @@ -16,6 +16,10 @@ /* List of XLine managers we check users against in XLineManager::CheckAll */ std::list XLineManager::XLineManagers; +XLine::XLine() +{ +} + XLine::XLine(const Anope::string &mask, const Anope::string &reason) : Mask(mask), Created(0), Expires(0), Reason(reason) { } @@ -66,6 +70,37 @@ sockaddrs XLine::GetIP() const return addr; } +SerializableBase::serialized_data XLine::serialize() +{ + serialized_data data; + + data["mask"] << this->Mask; + data["by"] << this->By; + data["created"] << this->Created; + data["expires"] << this->Expires; + data["reason"] << this->Reason; + data["manager"] << this->Manager; + + return data; +} + +void XLine::unserialize(SerializableBase::serialized_data &data) +{ + service_reference xlm(data["manager"].astr()); + if (!xlm) + return; + + XLine *xl = new XLine(); + + data["mask"] >> xl->Mask; + data["by"] >> xl->By; + data["created"] >> xl->Created; + data["expires"] >> xl->Expires; + data["reason"] >> xl->Reason; + + xlm->AddXLine(xl); +} + /** Constructor */ XLineManager::XLineManager(Module *creator, const Anope::string &xname, char t) : Service(creator, xname), type(t) @@ -159,6 +194,7 @@ const std::vector &XLineManager::GetList() const */ void XLineManager::AddXLine(XLine *x) { + x->Manager = this->name; this->XLines.push_back(x); } @@ -199,8 +235,9 @@ XLine *XLineManager::GetEntry(unsigned index) */ void XLineManager::Clear() { - while (!this->XLines.empty()) - this->DelXLine(this->XLines.front()); + for (unsigned i = 0; i < this->XLines.size(); ++i) + delete this->XLines[i]; + this->XLines.clear(); } /** Add an entry to this XLine Manager diff --git a/src/regchannel.cpp b/src/regchannel.cpp index 7eceb5942..4c90fa458 100644 --- a/src/regchannel.cpp +++ b/src/regchannel.cpp @@ -12,6 +12,124 @@ #include "services.h" #include "modules.h" +SerializableBase::serialized_data BadWord::serialize() +{ + serialized_data data; + + data["word"] << this->word; + data["type"].setType(Serialize::DT_INT) << this->type; + + return data; +} + +void BadWord::unserialize(SerializableBase::serialized_data &data) +{ + BadWord *bw = new BadWord(); + data["word"] >> bw->word; + unsigned int n; + data["type"] >> n; + bw->type = static_cast(n); +} + +SerializableBase::serialized_data AutoKick::serialize() +{ + serialized_data data; + + if (this->HasFlag(AK_ISNICK) && this->nc) + data["nc"] << this->nc->display; + else + data["mask"] << this->mask; + data["reason"] << this->reason; + data["creator"] << this->creator; + data["addtime"].setType(Serialize::DT_INT) << this->addtime; + data["last_used"].setType(Serialize::DT_INT) << this->last_used; + + return data; +} + +void AutoKick::unserialize(SerializableBase::serialized_data &data) +{ + AutoKick *ak = new AutoKick(); + + data["mask"] >> ak->mask; + ak->nc = findcore(data["nc"].astr()); + data["reason"] >> ak->reason; + data["creator"] >> ak->creator; + data["addtime"] >> ak->addtime; + data["last_used"] >> ak->last_used; +} + +SerializableBase::serialized_data ModeLock::serialize() +{ + serialized_data data; + + if (this->ci == NULL) + return data; + + data["ci"] << this->ci->name; + data["set"] << this->set; + data["name"] << ChannelModeNameStrings[this->name]; + data["param"] << this->param; + data["setter"] << this->setter; + data["created"].setType(Serialize::DT_INT) << this->created; + + return data; +} + +void ModeLock::unserialize(SerializableBase::serialized_data &data) +{ + ChannelInfo *ci = cs_findchan(data["ci"].astr()); + if (ci == NULL) + return; + + ModeLock ml; + + ml.ci = ci; + + data["set"] >> ml.set; + Anope::string n; + data["name"] >> n; + for (unsigned i = 0; !ChannelModeNameStrings[i].empty(); ++i) + if (n == ChannelModeNameStrings[i]) + { + ml.name = static_cast(i); + break; + } + data["param"] >> ml.param; + data["setter"] >> ml.setter; + data["created"] >> ml.created; + + ci->mode_locks.insert(std::make_pair(ml.name, ml)); +} + +SerializableBase::serialized_data LogSetting::serialize() +{ + serialized_data data; + + data["service_name"] << service_name; + data["command_service"] << command_service; + data["command_name"] << command_name; + data["method"] << method; + data["extra"] << extra; + data["creator"] << creator; + data["created"].setType(Serialize::DT_INT) << created; + + return data; +} + +void LogSetting::unserialize(serialized_data &data) +{ + LogSetting ls; + + data["service_name"] >> ls.service_name; + data["command_service"] >> ls.command_service; + data["command_name"] >> ls.command_name; + data["method"] >> ls.method; + data["extra"] >> ls.extra; + data["creator"] >> ls.creator; + data["created"] >> ls.created; +} + /** Default constructor * @param chname The channel name */ @@ -142,6 +260,83 @@ ChannelInfo::~ChannelInfo() --this->founder->channelcount; } +SerializableBase::serialized_data ChannelInfo::serialize() +{ + serialized_data data; + + data["name"].setKey().setMax(255) << this->name; + if (this->founder) + data["founder"] << this->founder->display; + if (this->successor) + data["successor"] << this->successor->display; + data["description"] << this->desc; + data["time_registered"].setType(Serialize::DT_INT) << this->time_registered; + data["last_used"].setType(Serialize::DT_INT) << this->last_used; + data["last_topic"] << this->last_topic; + data["last_topic_setter"] << this->last_topic_setter; + data["last_topic_time"].setType(Serialize::DT_INT) << this->last_topic_time; + data["bantype"].setType(Serialize::DT_INT) << this->bantype; + data["botflags"] << this->botflags.ToString(); + { + Anope::string levels_buffer; + for (std::map::iterator it = this->levels.begin(), it_end = this->levels.end(); it != it_end; ++it) + levels_buffer += it->first + " " + stringify(it->second) + " "; + data["levels"] << levels_buffer; + } + if (this->bi) + data["bi"] << this->bi->nick; + for (int i = 0; i < TTB_SIZE; ++i) + data["ttb"] << this->ttb[i] << " "; + data["capsmin"].setType(Serialize::DT_INT) << this->capsmin; + data["capspercent"].setType(Serialize::DT_INT) << this->capspercent; + data["floodlines"].setType(Serialize::DT_INT) << this->floodlines; + data["floodsecs"].setType(Serialize::DT_INT) << this->floodsecs; + data["repeattimes"].setType(Serialize::DT_INT) << this->repeattimes; + data["memomax"] << this->memos.memomax; + for (unsigned i = 0; i < this->memos.ignores.size(); ++i) + data["memoignores"] << this->memos.ignores[i] << " "; + + return data; +} + +void ChannelInfo::unserialize(SerializableBase::serialized_data &data) +{ + ChannelInfo *ci = new ChannelInfo(data["name"].astr()); + if (data.count("founder") > 0) + ci->founder = findcore(data["founder"].astr()); + if (data.count("successor") > 0) + ci->successor = findcore(data["successor"].astr()); + data["description"] >> ci->desc; + data["time_registered"] >> ci->time_registered; + data["last_used"] >> ci->last_used; + data["last_topic"] >> ci->last_topic; + data["last_topic_setter"] >> ci->last_topic_setter; + data["last_topic_time"] >> ci->last_topic_time; + data["bantype"] >> ci->bantype; + ci->botflags.FromString(data["botflags"].astr()); + { + std::vector v = BuildStringVector(data["levels"].astr()); + for (unsigned i = 0; i + 1 < v.size(); i += 2) + ci->levels[v[i]] = convertTo(v[i + 1]); + } + if (data.count("bi") > 0) + ci->bi = findbot(data["bi"].astr()); + data["capsmin"] >> ci->capsmin; + data["capspercent"] >> ci->capspercent; + data["floodlines"] >> ci->floodlines; + data["floodsecs"] >> ci->floodsecs; + data["repeattimes"] >> ci->repeattimes; + data["memomax"] >> ci->memos.memomax; + { + Anope::string buf; + data["memoignores"] >> buf; + spacesepstream sep(buf); + while (sep.GetToken(buf)) + ci->memos.ignores.push_back(buf); + } +} + + /** Change the founder of the channek * @params nc The new founder */ @@ -338,6 +533,7 @@ AutoKick *ChannelInfo::AddAkick(const Anope::string &user, const Anope::string & { AutoKick *autokick = new AutoKick(); autokick->mask = mask; + autokick->nc = NULL; autokick->reason = reason; autokick->creator = user; autokick->addtime = t; @@ -484,7 +680,7 @@ bool ChannelInfo::SetMLock(ChannelMode *mode, bool status, const Anope::string & { if (setter.empty()) setter = this->founder ? this->founder->display : "Unknown"; - std::pair ml = std::make_pair(mode->Name, ModeLock(status, mode->Name, param, setter, created)); + std::pair ml = std::make_pair(mode->Name, ModeLock(this, status, mode->Name, param, setter, created)); EventReturn MOD_RESULT; FOREACH_RESULT(I_OnMLock, OnMLock(this, &ml.second)); @@ -525,13 +721,20 @@ bool ChannelInfo::SetMLock(ChannelMode *mode, bool status, const Anope::string & */ bool ChannelInfo::RemoveMLock(ChannelMode *mode, const Anope::string ¶m) { - EventReturn MOD_RESULT; - FOREACH_RESULT(I_OnUnMLock, OnUnMLock(this, mode, param)); - if (MOD_RESULT == EVENT_STOP) - return false; - if (mode->Type == MODE_REGULAR || mode->Type == MODE_PARAM) - return this->mode_locks.erase(mode->Name) > 0; + { + std::multimap::iterator it = this->mode_locks.find(mode->Name), it_end = this->mode_locks.upper_bound(mode->Name), it_next = it; + if (it != this->mode_locks.end()) + for (; it != it_end; it = it_next) + { + ++it_next; + EventReturn MOD_RESULT; + FOREACH_RESULT(I_OnUnMLock, OnUnMLock(this, &it->second)); + if (MOD_RESULT != EVENT_STOP) + this->mode_locks.erase(it); + } + return true; + } else { // For list or status modes, we must check the parameter @@ -544,6 +747,10 @@ bool ChannelInfo::RemoveMLock(ChannelMode *mode, const Anope::string ¶m) const ModeLock &ml = it->second; if (ml.param == param) { + EventReturn MOD_RESULT; + FOREACH_RESULT(I_OnUnMLock, OnUnMLock(this, &it->second)); + if (MOD_RESULT == EVENT_STOP) + return false; this->mode_locks.erase(it); return true; } diff --git a/src/tools/db-convert.cpp b/src/tools/db-convert.cpp deleted file mode 100644 index 16dc3516a..000000000 --- a/src/tools/db-convert.cpp +++ /dev/null @@ -1,1032 +0,0 @@ -/* - * Copyright (C) 2003-2011 Anope Team - * Copyright (C) 2005-2006 Florian Schulze - * Copyright (C) 2008-2011 Robin Burchell - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License (see it online - * at http://www.gnu.org/copyleft/gpl.html) as published by the Free - * Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#include "db-convert.h" - -static std::string GetLevelName(int level) -{ - switch (level) - { - case 0: - return "INVITE"; - case 1: - return "AKICK"; - case 2: - return "SET"; - case 3: - return "UNBAN"; - case 4: - return "AUTOOP"; - case 5: - return "AUTODEOP"; - case 6: - return "AUTOVOICE"; - case 7: - return "OPDEOP"; - case 8: - return "LIST"; - case 9: - return "CLEAR"; - case 10: - return "NOJOIN"; - case 11: - return "CHANGE"; - case 12: - return "MEMO"; - case 13: - return "ASSIGN"; - case 14: - return "BADWORDS"; - case 15: - return "NOKICK"; - case 16: - return "FANTASIA"; - case 17: - return "SAY"; - case 18: - return "GREET"; - case 19: - return "VOICEME"; - case 20: - return "VOICE"; - case 21: - return "GETKEY"; - case 22: - return "AUTOHALFOP"; - case 23: - return "AUTOPROTECT"; - case 24: - return "OPDEOPME"; - case 25: - return "HALFOPME"; - case 26: - return "HALFOP"; - case 27: - return "PROTECTME"; - case 28: - return "PROTECT"; - case 29: - return "KICKME"; - case 30: - return "KICK"; - case 31: - return "SIGNKICK"; - case 32: - return "BANME"; - case 33: - return "BAN"; - case 34: - return "TOPIC"; - case 35: - return "INFO"; - default: - return "INVALID"; - } -} - -void process_mlock_modes(std::ofstream &fs, size_t m, const std::string &ircd) -{ - /* this is the same in all protocol modules */ - if (m & 0x1) fs << " CMODE_INVITE"; // CMODE_i - if (m & 0x2) fs << " CMODE_MODERATED"; // CMODE_m - if (m & 0x4) fs << " CMODE_NOEXTERNAL"; // CMODE_n - if (m & 0x8) fs << " CMODE_PRIVATE"; // CMODE_p - if (m & 0x10) fs << " CMODE_SECRET"; // CMODE_s - if (m & 0x20) fs << " CMODE_TOPIC"; // CMODE_t - if (m & 0x40) fs << " CMODE_KEY"; // CMODE_k - if (m & 0x80) fs << " CMODE_LIMIT"; // CMODE_l - if (m & 0x200) fs << " CMODE_REGISTERED"; // CMODE_r - - if (ircd == "unreal" || ircd == "inspircd") - { - if (m & 0x100) fs << " CMODE_REGISTEREDONLY"; // CMODE_R - if (m & 0x400) fs << " CMODE_BLOCKCOLOR"; // CMODE_c - if (m & 0x2000) fs << " CMODE_NOKNOCK"; // CMODE_K - if (m & 0x4000) fs << " CMODE_REDIRECT"; // CMODE_L - if (m & 0x8000) fs << " CMODE_OPERONLY"; // CMODE_O - if (m & 0x10000) fs << " CMODE_NOKICK"; // CMODE_Q - if (m & 0x20000) fs << " CMODE_STRIPCOLOR"; // CMODE_S - if (m & 0x80000) fs << " CMODE_FLOOD"; // CMODE_f - if (m & 0x100000) fs << " CMODE_FILTER"; // CMODE_G - if (m & 0x200000) fs << " CMODE_NOCTCP"; // CMODE_C - if (m & 0x400000) fs << " CMODE_AUDITORIUM"; // CMODE_u - if (m & 0x800000) fs << " CMODE_SSL"; // CMODE_z - if (m & 0x1000000) fs << " CMODE_NONICK"; // CMODE_N - if (m & 0x4000000) fs << " CMODE_REGMODERATED"; // CMODE_M - } - - if (ircd == "unreal") - { - if (m & 0x800) fs << " CMODE_ADMINONLY"; // CMODE_A - if (m & 0x40000) fs << " CMODE_NOINVITE"; // CMODE_f - if (m & 0x2000000) fs << " CMODE_NONOTICE"; // CMODE_T - if (m & 0x8000000) fs << " CMODE_JOINFLOOD"; // CMODE_j - } - if (ircd == "inspircd" ) - { - if (m & 0x800) fs << " CMODE_ALLINVITE"; // CMODE_A - if (m & 0x1000) fs << " CMODE_NONOTICE"; // CMODE_T - /* for some reason, there is no CMODE_P in 1.8.x and no CMODE_V in the 1.9.1 protocol module - we are ignoring this flag until we find a solution for this problem, - so the +V/+P mlock mode is lost on convert - anope 1.8: if (m & 0x40000) fs << " NOINVITE"; // CMODE_V - anope 1.9: if (m & 0x40000) fs << " PERM"; // CMODE_P - */ - if (m & 0x2000000) fs << " CMODE_JOINFLOOD"; // CMODE_j - if (m & 0x8000000) fs << " CMODE_BLOCKCAPS"; // CMODE_B - if (m & 0x10000000) fs << " CMODE_NICKFLOOD"; // CMODE_F - //if (m & 0x20000000) fs << ""; // CMODE_g (mode +g ) ... can't be mlocked in older version - //if (m & 0x40000000) fs << ""; // CMODE_J (mode +J [seconds] ... can't be mlocked in older versions - } -} - -int main(int argc, char *argv[]) -{ - dbFILE *f; - std::ofstream fs; - std::string hashm, ircd; - - printf("\n"C_LBLUE"Anope 1.8.x -> 1.9.3+ database converter"C_NONE"\n\n"); - - while (hashm != "md5" && hashm != "sha1" && hashm != "oldmd5" && hashm != "plain") - { - if (!hashm.empty()) - std::cout << "Select a valid option, thanks!" << std::endl; - std::cout << "Which hash method did you use? (md5, sha1, oldmd5, plain)" << std::endl << "? "; - std::cin >> hashm; - } - - while (ircd != "bahamut" && ircd != "charybdis" && ircd != "dreamforge" && ircd != "hybrid" && ircd != "inspircd" && ircd != "plexus2" && ircd != "plexus3" && ircd != "ptlink" && ircd != "rageircd" && ircd != "ratbox" && ircd != "shadowircd" && ircd != "solidircd" && ircd != "ultimate2" && ircd != "ultimate3" && ircd != "unreal" && ircd != "viagra") - { - if (!ircd.empty()) - std::cout << "Select a valid option!" << std::endl; - std::cout << "Which IRCd did you use? (required for converting the mlock modes)" << std::endl; - std::cout << "(bahamut, charybdis, dreamforge, hybrid, inspircd, plexus2, plexus3, ptlink," << std::endl; - std::cout << "rageircd, ratbox, shadowircd, solidircd, ultimate2, ultimate3, unreal, viagra)" << std::endl; - std::cout << "Your IRCd: "; std::cin >> ircd; - } - - std::cout << "You selected " << hashm << std::endl; - - fs.clear(); - fs.open("anope.db"); - if (!fs.is_open()) - { - printf("\n"C_LBLUE"Could not open anope.db for write"C_NONE"\n\n"); - exit(1); - } - - fs << "VER 2" << std::endl; - - /* Section I: Nicks */ - /* Ia: First database */ - if ((f = open_db_read("NickServ", "nick.db", 14))) - { - NickAlias *na, **nalast, *naprev; - NickCore *nc, **nclast, *ncprev; - int16 tmp16; - int32 tmp32; - int i, j, c; - - printf("Trying to merge nicks...\n"); - - /* Nick cores */ - for (i = 0; i < 1024; ++i) - { - nclast = &nclists[i]; - ncprev = NULL; - - while ((c = getc_db(f)) == 1) - { - if (c != 1) - { - printf("Invalid format in nickserv db.\n"); - exit(0); - } - - nc = new NickCore; - nc->aliascount = 0; - nc->unused = 0; - - *nclast = nc; - nclast = &nc->next; - nc->prev = ncprev; - ncprev = nc; - - READ(read_string(&nc->display, f)); - READ(read_buffer(nc->pass, f)); - READ(read_string(&nc->email, f)); - READ(read_string(&nc->greet, f)); - READ(read_uint32(&nc->icq, f)); - READ(read_string(&nc->url, f)); - READ(read_uint32(&nc->flags, f)); - READ(read_uint16(&nc->language, f)); - READ(read_uint16(&nc->accesscount, f)); - if (nc->accesscount) - { - char **access = new char *[nc->accesscount + 1]; - nc->access = access; - for (j = 0; j < nc->accesscount; ++j, ++access) - READ(read_string(access, f)); - } - READ(read_int16(&nc->memos.memocount, f)); - READ(read_int16(&nc->memos.memomax, f)); - if (nc->memos.memocount) - { - Memo *memos = new Memo[nc->memos.memocount]; - nc->memos.memos = memos; - for (j = 0; j < nc->memos.memocount; ++j, ++memos) - { - READ(read_uint32(&memos->number, f)); - READ(read_uint16(&memos->flags, f)); - READ(read_int32(&tmp32, f)); - memos->time = tmp32; - READ(read_buffer(memos->sender, f)); - READ(read_string(&memos->text, f)); - } - } - READ(read_uint16(&nc->channelcount, f)); - READ(read_int16(&tmp16, f)); - } /* getc_db() */ - *nclast = NULL; - } /* for() loop */ - - /* Nick aliases */ - for (i = 0; i < 1024; ++i) - { - char *s = NULL; - - nalast = &nalists[i]; - naprev = NULL; - - while ((c = getc_db(f)) == 1) - { - if (c != 1) - { - printf("Invalid format in nick db.\n"); - exit(0); - } - - na = new NickAlias; - - READ(read_string(&na->nick, f)); - READ(read_string(&na->last_usermask, f)); - READ(read_string(&na->last_realname, f)); - READ(read_string(&na->last_quit, f)); - - READ(read_int32(&tmp32, f)); - na->time_registered = tmp32; - READ(read_int32(&tmp32, f)); - na->last_seen = tmp32; - READ(read_uint16(&na->status, f)); - READ(read_string(&s, f)); - na->nc = findcore(s, 0); - ++na->nc->aliascount; - //free(s); - delete [] s; - - *nalast = na; - nalast = &na->next; - na->prev = naprev; - naprev = na; - } /* getc_db() */ - *nalast = NULL; - } /* for() loop */ - close_db(f); /* End of section Ia */ - } - - /* CLEAN THE CORES */ - int i; - for (i = 0; i < 1024; ++i) - { - NickCore *ncnext; - for (NickCore *nc = nclists[i]; nc; nc = ncnext) - { - ncnext = nc->next; - if (nc->aliascount < 1) - { - printf("Deleting core %s (%s).\n", nc->display, nc->email); - delcore(nc); - } - } - } - - head = NULL; - if ((f = open_db_read("HostServ", "hosts.db", 3))) - { - int c; - HostCore *hc; - - while ((c = getc_db(f)) == 1) - { - hc = new HostCore; - READ(read_string(&hc->nick, f)); - READ(read_string(&hc->vIdent, f)); - READ(read_string(&hc->vHost, f)); - READ(read_string(&hc->creator, f)); - READ(read_int32(&hc->time, f)); - - hc->next = head; - head = hc; - } - - close_db(f); - } - - /* Nick cores */ - for (i = 0; i < 1024; ++i) - { - NickAlias *na; - NickCore *nc; - char **access; - Memo *memos; - int j, len; - std::string cpass; - for (nc = nclists[i]; nc; nc = nc->next) - { - if (!nc->display) - { - std::cout << "Skipping core with no display" << std::endl; - continue; - } - - if (nc->aliascount < 1) - { - std::cout << "Skipping core with 0 or less aliases (wtf?)" << std::endl; - continue; - } - - if (nc->flags & 0x80000000) - { - std::cout << "Skipping forbidden nick " << nc->display << std::endl; - continue; - } - - // Enc pass - if (hashm == "plain") - len = strlen(nc->pass); - else if (hashm == "md5") - len = 16; - else if (hashm == "sha1") - len = 20; - else if (hashm == "oldmd5") - len = 16; - else - len = 32; - - if (hashm == "plain") - b64_encode(nc->pass, cpass); - else - cpass = Hex(nc->pass); - - fs << "NC " << nc->display << " " << hashm << ":" << cpass << std::endl; - fs << "MD LANGUAGE " << GetLanguageID(nc->language) << std::endl; - fs << "MD MEMOMAX " << nc->memos.memomax << std::endl; - fs << "MD CHANCOUNT " << nc->channelcount << std::endl; - - std::cout << "Wrote account for " << nc->display << " passlen " << cpass.length() << std::endl; - if (nc->email) - fs << "MD EMAIL " << nc->email << std::endl; - if (nc->greet) - fs << "MD GREET :" << nc->greet << std::endl; - if (nc->icq) - fs << "MD ICQ :" << nc->icq << std::endl; - if (nc->url) - fs << "MD URL :" << nc->url << std::endl; - - if (nc->accesscount) - for (j = 0, access = nc->access; j < nc->accesscount && *access; ++j, ++access) - fs << "MD ACCESS " << *access << std::endl; - - fs << "MD FLAGS " - << (nc->flags & NI_KILLPROTECT ? "KILLPROTECT " : "") - << (nc->flags & NI_SECURE ? "SECURE " : "") - << (nc->flags & NI_MSG ? "MSG " : "") - << (nc->flags & NI_MEMO_HARDMAX ? "MEMO_HARDMAX " : "") - << (nc->flags & NI_MEMO_SIGNON ? "MEMO_SIGNON " : "") - << (nc->flags & NI_MEMO_RECEIVE ? "MEMO_RECEIVE " : "") - << (nc->flags & NI_PRIVATE ? "PRIVATE " : "") - << (nc->flags & NI_HIDE_EMAIL ? "HIDE_EMAIL " : "") - << (nc->flags & NI_HIDE_MASK ? "HIDE_MASK " : "") - << (nc->flags & NI_HIDE_QUIT ? "HIDE_QUIT " : "") - << (nc->flags & NI_KILL_QUICK ? "KILL_QUICK " : "") - << (nc->flags & NI_KILL_IMMED ? "KILL_IMMED " : "") - << (nc->flags & NI_MEMO_MAIL ? "MEMO_MAIL " : "") - << (nc->flags & NI_HIDE_STATUS ? "HIDE_STATUS " : "") - << (nc->flags & NI_SUSPENDED ? "SUSPENDED " : "") - // in 1.8, the AUTOOP flag was set to disable AUTOOP. Now we enable it. --DP - << (!(nc->flags & NI_AUTOOP) ? "AUTOOP " : "") - << (nc->flags & NI_FORBIDDEN ? "FORBIDDEN " : "") << std::endl; - if (nc->memos.memocount) - { - memos = nc->memos.memos; - for (j = 0; j < nc->memos.memocount; ++j, ++memos) - { - if (!memos->text || !memos->sender) - continue; - fs << "MD MI " << memos->time << " " << memos->sender; - if (memos->flags & MF_UNREAD) - fs << " UNREAD"; - if (memos->flags & MF_RECEIPT) - fs << " RECEIPT"; - if (memos->flags & MF_NOTIFYS) - fs << " NOTIFYS"; - fs << " :" << memos->text << std::endl; - } - } - - /* we could do this in a seperate loop, I'm doing it here for tidiness. */ - for (int tmp = 0; tmp < 1024; ++tmp) - { - for (na = nalists[tmp]; na; na = na->next) - { - if (!na->nc) - { - std::cout << "Skipping alias with no core (wtf?)" << std::endl; - continue; - } - - if (na->nc != nc) - continue; - - std::cout << "Writing: " << na->nc->display << "'s nick: " << na->nick << std::endl; - - fs << "NA " << na->nc->display << " " << na->nick << " " << na->time_registered << " " << na->last_seen << std::endl; - if (na->last_usermask) - fs << "MD LAST_USERMASK " << na->last_usermask << std::endl; - if (na->last_realname) - fs << "MD LAST_REALNAME :" << na->last_realname << std::endl; - if (na->last_quit) - fs << "MD LAST_QUIT :" << na->last_quit << std::endl; - if ((na->status & NS_FORBIDDEN) || (na->status & NS_NO_EXPIRE)) - fs << "MD FLAGS" << (na->status & NS_FORBIDDEN ? " FORBIDDEN" : "") << (na->status & NS_NO_EXPIRE ? " NOEXPIRE" : "") << std::endl; - - HostCore *hc = findHostCore(na->nick); - if (hc && hc->creator && hc->vHost) - fs << "MD VHOST " << hc->creator << " " << hc->time << " " << hc->vHost << " :" << (hc->vIdent ? hc->vIdent : "") << std::endl; - } - } - } - } - - /* Section II: Bots */ - /* IIa: First database */ - if ((f = open_db_read("Botserv", "bot.db", 10))) - { - std::string input; - int c, broken = 0; - int32 created; - int16 flags, chancount; - char *nick, *user, *host, *real; - - std::cout << "Trying to convert bots..." << std::endl; - - while (input != "y" && input != "n") - { - std::cout << std::endl << "Are you converting a 1.9.0 database? (y/n) " << std::endl << "? "; - std::cin >> input; - } - if (input == "y") - broken = 1; - input = ""; - while (input != "y" && input != "n") - { - std::cout << std::endl << "Are you converting a 1.8.x database? (y/n) " << std::endl << "? "; - std::cin >> input; - } - /* 1.8 doesn't have nickserv etc in bot.db, create them */ - if (input == "y") - { - time_t now = time(NULL); - fs << "BI NickServ NickServ services.anope.org " << now << " 0 :NickServ" << std::endl; - fs << "MD FLAGS NICKSERV" << std::endl; - - fs << "BI ChanServ ChanServ services.anope.org " << now << " 0 :ChanServ" << std::endl; - fs << "MD FLAGS CHANSERV" << std::endl; - - fs << "BI BotServ BotServ services.anope.org " << now << " 0 :BotServ" << std::endl; - fs << "MD FLAGS BOTSERV" << std::endl; - - fs << "BI HostServ HostServ services.anope.org " << now << " 0 :HostServ" << std::endl; - fs << "MD FLAGS HOSTSERV" << std::endl; - - fs << "BI OperServ OperServ services.anope.org " << now << " 0 :OperServ" << std::endl; - fs << "MD FLAGS OPERSERV" << std::endl; - - fs << "BI MemoServ MemoServ services.anope.org " << now << " 0 :MemoServ" << std::endl; - fs << "MD FLAGS MEMOSERV" << std::endl; - - fs << "BI Global Global services.anope.org " << now << " 0: Global" << std::endl; - fs << "MD FLAGS GLOBAL" << std::endl; - } - - while ((c = getc_db(f)) == 1) - { - READ(read_string(&nick, f)); - READ(read_string(&user, f)); - READ(read_string(&host, f)); - READ(read_string(&real, f)); - SAFE(read_int16(&flags, f)); - READ(read_int32(&created, f)); - READ(read_int16(&chancount, f)); - - if (!created) - created = time(NULL); // Unfortunatley, we forgot to store the created bot time in 1.9.1+ - - /* fix for the 1.9.0 broken bot.db */ - if (broken) - { - flags = 0; - if (!mystricmp(nick, "ChanServ")) - flags |= BI_CHANSERV; - if (!mystricmp(nick, "BotServ")) - flags |= BI_BOTSERV; - if (!mystricmp(nick, "HostServ")) - flags |= BI_HOSTSERV; - if (!mystricmp(nick, "OperServ")) - flags |= BI_OPERSERV; - if (!mystricmp(nick, "MemoServ")) - flags |= BI_MEMOSERV; - if (!mystricmp(nick, "NickServ")) - flags |= BI_NICKSERV; - if (!mystricmp(nick, "Global")) - flags |= BI_GLOBAL; - } /* end of 1.9.0 broken database fix */ - std::cout << "Writing Bot " << nick << "!" << user << "@" << host << std::endl; - fs << "BI " << nick << " " << user << " " << host << " " << created << " " << chancount << " :" << real << std::endl; - fs << "MD FLAGS" - << (flags & BI_PRIVATE ? " PRIVATE" : "") - << (flags & BI_CHANSERV ? " CHANSERV" : "") - << (flags & BI_BOTSERV ? " BOTSERV" : "") - << (flags & BI_HOSTSERV ? " HOSTSERV" : "") - << (flags & BI_OPERSERV ? " OPERSERV" : "") - << (flags & BI_MEMOSERV ? " MEMOSERV" : "") - << (flags & BI_NICKSERV ? " NICKSERV" : "") - << (flags & BI_GLOBAL ? " GLOBAL" : "") << std::endl; - } - close_db(f); - } - - /* Section III: Chans */ - // IIIa: First database - if ((f = open_db_read("ChanServ", "chan.db", 16))) - { - ChannelInfo *ci, **last, *prev; - int c; - - printf("Trying to merge channels...\n"); - - for (i = 0; i < 256; ++i) - { - int16 tmp16; - int32 tmp32; - int n_levels; - char *s; - int n_ttb; - - last = &chanlists[i]; - prev = NULL; - - while ((c = getc_db(f)) == 1) - { - int j; - - if (c != 1) - { - printf("Invalid format in chans.db.\n"); - exit(0); - } - - ci = new ChannelInfo; - *last = ci; - last = &ci->next; - ci->prev = prev; - prev = ci; - READ(read_buffer(ci->name, f)); - READ(read_string(&ci->founder, f)); - READ(read_string(&ci->successor, f)); - READ(read_buffer(ci->founderpass, f)); - READ(read_string(&ci->desc, f)); - if (!ci->desc) - ci->desc = strdup(""); - std::cout << "Read " << ci->name << " founder " << (ci->founder ? ci->founder : "N/A") << std::endl; - READ(read_string(&ci->url, f)); - READ(read_string(&ci->email, f)); - READ(read_int32(&tmp32, f)); - ci->time_registered = tmp32; - READ(read_int32(&tmp32, f)); - ci->last_used = tmp32; - READ(read_string(&ci->last_topic, f)); - READ(read_buffer(ci->last_topic_setter, f)); - READ(read_int32(&tmp32, f)); - ci->last_topic_time = tmp32; - READ(read_uint32(&ci->flags, f)); - // Temporary flags cleanup - ci->flags &= ~0x80000000; - READ(read_string(&ci->forbidby, f)); - READ(read_string(&ci->forbidreason, f)); - READ(read_int16(&tmp16, f)); - ci->bantype = tmp16; - READ(read_int16(&tmp16, f)); - n_levels = tmp16; - ci->levels = new int16[36]; - for (j = 0; j < n_levels; ++j) - { - if (j < 36) - READ(read_int16(&ci->levels[j], f)); - else - READ(read_int16(&tmp16, f)); - } - READ(read_uint16(&ci->accesscount, f)); - if (ci->accesscount) - { - ci->access = new ChanAccess[ci->accesscount]; - for (j = 0; j < ci->accesscount; ++j) - { - READ(read_uint16(&ci->access[j].in_use, f)); - if (ci->access[j].in_use) - { - READ(read_int16(&ci->access[j].level, f)); - READ(read_string(&s, f)); - if (s) - { - ci->access[j].nc = findcore(s, 0); - delete [] s; - } - if (ci->access[j].nc == NULL) - ci->access[j].in_use = 0; - READ(read_int32(&tmp32, f)); - ci->access[j].last_seen = tmp32; - } - } - } - else - ci->access = NULL; - READ(read_uint16(&ci->akickcount, f)); - if (ci->akickcount) - { - ci->akick = new AutoKick[ci->akickcount]; - for (j = 0; j < ci->akickcount; ++j) - { - SAFE(read_uint16(&ci->akick[j].flags, f)); - if (ci->akick[j].flags & 0x0001) - { - SAFE(read_string(&s, f)); - if (ci->akick[j].flags & 0x0002) - { - ci->akick[j].u.nc = findcore(s, 0); - if (!ci->akick[j].u.nc) - ci->akick[j].flags &= ~0x0001; - delete [] s; - } - else - ci->akick[j].u.mask = s; - SAFE(read_string(&s, f)); - if (ci->akick[j].flags & 0x0001) - ci->akick[j].reason = s; - else if (s) - delete [] s; - SAFE(read_string(&s, f)); - if (ci->akick[j].flags & 0x0001) - ci->akick[j].creator = s; - else if (s) - delete [] s; - SAFE(read_int32(&tmp32, f)); - if (ci->akick[j].flags & 0x0001) - ci->akick[j].addtime = tmp32; - } - } - } - else - ci->akick = NULL; - READ(read_uint32(&ci->mlock_on, f)); - READ(read_uint32(&ci->mlock_off, f)); - READ(read_uint32(&ci->mlock_limit, f)); - READ(read_string(&ci->mlock_key, f)); - READ(read_string(&ci->mlock_flood, f)); - READ(read_string(&ci->mlock_redirect, f)); - READ(read_int16(&ci->memos.memocount, f)); - READ(read_int16(&ci->memos.memomax, f)); - if (ci->memos.memocount) - { - Memo *memos = new Memo[ci->memos.memocount]; - ci->memos.memos = memos; - for (j = 0; j < ci->memos.memocount; ++j, ++memos) - { - READ(read_uint32(&memos->number, f)); - READ(read_uint16(&memos->flags, f)); - READ(read_int32(&tmp32, f)); - memos->time = tmp32; - READ(read_buffer(memos->sender, f)); - READ(read_string(&memos->text, f)); - } - } - READ(read_string(&ci->entry_message, f)); - - // BotServ options - READ(read_string(&ci->bi, f)); - READ(read_int32(&tmp32, f)); - ci->botflags = tmp32; - READ(read_int16(&tmp16, f)); - n_ttb = tmp16; - ci->ttb = new int16[16]; - for (j = 0; j < n_ttb; ++j) - { - if (j < 8) - READ(read_int16(&ci->ttb[j], f)); - else - READ(read_int16(&tmp16, f)); - } - for (j = n_ttb; j < 8; ++j) - ci->ttb[j] = 0; - READ(read_int16(&tmp16, f)); - ci->capsmin = tmp16; - READ(read_int16(&tmp16, f)); - ci->capspercent = tmp16; - READ(read_int16(&tmp16, f)); - ci->floodlines = tmp16; - READ(read_int16(&tmp16, f)); - ci->floodsecs = tmp16; - READ(read_int16(&tmp16, f)); - ci->repeattimes = tmp16; - - READ(read_uint16(&ci->bwcount, f)); - if (ci->bwcount) - { - ci->badwords = new BadWord[ci->bwcount]; - for (j = 0; j < ci->bwcount; ++j) - { - SAFE(read_uint16(&ci->badwords[j].in_use, f)); - if (ci->badwords[j].in_use) - { - SAFE(read_string(&ci->badwords[j].word, f)); - SAFE(read_uint16(&ci->badwords[j].type, f)); - } - } - } - else - ci->badwords = NULL; - } - *last = NULL; - } - - close_db(f); - } - - ChannelInfo *ci; - - for (i = 0; i < 256; ++i) - { - for (ci = chanlists[i]; ci; ci = ci->next) - { - int j; - - fs << "CH " << ci->name << " " << ci->time_registered << " " << ci->last_used << std::endl; - if (ci->founder) - fs << "MD FOUNDER " << ci->founder << std::endl; - if (ci->successor) - fs << "MD SUCCESSOR " << ci->successor << std::endl; - fs << "MD BANTYPE " << ci->bantype << std::endl; - fs << "MD MEMOMAX " << ci->memos.memomax << std::endl; - fs << "MD LEVELS"; - for (j = 0; j < 36; ++j) - { - /* In 1.8 disabled meant founder only. In 1.9.2 disabled literally means its disabled so, we will set these to ACCESS_QOP */ - if (ci->levels[j] == -10000) - fs << " " << GetLevelName(j) << " " << 10000; - else - fs << " " << GetLevelName(j) << " " << ci->levels[j]; - } - fs << std::endl; - fs << "MD FLAGS" - << (ci->flags & CI_KEEPTOPIC ? " KEEPTOPIC" : "") - << (ci->flags & CI_SECUREOPS ? " SECUREOPS" : "") - << (ci->flags & CI_PRIVATE ? " PRIVATE" : "") - << (ci->flags & CI_TOPICLOCK ? " TOPICLOCK" : "") - << (ci->flags & CI_RESTRICTED ? " RESTRICTED" : "") - << (ci->flags & CI_PEACE ? " PEACE" : "") - << (ci->flags & CI_SECURE ? " SECURE" : "") - << (ci->flags & CI_FORBIDDEN ? " FORBIDDEN" : "") - << (ci->flags & CI_NO_EXPIRE ? " NO_EXPIRE" : "") - << (ci->flags & CI_MEMO_HARDMAX ? " MEMO_HARDMAX" : "") - << (ci->flags & CI_OPNOTICE ? " OPNOTICE" : "") - << (ci->flags & CI_SECUREFOUNDER ? " SECUREFOUNDER" : "") - << (ci->flags & CI_SIGNKICK ? " SIGNKICK" : "") - << (ci->flags & CI_SIGNKICK_LEVEL ? " SIGNKICKLEVEL" : "") - << (ci->flags & CI_XOP ? " XOP" : "") - << (ci->flags & CI_SUSPENDED ? " SUSPENDED" : "") << std::endl; - if (ci->desc && *ci->desc) - fs << "MD DESC :" << ci->desc << std::endl; - if (ci->url) - fs << "MD URL :" << ci->url << std::endl; - if (ci->email) - fs << "MD EMAIL :" << ci->email << std::endl; - if (ci->last_topic && ci->last_topic_setter) // MD CH topic