diff options
40 files changed, 169 insertions, 3088 deletions
diff --git a/README.md b/README.md new file mode 100644 index 000000000..d3da93347 --- /dev/null +++ b/README.md @@ -0,0 +1,13 @@ +### InspIRCd + +InspIRCd is an IRC daemon written entirely from scratch, it is one of the +few IRC daemons to be written in C++ and it was released under the GNU +General Public License. InspIRCd is the second most used IRC daemon +according to the ranking on SearchIRC. + +The first stable release of InspIRCd was in 2002. + +### Links + +Website: http://www.inspircd.org +GitHub: https://github.com/inspircd/inspircd
\ No newline at end of file @@ -228,8 +228,12 @@ if ($config{OSNAME} =~ /darwin/i) { $config{IS_DARWIN} = "YES"; $config{STARTSCRIPT} = "org.inspircd.plist"; # start script for OSX. + $config{CC} = "xcrun clang++"; # C++ compiler for OSX. +} +else +{ + $config{CC} = "g++"; # C++ compiler } -$config{CC} = "g++"; # C++ compiler if (defined $opt_cc) { $config{CC} = $opt_cc; @@ -247,7 +251,11 @@ if ($config{HAS_OPENSSL} =~ /^([-[:digit:].]+)([a-z])?(\-[a-z][0-9])?$/) { } if (($config{GCCVER} eq "") || ($config{GCCMINOR} eq "")) { - print $config{CC} . " was not found! You require g++ (the GNU C++ compiler, part of GCC) to build InspIRCd!\n"; + if ($config{IS_DARWIN} eq "YES") { + print $config{CC} . " was not found! You require clang++ (the LLVM C++ compiler, part of the OSX developer tools) to build InspIRCd!\n"; + } else { + print $config{CC} . " was not found! You require g++ (the GNU C++ compiler, part of GCC) to build InspIRCd!\n"; + } exit; } diff --git a/docs/README b/docs/README index c64c2228b..e8dcfea77 100644 --- a/docs/README +++ b/docs/README @@ -3,7 +3,6 @@ Because of the dynamic nature of InspIRCd, we do not have traditional documentat The documentation for InspIRCd can be found on our wiki, at http://wiki.inspircd.org Our Bugtracker can be found at http://www.inspircd.org/bugtrack Our Forum can be found at http://www.inspircd.org/forum -Our Development blog can be found at http://www.inspircd.com For online support, please connect to irc.inspircd.org, and join #inspircd diff --git a/docs/inspircd.conf.example b/docs/inspircd.conf.example index ffec002a2..322a6e820 100644 --- a/docs/inspircd.conf.example +++ b/docs/inspircd.conf.example @@ -268,6 +268,9 @@ # globalmax: Maximum global (network-wide) connections per IP (or CIDR mask, see below). globalmax="3" + # maxconnwarn: Enable warnings when localmax or globalmax is hit (defaults to on) + maxconnwarn="off" + # useident: Defines if users in this class MUST respond to a ident query or not. useident="no" diff --git a/docs/inspircd.helpop-full.example b/docs/inspircd.helpop-full.example index f85aab9f5..68eb266c9 100644 --- a/docs/inspircd.helpop-full.example +++ b/docs/inspircd.helpop-full.example @@ -799,7 +799,7 @@ Closes all unregistered connections to the local server."> (IRCop only, requires invisible module). R Blocks private messages from unregistered users (requires services account module). - S Strips mIRC colour/bold/underline codes out of private + S Strips mIRC color/bold/underline codes out of private messages to the user (requires stripcolor module). W Receives notification when a user uses WHOIS on them (IRCop only, requires showwhois module)."> @@ -826,7 +826,7 @@ Closes all unregistered connections to the local server."> users to join while the channel is invite-only (requires inviteexception module). - c Blocks messages containing mIRC colour codes + c Blocks messages containing mIRC color codes (requires blockcolor module). d [time] Blocks messages to a channel from new users until they have been in the channel for [time] @@ -899,7 +899,7 @@ Closes all unregistered connections to the local server."> (requires nokicks module) R Blocks unregistered users from joining (requires services account module). - S Strips mIRC colour codes from messages to the + S Strips mIRC color codes from messages to the channel (requirs stripcolor module). T Blocks /NOTICEs to the channel from users who are not at least halfop (requires nonotice module). @@ -1024,7 +1024,7 @@ Matching extbans: Acting extbans: - c:<ban> Blocks any messages that contain colour codes from + c:<ban> Blocks any messages that contain color codes from matching users (requires blockcolor module). m:<ban> Blocks messages from matching users (requires muteban module). Users with +v or above are not affected. diff --git a/docs/inspircd.helpop.example b/docs/inspircd.helpop.example index 83019f170..3688f74b3 100644 --- a/docs/inspircd.helpop.example +++ b/docs/inspircd.helpop.example @@ -107,7 +107,7 @@ LOCKSERV UNLOCKSERV JUMPSERVER"> (IRCop only, requires invisible module). R Blocks private messages from unregistered users (requires services account module). - S Strips mIRC colour/bold/underline codes out of private + S Strips mIRC color/bold/underline codes out of private messages to the user (requires stripcolor module). W Receives notification when a user uses WHOIS on them (IRCop only, requires showwhois module)."> @@ -134,7 +134,7 @@ LOCKSERV UNLOCKSERV JUMPSERVER"> users to join while the channel is invite-only (requires inviteexception module). - c Blocks messages containing mIRC colour codes + c Blocks messages containing mIRC color codes (requires blockcolor module). f [*][lines]:[sec] Kicks on text flood equal to or above the specified rate. With *, the user is banned @@ -206,7 +206,7 @@ LOCKSERV UNLOCKSERV JUMPSERVER"> (requires nokicks module) R Blocks unregistered users from joining (requires services account module). - S Strips mIRC colour codes from messages to the + S Strips mIRC color codes from messages to the channel (requirs stripcolor module). T Blocks /NOTICEs to the channel from users who are not at least halfop (requires nonotice module). @@ -254,7 +254,7 @@ help channel if you have any questions."> <helpop key="extbans" value="Extended Bans ---------- - c:n!u@h Blocks any messages that contain colour codes from + c:n!u@h Blocks any messages that contain color codes from matching users (requires blockcolor module). j:#channel Prevents anyone in #channel from joining the channel (requires channelban module). diff --git a/docs/inspircd.motd.example b/docs/inspircd.motd.example index 73e9f6082..0a1260c0c 100644 --- a/docs/inspircd.motd.example +++ b/docs/inspircd.motd.example @@ -27,7 +27,6 @@ -- To change, see inspircd.motd.example -- / \ / * Web: http://www.inspircd.org \ - | * Blog: http://www.inspircd.com | | * IRC: irc.inspircd.org #inspircd | | * Docs: http://wiki.inspircd.org | | * Bugs: http://inspircd.org/bugtrack/ | diff --git a/docs/modules.conf.example b/docs/modules.conf.example index 21ee3d829..b688882d0 100644 --- a/docs/modules.conf.example +++ b/docs/modules.conf.example @@ -265,7 +265,7 @@ # capsmap="ABCDEFGHIJKLMNOPQRSTUVWXYZ! "> #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# -# Block colour module: Blocking colour-coded messages with cmode +c +# Block color module: Blocking color-coded messages with cmode +c #<module name="m_blockcolor.so"> #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# @@ -393,7 +393,7 @@ #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# # Channel Names module: Allows disabling channels which have certain -# characters in the channel name such as bold, colourcodes, etc which +# characters in the channel name such as bold, colorcodes, etc which # can be quite annoying and allow users to on occasion have a channel # that looks like the name of another channel on the network. #<module name="m_channames.so"> @@ -1634,7 +1634,7 @@ # your configuration file! # #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# -# Strip colour module: Adds the channel mode +S +# Strip color module: Adds the channel mode +S #<module name="m_stripcolor.so"> #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# diff --git a/docs/modules/modules.conf.charybdis b/docs/modules/modules.conf.charybdis index 509886269..8ba2f1b40 100644 --- a/docs/modules/modules.conf.charybdis +++ b/docs/modules/modules.conf.charybdis @@ -71,7 +71,7 @@ <module name="m_chancreate.so"> #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# # Channel Names module: Allows disabling channels which have certain -# characters in the channel name such as bold, colourcodes, etc which +# characters in the channel name such as bold, colorcodes, etc which # can be quite annoying and allow users to on occasion have a channel # that looks like the name of another channel on the network. <module name="m_channames.so"> diff --git a/include/users.h b/include/users.h index 3536fc350..73ef3624e 100644 --- a/include/users.h +++ b/include/users.h @@ -121,6 +121,10 @@ struct CoreExport ConnectClass : public refcountbase */ unsigned long maxglobal; + /** True if max connections for this class is hit and a warning is wanted + */ + bool maxconnwarn; + /** Max channels for this class */ unsigned int maxchans; diff --git a/make/check_eventfd.cpp b/make/check_eventfd.cpp index 5fc72ee3b..199cbcd31 100644 --- a/make/check_eventfd.cpp +++ b/make/check_eventfd.cpp @@ -1,6 +1,11 @@ #include <sys/eventfd.h> int main() { - int fd = eventfd(0, EFD_NONBLOCK); + eventfd_t efd_data; + int fd; + + fd = eventfd(0, EFD_NONBLOCK); + eventfd_read(fd, &efd_data); + return (fd < 0); } diff --git a/make/configure.pm b/make/configure.pm index dbba7a143..230bd3934 100644 --- a/make/configure.pm +++ b/make/configure.pm @@ -22,7 +22,7 @@ use POSIX; use make::utilities; our @EXPORT = qw(promptnumeric dumphash is_dir getmodules getrevision getcompilerflags getlinkerflags getdependencies nopedantic resolve_directory yesno showhelp promptstring_s); -my $no_svn = 0; +my $no_git = 0; sub yesno { my ($flag,$prompt) = @_; @@ -52,29 +52,18 @@ sub resolve_directory } sub getrevision { - if ($no_svn) + if ($no_git) { return "0"; } - my $data = `svn info 2>/dev/null`; + my $data = `git describe --tags 2>/dev/null`; if ($data eq "") { - $data = `git describe --tags 2>/dev/null`; - if ($data eq "") - { - $no_svn = 1; - return '0'; - } - chomp $data; # remove \n - return $data; - } - $data =~ /Revision: (\d+)/; - my $rev = $1; - if (!defined($rev)) - { - $rev = "0"; + $no_git = 1; + return '0'; } - return $rev; + chomp $data; # remove \n + return $data; } sub getcompilerflags { @@ -239,7 +228,8 @@ sub is_dir sub showhelp { chomp(my $PWD = `pwd`); - print "Usage: configure [options] + print <<EOH; +Usage: configure [options] *** NOTE: NON-INTERACTIVE CONFIGURE IS *NOT* SUPPORTED BY THE *** *** INSPIRCD DEVELOPMENT TEAM. DO NOT ASK FOR HELP REGARDING *** @@ -258,32 +248,25 @@ InspIRCd 1.0.x, are also allowed. --disable-interactive Sets no options itself, but will disable any interactive prompting. - --disable-rpath Disable runtime paths. DO NOT USE UNLESS - YOU KNOW WHAT YOU ARE DOING! --update Update makefiles and dependencies - --modupdate Detect new modules and write makefiles - --svnupdate {--rebuild} Update working copy via subversion - {and optionally rebuild if --rebuild - is also specified} --clean Remove .config.cache file and go interactive --enable-gnutls Enable GnuTLS module [no] --enable-openssl Enable OpenSSL module [no] - --enable-optimization=[n] Optimize using -O[n] gcc flag --enable-epoll Enable epoll() where supported [set] --enable-kqueue Enable kqueue() where supported [set] --disable-epoll Do not enable epoll(), fall back to select() [not set] --disable-kqueue Do not enable kqueue(), fall back to select() [not set] - --disable-ipv6 Do not build ipv6 native InspIRCd [not set] - --with-cc=[filename] Use an alternative g++ binary to + --disable-ipv6 Do not build IPv6 native InspIRCd [not set] + --with-cc=[filename] Use an alternative compiler to build InspIRCd [g++] --with-maxbuf=[n] Change the per message buffer size [512] DO NOT ALTER THIS OPTION WITHOUT GOOD REASON AS IT *WILL* BREAK CLIENTS!!! --prefix=[directory] Base directory to install into (if defined, can automatically define config, module, bin - and library dirs as subdirectories of prefix) + and library dirs as subdirectories of prefix) [$PWD] --config-dir=[directory] Config file directory for config and SSL certs [$PWD/conf] @@ -298,7 +281,7 @@ InspIRCd 1.0.x, are also allowed. --disable-extras=[extras] Disable the specified list of extras --help Show this help text and exit -"; +EOH exit(0); } diff --git a/sources.list b/sources.list index 16bdeec15..22610ca76 100644 --- a/sources.list +++ b/sources.list @@ -6,4 +6,4 @@ # # Feel free to add additional sources! :) # official repository -http://gitorious.org/inspircd/inspircd-extras/blobs/raw/master/modules.lst +https://raw.github.com/inspircd/inspircd-extras/master/modules.lst diff --git a/src/commands/cmd_clearcache.cpp b/src/commands/cmd_clearcache.cpp index ecf2c07fc..c5492a8b6 100644 --- a/src/commands/cmd_clearcache.cpp +++ b/src/commands/cmd_clearcache.cpp @@ -17,7 +17,7 @@ #include "channels.h" #include "ctables.h" -/** Handle /ADMIN. These command handlers can be reloaded by the core, +/** Handle /CLEARCACHE. These command handlers can be reloaded by the core, * and handle basic RFC1459 commands. Commands within modules work * the same way, however, they can be fully unloaded, where these * may not. diff --git a/src/commands/cmd_info.cpp b/src/commands/cmd_info.cpp index 012a5bf81..e0ad65bda 100644 --- a/src/commands/cmd_info.cpp +++ b/src/commands/cmd_info.cpp @@ -44,16 +44,17 @@ static const char* const lines[] = { " November 2002 - Present", " ", "\2Core Developers\2:", - " Craig Edwards, Brain, <brain@inspircd.org>", - " Craig McLure, Craig, <craig@inspircd.org>", - " Robin Burchell, w00t, <w00t@inspircd.org>", - " Oliver Lupton, Om, <om@inspircd.org>", - " John Brooks, Special, <special@inspircd.org>", - " Dennis Friis, peavey, <peavey@inspircd.org>", - " Thomas Stagner, aquanight, <aquanight@inspircd.org>", - " Uli Schlachter, psychon, <psychon@inspircd.org>", - " Matt Smith, dz, <dz@inspircd.org>", - " Daniel De Graaf, danieldg, <danieldg@inspircd.org>", + " Craig Edwards, Brain, <brain@inspircd.org>", + " Craig McLure, Craig, <craig@inspircd.org>", + " Robin Burchell, w00t, <w00t@inspircd.org>", + " Oliver Lupton, Om, <om@inspircd.org>", + " John Brooks, Special, <special@inspircd.org>", + " Dennis Friis, peavey, <peavey@inspircd.org>", + " Thomas Stagner, aquanight, <aquanight@inspircd.org>", + " Uli Schlachter, psychon, <psychon@inspircd.org>", + " Matt Smith, dz, <dz@inspircd.org>", + " Daniel De Graaf, danieldg, <danieldg@inspircd.org>", + " jackmcbarn, <jackmcbarn@inspircd.org>", " ", "\2Regular Contributors\2:", " Majic MacGyver Namegduf Ankit", diff --git a/src/commands/cmd_whois.cpp b/src/commands/cmd_whois.cpp index dc2e3ae51..ea1d94291 100644 --- a/src/commands/cmd_whois.cpp +++ b/src/commands/cmd_whois.cpp @@ -78,7 +78,7 @@ CmdResult CommandWhois::Handle (const std::vector<std::string>& parameters, User { /* no such nick/channel */ user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick.c_str(), !parameters[userindex].empty() ? parameters[userindex].c_str() : "*"); - user->WriteNumeric(318, "%s %s :End of /WHOIS list.",user->nick.c_str(), parameters[userindex].empty() ? parameters[userindex].c_str() : "*"); + user->WriteNumeric(318, "%s %s :End of /WHOIS list.",user->nick.c_str(), !parameters[userindex].empty() ? parameters[userindex].c_str() : "*"); return CMD_FAILURE; } diff --git a/src/configreader.cpp b/src/configreader.cpp index 6ef5105aa..a1a244501 100644 --- a/src/configreader.cpp +++ b/src/configreader.cpp @@ -375,6 +375,7 @@ void ServerConfig::CrossCheckConnectBlocks(ServerConfig* current) me->maxlocal = tag->getInt("localmax", me->maxlocal); me->maxglobal = tag->getInt("globalmax", me->maxglobal); me->maxchans = tag->getInt("maxchans", me->maxchans); + me->maxconnwarn = tag->getBool("maxconnwarn", me->maxconnwarn); me->limit = tag->getInt("limit", me->limit); ClassMap::iterator oldMask = oldBlocksByMask.find(typeMask); diff --git a/src/dns.cpp b/src/dns.cpp index 945e1fb15..58cbcca76 100644 --- a/src/dns.cpp +++ b/src/dns.cpp @@ -38,6 +38,8 @@ looks like this, walks like this or tastes like this. #include "configreader.h" #include "socket.h" +#define DN_COMP_BITMASK 0xC000 /* highest 6 bits in a DN label header */ + /** Masks to mask off the responses we get from the DNSRequest methods */ enum QueryInfo @@ -98,7 +100,7 @@ class DNSRequest DNSRequest(DNS* dns, int id, const std::string &original); ~DNSRequest(); - DNSInfo ResultIsReady(DNSHeader &h, int length); + DNSInfo ResultIsReady(DNSHeader &h, unsigned length); int SendRequests(const DNSHeader *header, const int length, QueryType qt); }; @@ -161,7 +163,10 @@ int CachedQuery::CalcTTLRemaining() /* Allocate the processing buffer */ DNSRequest::DNSRequest(DNS* dns, int rid, const std::string &original) : dnsobj(dns) { - res = new unsigned char[512]; + /* hardening against overflow here: make our work buffer twice the theoretical + * maximum size so that hostile input doesn't screw us over. + */ + res = new unsigned char[sizeof(DNSHeader) * 2]; *res = 0; orig = original; RequestTimeout* RT = new RequestTimeout(ServerInstance->Config->dns_timeout ? ServerInstance->Config->dns_timeout : 5, this, rid); @@ -688,11 +693,11 @@ DNSResult DNS::GetResult() } /** A result is ready, process it */ -DNSInfo DNSRequest::ResultIsReady(DNSHeader &header, int length) +DNSInfo DNSRequest::ResultIsReady(DNSHeader &header, unsigned length) { - int i = 0; + unsigned i = 0, o; int q = 0; - int curanswer, o; + int curanswer; ResourceRecord rr; unsigned short ptr; @@ -755,7 +760,7 @@ DNSInfo DNSRequest::ResultIsReady(DNSHeader &header, int length) else i += header.payload[i] + 1; /* skip length and label */ } } - if (length - i < 10) + if (static_cast<int>(length - i) < 10) return std::make_pair((unsigned char*)NULL,"Incorrectly sized DNS reply"); /* XXX: We actually initialise 'rr' here including its ttl field */ @@ -790,17 +795,37 @@ DNSInfo DNSRequest::ResultIsReady(DNSHeader &header, int length) switch (rr.type) { + /* + * CNAME and PTR are compressed. We need to decompress them. + */ case DNS_QUERY_CNAME: - /* CNAME and PTR have the same processing code */ case DNS_QUERY_PTR: + { + unsigned short lowest_pos = length; o = 0; q = 0; while (q == 0 && i < length && o + 256 < 1023) { + /* DN label found (byte over 63) */ if (header.payload[i] > 63) { memcpy(&ptr,&header.payload[i],2); - i = ntohs(ptr) - 0xC000 - 12; + + i = ntohs(ptr); + + /* check that highest two bits are set. if not, we've been had */ + if ((i & DN_COMP_BITMASK) != DN_COMP_BITMASK) + return std::make_pair((unsigned char *) NULL, "DN label decompression header is bogus"); + + /* mask away the two highest bits. */ + i &= ~DN_COMP_BITMASK; + + /* and decrease length by 12 bytes. */ + i -= 12; + + if (i >= lowest_pos) + return std::make_pair((unsigned char *) NULL, "Invalid decompression pointer"); + lowest_pos = i; } else { @@ -813,25 +838,35 @@ DNSInfo DNSRequest::ResultIsReady(DNSHeader &header, int length) res[o] = 0; if (o != 0) res[o++] = '.'; - memcpy(&res[o],&header.payload[i + 1],header.payload[i]); + + if (o + header.payload[i] > sizeof(DNSHeader)) + return std::make_pair((unsigned char *) NULL, "DN label decompression is impossible -- malformed/hostile packet?"); + + memcpy(&res[o], &header.payload[i + 1], header.payload[i]); o += header.payload[i]; i += header.payload[i] + 1; } } } res[o] = 0; + } break; case DNS_QUERY_AAAA: + if (rr.rdlength != sizeof(struct in6_addr)) + return std::make_pair((unsigned char *) NULL, "rr.rdlength is larger than 16 bytes for an ipv6 entry -- malformed/hostile packet?"); + memcpy(res,&header.payload[i],rr.rdlength); res[rr.rdlength] = 0; break; case DNS_QUERY_A: + if (rr.rdlength != sizeof(struct in_addr)) + return std::make_pair((unsigned char *) NULL, "rr.rdlength is larger than 4 bytes for an ipv4 entry -- malformed/hostile packet?"); + memcpy(res,&header.payload[i],rr.rdlength); res[rr.rdlength] = 0; break; default: - memcpy(res,&header.payload[i],rr.rdlength); - res[rr.rdlength] = 0; + return std::make_pair((unsigned char *) NULL, "don't know how to handle undefined type (" + ConvToStr(rr.type) + ") -- rejecting"); break; } return std::make_pair(res,"No error"); diff --git a/src/inspircd.cpp b/src/inspircd.cpp index 2ac844bb6..86223ae95 100644 --- a/src/inspircd.cpp +++ b/src/inspircd.cpp @@ -488,8 +488,8 @@ InspIRCd::InspIRCd(int argc, char** argv) : printf_c("\033[1;32mInspire Internet Relay Chat Server, compiled %s at %s\n",__DATE__,__TIME__); printf_c("(C) InspIRCd Development Team.\033[0m\n\n"); printf_c("Developers:\n"); - printf_c("\t\033[1;32mBrain, FrostyCoolSlug, w00t, Om, Special\n"); - printf_c("\t\033[1;32mpeavey, aquanight, psychon, dz, danieldg\033[0m\n\n"); + printf_c("\t\033[1;32mBrain, FrostyCoolSlug, w00t, Om, Special, peavey\n"); + printf_c("\t\033[1;32maquanight, psychon, dz, danieldg, jackmcbarn\033[0m\n\n"); printf_c("Others:\t\t\t\033[1;32mSee /INFO Output\033[0m\n"); this->Modes = new ModeParser; diff --git a/src/modules/extra/README b/src/modules/extra/README index 6dc9bb18a..2478b57cf 100644 --- a/src/modules/extra/README +++ b/src/modules/extra/README @@ -3,8 +3,7 @@ For example, m_filter_pcre requires the PCRE libraries. To compile any of these modules first ensure you have the required dependencies (read the online documentation at http://wiki.inspircd.org/) and then symlink -the .cpp file from this directory into the parent directory (src/modules/) and -re-configure your inspircd with ./configure -modupdate to detect the new module. +the .cpp file from this directory into the parent directory (src/modules/). Alternatively, use the command: ./configure --enable-extras=m_extra.cpp, which will automatically take care of symlinking the module of that name and any headers it needs diff --git a/src/modules/extra/m_sqlite3.cpp b/src/modules/extra/m_sqlite3.cpp index 3809ac738..0f99b7f1a 100644 --- a/src/modules/extra/m_sqlite3.cpp +++ b/src/modules/extra/m_sqlite3.cpp @@ -15,6 +15,10 @@ #include <sqlite3.h> #include "sql.h" +#ifdef WINDOWS +# pragma comment(lib, "sqlite3.lib") +#endif + /* $ModDesc: sqlite3 provider */ /* $CompileFlags: pkgconfversion("sqlite3","3.3") pkgconfincludes("sqlite3","/sqlite3.h","") */ /* $LinkerFlags: pkgconflibs("sqlite3","/libsqlite3.so","-lsqlite3") */ diff --git a/src/modules/m_blockcolor.cpp b/src/modules/m_blockcolor.cpp index d19317074..cbe4bc1fa 100644 --- a/src/modules/m_blockcolor.cpp +++ b/src/modules/m_blockcolor.cpp @@ -23,13 +23,13 @@ class BlockColor : public SimpleChannelModeHandler BlockColor(Module* Creator) : SimpleChannelModeHandler(Creator, "blockcolor", 'c') { } }; -class ModuleBlockColour : public Module +class ModuleBlockColor : public Module { bool AllowChanOps; BlockColor bc; public: - ModuleBlockColour() : bc(this) + ModuleBlockColor() : bc(this) { if (!ServerInstance->Modes->AddMode(&bc)) throw ModuleException("Could not add new modes!"); @@ -64,7 +64,7 @@ class ModuleBlockColour : public Module case 21: case 22: case 31: - user->WriteNumeric(404, "%s %s :Can't send colours to channel (+c set)",user->nick.c_str(), c->name.c_str()); + user->WriteNumeric(404, "%s %s :Can't send colors to channel (+c set)",user->nick.c_str(), c->name.c_str()); return MOD_RES_DENY; break; } @@ -79,7 +79,7 @@ class ModuleBlockColour : public Module return OnUserPreMessage(user,dest,target_type,text,status,exempt_list); } - virtual ~ModuleBlockColour() + virtual ~ModuleBlockColor() { } @@ -89,4 +89,4 @@ class ModuleBlockColour : public Module } }; -MODULE_INIT(ModuleBlockColour) +MODULE_INIT(ModuleBlockColor) diff --git a/src/modules/m_chghost.cpp b/src/modules/m_chghost.cpp index 8c3911418..0262a5f37 100644 --- a/src/modules/m_chghost.cpp +++ b/src/modules/m_chghost.cpp @@ -33,6 +33,12 @@ class CommandChghost : public Command { const char* x = parameters[1].c_str(); + if (parameters[1].length() > 63) + { + user->WriteServ("NOTICE %s :*** CHGHOST: Host too long", user->nick.c_str()); + return CMD_FAILURE; + } + for (; *x; x++) { if (!hostmap[(unsigned char)*x]) @@ -42,11 +48,6 @@ class CommandChghost : public Command } } - if ((parameters[1].c_str() - x) > 63) - { - user->WriteServ("NOTICE %s :*** CHGHOST: Host too long", user->nick.c_str()); - return CMD_FAILURE; - } User* dest = ServerInstance->FindNick(parameters[0]); if (!dest) diff --git a/src/modules/m_hostchange.cpp b/src/modules/m_hostchange.cpp index 20c7e5bc2..6e4600da6 100644 --- a/src/modules/m_hostchange.cpp +++ b/src/modules/m_hostchange.cpp @@ -73,7 +73,7 @@ class ModuleHostChange : public Module for (int index = 0; index < Conf.Enumerate("hostchange"); index++) { std::string mask = Conf.ReadValue("hostchange", "mask", index); - std::string ports = Conf.ReadValue("hosthange", "ports", index); + std::string ports = Conf.ReadValue("hostchange", "ports", index); std::string action = Conf.ReadValue("hostchange", "action", index); std::string newhost = Conf.ReadValue("hostchange", "value", index); Host* x = new Host; diff --git a/src/modules/m_ojoin.cpp b/src/modules/m_ojoin.cpp index bbe3f05bb..c326321b0 100644 --- a/src/modules/m_ojoin.cpp +++ b/src/modules/m_ojoin.cpp @@ -242,7 +242,7 @@ class ModuleOjoin : public Module Version GetVersion() { - return Version("Network Buisness Join", VF_VENDOR); + return Version("Network Business Join", VF_VENDOR); } }; diff --git a/src/modules/m_remove.cpp b/src/modules/m_remove.cpp index 2394332be..ffbae43bb 100644 --- a/src/modules/m_remove.cpp +++ b/src/modules/m_remove.cpp @@ -77,6 +77,11 @@ class RemoveBase : public Command hasnokicks = (ServerInstance->Modules->Find("m_nokicks.so") && channel->IsModeSet('Q')); + if((ServerInstance->ULine(target->server) || ServerInstance->ULine(target->nick.c_str()))){ + user->WriteNumeric(482, "%s %s :Only a u-line may remove a u-line from a channel.", user->nick.c_str(), channame); + return CMD_FAILURE; + } + /* We support the +Q channel mode via. the m_nokicks module, if the module is loaded and the mode is set then disallow the /remove */ if ((!IS_LOCAL(user)) || (!supportnokicks || !hasnokicks)) { diff --git a/src/modules/m_shun.cpp b/src/modules/m_shun.cpp index 6d7f12562..e11aa9956 100644 --- a/src/modules/m_shun.cpp +++ b/src/modules/m_shun.cpp @@ -202,6 +202,12 @@ class ModuleShun : public Module ServerInstance->XLines->UnregisterFactory(&f); } + void Prioritize() + { + Module* alias = ServerInstance->Modules->Find("m_alias.so"); + ServerInstance->Modules->SetPriority(this, I_OnPreCommand, PRIORITY_BEFORE, &alias); + } + virtual ModResult OnStats(char symbol, User* user, string_list& out) { if (symbol != 'H') diff --git a/src/modules/m_stripcolor.cpp b/src/modules/m_stripcolor.cpp index c2246a0d9..83358922b 100644 --- a/src/modules/m_stripcolor.cpp +++ b/src/modules/m_stripcolor.cpp @@ -13,7 +13,7 @@ #include "inspircd.h" -/* $ModDesc: Provides channel +S mode (strip ansi colour) */ +/* $ModDesc: Provides channel +S mode (strip ansi color) */ /** Handles channel mode +S */ @@ -137,7 +137,7 @@ class ModuleStripColor : public Module virtual Version GetVersion() { - return Version("Provides channel +S mode (strip ansi colour)", VF_VENDOR); + return Version("Provides channel +S mode (strip ansi color)", VF_VENDOR); } }; diff --git a/src/users.cpp b/src/users.cpp index 7f8e3df8a..6277f95f9 100644 --- a/src/users.cpp +++ b/src/users.cpp @@ -734,13 +734,15 @@ void LocalUser::CheckClass() else if ((a->GetMaxLocal()) && (ServerInstance->Users->LocalCloneCount(this) > a->GetMaxLocal())) { ServerInstance->Users->QuitUser(this, "No more connections allowed from your host via this connect class (local)"); - ServerInstance->SNO->WriteToSnoMask('a', "WARNING: maximum LOCAL connections (%ld) exceeded for IP %s", a->GetMaxLocal(), this->GetIPString()); + if (a->maxconnwarn) + ServerInstance->SNO->WriteToSnoMask('a', "WARNING: maximum LOCAL connections (%ld) exceeded for IP %s", a->GetMaxLocal(), this->GetIPString()); return; } else if ((a->GetMaxGlobal()) && (ServerInstance->Users->GlobalCloneCount(this) > a->GetMaxGlobal())) { ServerInstance->Users->QuitUser(this, "No more connections allowed from your host via this connect class (global)"); - ServerInstance->SNO->WriteToSnoMask('a', "WARNING: maximum GLOBAL connections (%ld) exceeded for IP %s", a->GetMaxGlobal(), this->GetIPString()); + if (a->maxconnwarn) + ServerInstance->SNO->WriteToSnoMask('a', "WARNING: maximum GLOBAL connections (%ld) exceeded for IP %s", a->GetMaxGlobal(), this->GetIPString()); return; } @@ -1693,7 +1695,7 @@ const std::string& FakeUser::GetFullRealHost() ConnectClass::ConnectClass(ConfigTag* tag, char t, const std::string& mask) : config(tag), type(t), fakelag(true), name("unnamed"), registration_timeout(0), host(mask), pingtime(0), softsendqmax(0), hardsendqmax(0), recvqmax(0), - penaltythreshold(0), commandrate(0), maxlocal(0), maxglobal(0), maxchans(0), limit(0) + penaltythreshold(0), commandrate(0), maxlocal(0), maxglobal(0), maxconnwarn(true), maxchans(0), limit(0) { } @@ -1702,7 +1704,7 @@ ConnectClass::ConnectClass(ConfigTag* tag, char t, const std::string& mask, cons registration_timeout(parent.registration_timeout), host(mask), pingtime(parent.pingtime), softsendqmax(parent.softsendqmax), hardsendqmax(parent.hardsendqmax), recvqmax(parent.recvqmax), penaltythreshold(parent.penaltythreshold), commandrate(parent.commandrate), - maxlocal(parent.maxlocal), maxglobal(parent.maxglobal), maxchans(parent.maxchans), + maxlocal(parent.maxlocal), maxglobal(parent.maxglobal), maxconnwarn(parent.maxconnwarn), maxchans(parent.maxchans), limit(parent.limit) { } @@ -1723,6 +1725,7 @@ void ConnectClass::Update(const ConnectClass* src) commandrate = src->commandrate; maxlocal = src->maxlocal; maxglobal = src->maxglobal; + maxconnwarn = src->maxconnwarn; maxchans = src->maxchans; limit = src->limit; } diff --git a/win/cert.pem b/win/cert.pem deleted file mode 100644 index d0eaf68e7..000000000 --- a/win/cert.pem +++ /dev/null @@ -1,18 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIC1DCCAj+gAwIBAgIDcGbSMAsGCSqGSIb3DQEBBTCBgTEQMA4GA1UEBhMHRW5n -bGFuZDElMCMGA1UEChMcRGVmYXVsdCBJbnNwSVJDZCBDZXJ0aWZpY2F0ZTEeMBwG -A1UECxMVU2VydmVyIEFkbWluaXN0cmF0aW9uMQswCQYDVQQIEwJVSzEZMBcGA1UE -AxMQaXJjLmluc3BpcmNkLm9yZzAeFw0wNzA2MTMyMTUyMTNaFw0wOTA1MTMyMTUy -MTNaMIGBMRAwDgYDVQQGEwdFbmdsYW5kMSUwIwYDVQQKExxEZWZhdWx0IEluc3BJ -UkNkIENlcnRpZmljYXRlMR4wHAYDVQQLExVTZXJ2ZXIgQWRtaW5pc3RyYXRpb24x -CzAJBgNVBAgTAlVLMRkwFwYDVQQDExBpcmMuaW5zcGlyY2Qub3JnMIGcMAsGCSqG -SIb3DQEBAQOBjAAwgYgCgYDIbKvMTTogBZxTi1yn4ncVK09Wr+F2AxP63HWTzxnE -wNhcURSaUqpCzVIfcpr7/jKn+8I17MzaMvG8m+sPKngPK5WMN440p12uitkS+uzk -LbJ7J/Z335ar6nZOtbIO+aTDRzUTnNHGHRgdQj4GGvx89l0u7vQM3R2f9Oe2lWlc -1wIDAQABo18wXTAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggr -BgEFBQcDATAPBgNVHQ8BAf8EBQMDB6AAMB0GA1UdDgQWBBQTdpXUljwHWvbEggnP -BZMFhd1MvjALBgkqhkiG9w0BAQUDgYEARi9LL+mCxLWffiTHzGMO4ul0E0bXIzD5 -QzFI/llFzX4+fcuZJUFPgpBFJzxOqSO9RZAXHfm7x9sUMNpFP4ir4b2phQGr0QDd -6nPHmcwuyiQISPIL3xcgrb2CuzQa/Wqmkxi5vXHf1CQQijJ1UA/FCPD6f+Dulcdq -UAtrNsUBhLY= ------END CERTIFICATE----- diff --git a/win/configure.cpp b/win/configure.cpp index 4acd7131b..7c9a27854 100644 --- a/win/configure.cpp +++ b/win/configure.cpp @@ -330,7 +330,7 @@ void Run() printf("Writing inspircd_se_config.h..."); f = fopen("inspircd_se_config.h", "w"); - fprintf(f, "/* Auto generated by configure, do not modify or commit to svn! */\n"); + fprintf(f, "/* Auto generated by configure, do not modify or commit to Git! */\n"); fprintf(f, "#ifndef __CONFIGURATION_SOCKETENGINE__\n"); fprintf(f, "#define __CONFIGURATION_SOCKETENGINE__\n\n"); fprintf(f, "#include \"socketengines/socketengine_%s.h\"\n\n", "select"); diff --git a/win/configureVC90.vcxproj b/win/configure.vcxproj index fcf5d2bd7..fcf5d2bd7 100644 --- a/win/configureVC90.vcxproj +++ b/win/configure.vcxproj diff --git a/win/configureVC90.vcproj b/win/configureVC90.vcproj deleted file mode 100644 index c9c9755c9..000000000 --- a/win/configureVC90.vcproj +++ /dev/null @@ -1,370 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="9,00"
- Name="configure"
- ProjectGUID="{B922B569-727E-4EB0-827A-04E133A91DE7}"
- RootNamespace="configure"
- Keyword="Win32Proj"
- TargetFrameworkVersion="131072"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- <Platform
- Name="x64"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="."
- IntermediateDirectory="Debug_configureVc90"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="false"
- DebugInformationFormat="4"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib"
- OutputFile="$(OutDir)/configure.exe"
- LinkIncremental="2"
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)/configure.pdb"
- SubSystem="2"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Debug|x64"
- OutputDirectory="."
- IntermediateDirectory="x64Debug_Configure"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TargetEnvironment="3"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WIN64"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- OutputFile="$(OutDir)/configure.exe"
- LinkIncremental="2"
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)/configure.pdb"
- SubSystem="2"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- TargetMachine="17"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="."
- IntermediateDirectory="Release"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalOptions="/I:"include""
- Optimization="0"
- WholeProgramOptimization="true"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
- MinimalRebuild="true"
- RuntimeLibrary="2"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="false"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib"
- OutputFile="$(OutDir)/configure.exe"
- LinkIncremental="1"
- GenerateDebugInformation="true"
- SubSystem="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- LinkTimeCodeGeneration="1"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|x64"
- OutputDirectory="."
- IntermediateDirectory="x64Release_Configure"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TargetEnvironment="3"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
- MinimalRebuild="true"
- RuntimeLibrary="0"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- OutputFile="$(OutDir)/configure.exe"
- LinkIncremental="1"
- GenerateDebugInformation="true"
- SubSystem="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- TargetMachine="17"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- >
- <File
- RelativePath=".\configure.cpp"
- >
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
- >
- <File
- RelativePath=".\colours.h"
- >
- </File>
- </Filter>
- <Filter
- Name="Resource Files"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- >
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/win/inspircdVC90.vcxproj b/win/inspircd.vcxproj index d73446eba..e77a918a0 100644 --- a/win/inspircdVC90.vcxproj +++ b/win/inspircd.vcxproj @@ -79,7 +79,7 @@ <PropertyGroup> <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion> <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\debug\</OutDir> - <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">DebugVc90\</IntDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir> <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">inspircd</TargetName> <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.exe</TargetExt> <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental> @@ -385,7 +385,7 @@ nmake -f modules.mak <ResourceCompile Include="resource.rc" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="configureVC90.vcxproj"> + <ProjectReference Include="configure.vcxproj"> <Project>{b922b569-727e-4eb0-827a-04e133a91de7}</Project> </ProjectReference> </ItemGroup> diff --git a/win/inspircdVC90.vcproj b/win/inspircdVC90.vcproj deleted file mode 100644 index df85a5f58..000000000 --- a/win/inspircdVC90.vcproj +++ /dev/null @@ -1,1941 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="9,00" - Name="inspircd" - ProjectGUID="{FE82A6FC-41C7-4CB1-AA46-6DBCB6C682C8}" - RootNamespace="inspircd" - Keyword="Win32Proj" - TargetFrameworkVersion="131072" - > - <Platforms> - <Platform - Name="Win32" - /> - <Platform - Name="x64" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\bin\debug\bin" - IntermediateDirectory="DebugVc90" - ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - Description="running configure..." - CommandLine=""$(InputDir)\configure.exe"" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories=".;../include;../../include;../include/modes;../include/commands;../../include/modes;../../include/commands;../win" - PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="3" - UsePrecompiledHeader="0" - WarningLevel="4" - Detect64BitPortabilityProblems="false" - DebugInformationFormat="3" - DisableSpecificWarnings="4100; 4512; 4127" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="psapi.lib ws2_32.lib mswsock.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib" - ShowProgress="0" - OutputFile="$(OutDir)/inspircd.exe" - LinkIncremental="1" - IgnoreDefaultLibraryNames="" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)/inspircd.pdb" - SubSystem="1" - RandomizedBaseAddress="1" - FixedBaseAddress="1" - DataExecutionPrevention="0" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - CommandLine="@echo off
echo Compiling Command Modules...
cd ..\src\commands
nmake -f commands.mak
echo Compiling Modules...
cd ..\modules
nmake -f modules.mak
" - /> - </Configuration> - <Configuration - Name="Release|Win32" - OutputDirectory="..\bin\release\bin" - IntermediateDirectory="Release" - ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - Description="running configure..." - CommandLine=""$(InputDir)\configure.exe"" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalOptions="/MP" - Optimization="1" - WholeProgramOptimization="true" - AdditionalIncludeDirectories=".;../include;../../include;../include/modes;../include/commands;../../include/modes;../../include/commands;../win" - PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" - MinimalRebuild="false" - RuntimeLibrary="2" - UsePrecompiledHeader="0" - WarningLevel="3" - Detect64BitPortabilityProblems="false" - DebugInformationFormat="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="psapi.lib ws2_32.lib mswsock.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib" - OutputFile="$(OutDir)/inspircd.exe" - LinkIncremental="1" - EmbedManagedResourceFile="inspircd.ico" - GenerateDebugInformation="true" - SubSystem="1" - OptimizeReferences="2" - EnableCOMDATFolding="2" - LinkTimeCodeGeneration="1" - RandomizedBaseAddress="1" - DataExecutionPrevention="0" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - CommandLine="@echo off
echo Compiling Command Modules...
cd ..\src\commands
nmake -f commands.mak
echo Compiling Modules...
cd ..\modules
nmake -f modules.mak
" - /> - </Configuration> - <Configuration - Name="Debug|x64" - OutputDirectory="..\bin\debug_x64\bin" - IntermediateDirectory="x64DebugVc80" - ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - CommandLine="" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - TargetEnvironment="3" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories=".;../include;../../include;../include/modes;../include/commands;../../include/modes;../../include/commands;../win" - PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN64" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="0" - WarningLevel="3" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="3" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="ws2_32.lib mswsock.lib" - ShowProgress="0" - OutputFile="$(OutDir)/inspircd.exe" - LinkIncremental="1" - IgnoreDefaultLibraryNames="" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)/inspircd.pdb" - SubSystem="1" - RandomizedBaseAddress="1" - FixedBaseAddress="1" - DataExecutionPrevention="0" - TargetMachine="17" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - CommandLine="" - /> - </Configuration> - <Configuration - Name="Release|x64" - OutputDirectory="..\bin\release_x64\bin" - IntermediateDirectory="x64ReleaseVc80" - ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - Description="running configure..." - CommandLine="$(InputDir)\configure.exe
" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - TargetEnvironment="3" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories=".;../include;../../include;../include/modes;../include/commands;../../include/modes;../../include/commands;../win" - PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" - MinimalRebuild="true" - RuntimeLibrary="0" - UsePrecompiledHeader="0" - WarningLevel="3" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="3" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="ws2_32.lib mswsock.lib" - OutputFile="$(OutDir)/inspircd.exe" - LinkIncremental="1" - GenerateDebugInformation="true" - SubSystem="1" - OptimizeReferences="2" - EnableCOMDATFolding="2" - RandomizedBaseAddress="1" - DataExecutionPrevention="0" - TargetMachine="17" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - CommandLine="@echo off
echo Compiling Command Modules...
cd ..\src
nmake -f commands.mak
echo Compiling Modules...
cd modules
nmake -f modules.mak
" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="Source Files" - Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" - UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" - > - <File - RelativePath="..\src\bancache.cpp" - > - </File> - <File - RelativePath="..\src\base.cpp" - > - </File> - <File - RelativePath="..\src\channelmanager.cpp" - > - </File> - <File - RelativePath="..\src\channels.cpp" - > - </File> - <File - RelativePath="..\src\cidr.cpp" - > - </File> - <File - RelativePath="..\src\command_parse.cpp" - > - </File> - <File - RelativePath="..\src\commands.cpp" - > - </File> - <File - RelativePath="..\src\configreader.cpp" - > - </File> - <File - RelativePath="..\src\cull_list.cpp" - > - </File> - <File - RelativePath="..\src\dns.cpp" - > - </File> - <File - RelativePath="..\src\dynamic.cpp" - > - </File> - <File - RelativePath="..\src\filelogger.cpp" - > - </File> - <File - RelativePath="..\src\hashcomp.cpp" - > - </File> - <File - RelativePath="..\src\helperfuncs.cpp" - > - </File> - <File - RelativePath="..\src\inspircd.cpp" - > - </File> - <File - RelativePath=".\inspircd_namedpipe.cpp" - > - </File> - <File - RelativePath="..\src\inspsocket.cpp" - > - </File> - <File - RelativePath="..\src\inspstring.cpp" - > - </File> - <File - RelativePath="..\src\listensocket.cpp" - > - </File> - <File - RelativePath="..\src\logger.cpp" - > - </File> - <File - RelativePath="..\src\mode.cpp" - > - </File> - <File - RelativePath="..\src\modules.cpp" - > - </File> - <File - RelativePath="..\src\server.cpp" - > - </File> - <File - RelativePath="..\src\snomasks.cpp" - > - </File> - <File - RelativePath="..\src\socket.cpp" - > - </File> - <File - RelativePath="..\src\socketengine.cpp" - > - </File> - <File - RelativePath="..\src\socketengines\socketengine_select.cpp" - > - </File> - <File - RelativePath="..\src\stats.cpp" - > - </File> - <File - RelativePath="..\src\testsuite.cpp" - > - </File> - <File - RelativePath="..\src\threadengine.cpp" - > - </File> - <File - RelativePath="..\src\threadengines\threadengine_win32.cpp" - > - </File> - <File - RelativePath="..\src\timer.cpp" - > - </File> - <File - RelativePath="..\src\user_resolver.cpp" - > - </File> - <File - RelativePath="..\src\usermanager.cpp" - > - </File> - <File - RelativePath="..\src\userprocess.cpp" - > - </File> - <File - RelativePath="..\src\users.cpp" - > - </File> - <File - RelativePath="..\src\whois.cpp" - > - </File> - <File - RelativePath="..\src\wildcard.cpp" - > - </File> - <File - RelativePath=".\win32service.cpp" - > - </File> - <File - RelativePath="..\src\xline.cpp" - > - </File> - </Filter> - <Filter - Name="Config Files" - Filter="h;hpp;hxx;hm;inl;inc;xsd" - UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" - > - <File - RelativePath=".\inspircd_config.h" - > - </File> - <File - RelativePath=".\inspircd_memory_functions.cpp" - > - </File> - <File - RelativePath=".\inspircd_se_config.h" - > - </File> - <File - RelativePath=".\inspircd_win32wrapper.cpp" - > - </File> - <File - RelativePath=".\inspircd_win32wrapper.h" - > - </File> - </Filter> - <Filter - Name="Header Files" - > - <File - RelativePath="..\include\bancache.h" - > - </File> - <File - RelativePath="..\include\base.h" - > - </File> - <File - RelativePath="..\include\caller.h" - > - </File> - <File - RelativePath="..\include\channelmanager.h" - > - </File> - <File - RelativePath="..\include\channels.h" - > - </File> - <File - RelativePath="..\include\command_parse.h" - > - </File> - <File - RelativePath="..\include\configreader.h" - > - </File> - <File - RelativePath="..\include\ctables.h" - > - </File> - <File - RelativePath="..\include\cull_list.h" - > - </File> - <File - RelativePath="..\include\dns.h" - > - </File> - <File - RelativePath="..\include\dynamic.h" - > - </File> - <File - RelativePath="..\include\exitcodes.h" - > - </File> - <File - RelativePath="..\include\extensible.h" - > - </File> - <File - RelativePath="..\include\fakeuser.h" - > - </File> - <File - RelativePath="..\include\filelogger.h" - > - </File> - <File - RelativePath="..\include\globals.h" - > - </File> - <File - RelativePath="..\include\hash_map.h" - > - </File> - <File - RelativePath="..\include\hashcomp.h" - > - </File> - <File - RelativePath="..\include\inspircd.h" - > - </File> - <File - RelativePath="..\include\inspircd_config.h" - > - </File> - <File - RelativePath=".\inspircd_namedpipe.h" - > - </File> - <File - RelativePath="..\include\inspsocket.h" - > - </File> - <File - RelativePath="..\include\inspstring.h" - > - </File> - <File - RelativePath="..\include\logger.h" - > - </File> - <File - RelativePath="..\include\membership.h" - > - </File> - <File - RelativePath="..\include\mode.h" - > - </File> - <File - RelativePath="..\include\modules.h" - > - </File> - <File - RelativePath="..\include\numerics.h" - > - </File> - <File - RelativePath="..\include\protocol.h" - > - </File> - <File - RelativePath="..\include\snomasks.h" - > - </File> - <File - RelativePath="..\include\socket.h" - > - </File> - <File - RelativePath="..\include\socketengine.h" - > - </File> - <File - RelativePath="..\include\testsuite.h" - > - </File> - <File - RelativePath="..\include\threadengine.h" - > - </File> - <File - RelativePath="..\include\threadengines\threadengine_win32.h" - > - </File> - <File - RelativePath="..\include\timer.h" - > - </File> - <File - RelativePath="..\include\typedefs.h" - > - </File> - <File - RelativePath="..\include\u_listmode.h" - > - </File> - <File - RelativePath="..\include\uid.h" - > - </File> - <File - RelativePath="..\include\usermanager.h" - > - </File> - <File - RelativePath="..\include\users.h" - > - </File> - <File - RelativePath="..\include\wildcard.h" - > - </File> - <File - RelativePath=".\win32service.h" - > - </File> - <File - RelativePath="..\include\xline.h" - > - </File> - <Filter - Name="commands" - > - <File - RelativePath="..\include\commands\cmd_whowas.h" - > - </File> - </Filter> - <Filter - Name="modes" - > - <File - RelativePath="..\include\modes\cmode_b.h" - > - </File> - <File - RelativePath="..\include\modes\cmode_h.h" - > - </File> - <File - RelativePath="..\include\modes\cmode_i.h" - > - </File> - <File - RelativePath="..\include\modes\cmode_k.h" - > - </File> - <File - RelativePath="..\include\modes\cmode_l.h" - > - </File> - <File - RelativePath="..\include\modes\cmode_m.h" - > - </File> - <File - RelativePath="..\include\modes\cmode_n.h" - > - </File> - <File - RelativePath="..\include\modes\cmode_o.h" - > - </File> - <File - RelativePath="..\include\modes\cmode_p.h" - > - </File> - <File - RelativePath="..\include\modes\cmode_s.h" - > - </File> - <File - RelativePath="..\include\modes\cmode_t.h" - > - </File> - <File - RelativePath="..\include\modes\cmode_v.h" - > - </File> - <File - RelativePath="..\include\modes\umode_i.h" - > - </File> - <File - RelativePath="..\include\modes\umode_o.h" - > - </File> - <File - RelativePath="..\include\modes\umode_s.h" - > - </File> - <File - RelativePath="..\include\modes\umode_w.h" - > - </File> - </Filter> - </Filter> - <Filter - Name="modes" - > - <File - RelativePath="..\src\modes\cmode_b.cpp" - > - </File> - <File - RelativePath="..\src\modes\cmode_h.cpp" - > - </File> - <File - RelativePath="..\src\modes\cmode_i.cpp" - > - </File> - <File - RelativePath="..\src\modes\cmode_k.cpp" - > - </File> - <File - RelativePath="..\src\modes\cmode_l.cpp" - > - </File> - <File - RelativePath="..\src\modes\cmode_m.cpp" - > - </File> - <File - RelativePath="..\src\modes\cmode_n.cpp" - > - </File> - <File - RelativePath="..\src\modes\cmode_o.cpp" - > - </File> - <File - RelativePath="..\src\modes\cmode_p.cpp" - > - </File> - <File - RelativePath="..\src\modes\cmode_s.cpp" - > - </File> - <File - RelativePath="..\src\modes\cmode_t.cpp" - > - </File> - <File - RelativePath="..\src\modes\cmode_v.cpp" - > - </File> - <File - RelativePath="..\src\modes\umode_i.cpp" - > - </File> - <File - RelativePath="..\src\modes\umode_o.cpp" - > - </File> - <File - RelativePath="..\src\modes\umode_s.cpp" - > - </File> - <File - RelativePath="..\src\modes\umode_w.cpp" - > - </File> - </Filter> - <Filter - Name="Command Handlers" - > - <File - RelativePath="..\src\commands\cmd_admin.cpp" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\src\commands\cmd_away.cpp" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\src\commands\cmd_clearcache.cpp" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\src\commands\cmd_commands.cpp" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\src\commands\cmd_connect.cpp" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\src\commands\cmd_die.cpp" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\src\commands\cmd_eline.cpp" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\src\commands\cmd_gline.cpp" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\src\commands\cmd_info.cpp" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\src\commands\cmd_invite.cpp" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\src\commands\cmd_ison.cpp" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\src\commands\cmd_join.cpp" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\src\commands\cmd_kick.cpp" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\src\commands\cmd_kill.cpp" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\src\commands\cmd_kline.cpp" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\src\commands\cmd_links.cpp" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\src\commands\cmd_list.cpp" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\src\commands\cmd_loadmodule.cpp" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\src\commands\cmd_lusers.cpp" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\src\commands\cmd_map.cpp" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\src\commands\cmd_mode.cpp" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\src\commands\cmd_modules.cpp" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\src\commands\cmd_motd.cpp" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\src\commands\cmd_names.cpp" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\src\commands\cmd_nick.cpp" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\src\commands\cmd_notice.cpp" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\src\commands\cmd_oper.cpp" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\src\commands\cmd_part.cpp" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\src\commands\cmd_pass.cpp" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\src\commands\cmd_ping.cpp" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\src\commands\cmd_pong.cpp" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\src\commands\cmd_privmsg.cpp" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\src\commands\cmd_qline.cpp" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\src\commands\cmd_quit.cpp" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\src\commands\cmd_rehash.cpp" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\src\commands\cmd_reloadmodule.cpp" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\src\commands\cmd_restart.cpp" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\src\commands\cmd_rules.cpp" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\src\commands\cmd_server.cpp" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\src\commands\cmd_squit.cpp" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\src\commands\cmd_stats.cpp" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\src\commands\cmd_time.cpp" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\src\commands\cmd_topic.cpp" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\src\commands\cmd_unloadmodule.cpp" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\src\commands\cmd_user.cpp" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\src\commands\cmd_userhost.cpp" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\src\commands\cmd_version.cpp" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\src\commands\cmd_wallops.cpp" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\src\commands\cmd_who.cpp" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\src\commands\cmd_whois.cpp" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\src\commands\cmd_whowas.cpp" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\src\commands\cmd_zline.cpp" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - </File> - </Filter> - <Filter - Name="Resources" - > - <File - RelativePath=".\inspircd.ico" - > - </File> - <File - RelativePath=".\resource.rc" - > - </File> - </Filter> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/win/key.pem b/win/key.pem deleted file mode 100644 index 09b298260..000000000 --- a/win/key.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIICWwIBAAKBgQDIbKvMTTogBZxTi1yn4ncVK09Wr+F2AxP63HWTzxnEwNhcURSa -UqpCzVIfcpr7/jKn+8I17MzaMvG8m+sPKngPK5WMN440p12uitkS+uzkLbJ7J/Z3 -35ar6nZOtbIO+aTDRzUTnNHGHRgdQj4GGvx89l0u7vQM3R2f9Oe2lWlc1wIDAQAB -AoGABh+/7hmr/X9+Y9Udyylxzw1IOtNb9cGpUiB7XT1WQbtMwSFfGkoNVsY0TK6x -SqLdRGG+cOxf5AjrdwJin8+B5JLsoFUJ79ouUSye4IpywH6pQPzTW5L/Pqw+lM81 -YZB/I7OKwSOkmFvKM8l9Y3U/UdvPeVPU44jAsnTyN9gZ/q0CQQDb+qGe7T8AIm1U -rz9Wf8/BBQy6ShoaL5sv0dqLE1/CWkGPnkhm8HA/6udlUiVNBcWlirKeSuzctC23 -u/mGU179AkEA6T5TyZ798qKyKpZXqNzyfnq5RMjCdr12rtk+sTYThbHndGonhjKk -PqWgQ/Aq3t33J740jsNpz6za6/hPRGp1YwJANE4o5eAljcOh2XP+DHRBkvS/bQA3 -qqhNLxan70/BAjZxxlNthcR//EK/mJDqu6C2uUD8bbUFEwlooXp5v13NhQJALGbN -FIjL1zDZsfnE3kSRdTpvooSFYI1Y1phMsveUZ9MiOKssswNY+QQWqlhCEQM4VbyD -zNmufvZtBpbSoDeT+QJAasQ/yEgYJnC+nbWmiJVuIFYFiWkxYToSUv4yFq2zHj6O -hVVCUr60FTMzqzS4BXzWVQVX2ylDJA40dUBTZ9HI7g== ------END RSA PRIVATE KEY----- diff --git a/win/m_spanningtreeVC90.vcxproj b/win/m_spanningtree.vcxproj index d06f72cd9..294b744f6 100644 --- a/win/m_spanningtreeVC90.vcxproj +++ b/win/m_spanningtree.vcxproj @@ -279,7 +279,7 @@ <ClInclude Include="..\src\modules\m_spanningtree\utils.h" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="inspircdVC90.vcxproj"> + <ProjectReference Include="inspircd.vcxproj"> <Project>{fe82a6fc-41c7-4cb1-aa46-6dbcb6c682c8}</Project> </ProjectReference> </ItemGroup> diff --git a/win/m_spanningtreeVC90.vcproj b/win/m_spanningtreeVC90.vcproj deleted file mode 100644 index 294d81146..000000000 --- a/win/m_spanningtreeVC90.vcproj +++ /dev/null @@ -1,634 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="9,00"
- Name="m_spanningtree"
- ProjectGUID="{1EC86B60-AB2A-4984-8A7E-0422C15601E0}"
- RootNamespace="m_spanningtree"
- Keyword="Win32Proj"
- TargetFrameworkVersion="131072"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- <Platform
- Name="x64"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="..\bin\debug\modules"
- IntermediateDirectory="Debug_spanningtree"
- ConfigurationType="2"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\include;..\win;..\src\modules\m_spanningtree;.;..\src\modules"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DLL_BUILD"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="false"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib inspircd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib"
- OutputFile="$(OutDir)/m_spanningtree.so"
- LinkIncremental="1"
- AdditionalLibraryDirectories="..\bin\debug\bin;..\bin\debug\lib"
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)/m_spanningtree.pdb"
- SubSystem="2"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- ImportLibrary="$(OutDir)/m_spanningtree.lib"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="..\bin\release\modules"
- IntermediateDirectory="Release"
- ConfigurationType="2"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalOptions="/MP"
- Optimization="1"
- WholeProgramOptimization="true"
- AdditionalIncludeDirectories="..\include;..\win;..\src\modules\m_spanningtree;.;..\src\modules"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;M_SPANNINGTREE_EXPORTS;DLL_BUILD"
- MinimalRebuild="false"
- RuntimeLibrary="2"
- UsePrecompiledHeader="0"
- WarningLevel="2"
- Detect64BitPortabilityProblems="false"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib inspircd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib"
- OutputFile="$(OutDir)/m_spanningtree.so"
- LinkIncremental="1"
- AdditionalLibraryDirectories="..\bin\release\bin;..\bin\release\lib"
- GenerateDebugInformation="true"
- SubSystem="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- LinkTimeCodeGeneration="1"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- ImportLibrary="$(OutDir)/m_spanningtree.lib"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- Description="Re-basing shared objects..."
- CommandLine="@cd $(InputDir)
@"$(InputDir)\rebase.bat"
"
- />
- </Configuration>
- <Configuration
- Name="Debug|x64"
- OutputDirectory="..\bin\debug_x64\modules"
- IntermediateDirectory="x64Debug_spanningtree"
- ConfigurationType="2"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TargetEnvironment="3"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\include;..\win;..\src\modules\m_spanningtree;.;..\src\modules"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DLL_BUILD;WIN64"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib inspircd.lib"
- OutputFile="$(OutDir)/m_spanningtree.so"
- LinkIncremental="1"
- AdditionalLibraryDirectories="..\bin\debug_x64\bin;..\bin\debug_x64\lib"
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)/m_spanningtree.pdb"
- SubSystem="2"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- ImportLibrary="$(OutDir)/m_spanningtree.lib"
- TargetMachine="17"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|x64"
- OutputDirectory="..\bin\release_x64\modules"
- IntermediateDirectory="x64Release_spanningtree"
- ConfigurationType="2"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TargetEnvironment="3"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\include;..\win;..\src\modules\m_spanningtree;.;..\src\modules"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;M_SPANNINGTREE_EXPORTS;DLL_BUILD"
- MinimalRebuild="true"
- RuntimeLibrary="0"
- UsePrecompiledHeader="0"
- WarningLevel="2"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib inspircd.lib"
- OutputFile="$(OutDir)/m_spanningtree.so"
- LinkIncremental="1"
- AdditionalLibraryDirectories="..\bin\release_x64\bin;..\bin\release_x64\lib"
- GenerateDebugInformation="true"
- SubSystem="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- ImportLibrary="$(OutDir)/m_spanningtree.lib"
- TargetMachine="17"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- >
- <File
- RelativePath="..\src\modules\m_spanningtree\addline.cpp"
- >
- </File>
- <File
- RelativePath="..\src\modules\m_spanningtree\admin.cpp"
- >
- </File>
- <File
- RelativePath="..\src\modules\m_spanningtree\away.cpp"
- >
- </File>
- <File
- RelativePath="..\src\modules\m_spanningtree\cachetimer.cpp"
- >
- </File>
- <File
- RelativePath="..\src\modules\m_spanningtree\capab.cpp"
- >
- </File>
- <File
- RelativePath="..\src\modules\m_spanningtree\compat.cpp"
- >
- </File>
- <File
- RelativePath="..\src\modules\m_spanningtree\delline.cpp"
- >
- </File>
- <File
- RelativePath="..\src\modules\m_spanningtree\encap.cpp"
- >
- </File>
- <File
- RelativePath="..\src\modules\m_spanningtree\fhost.cpp"
- >
- </File>
- <File
- RelativePath="..\src\modules\m_spanningtree\fident.cpp"
- >
- </File>
- <File
- RelativePath="..\src\modules\m_spanningtree\fjoin.cpp"
- >
- </File>
- <File
- RelativePath="..\src\modules\m_spanningtree\fmode.cpp"
- >
- </File>
- <File
- RelativePath="..\src\modules\m_spanningtree\fname.cpp"
- >
- </File>
- <File
- RelativePath="..\src\modules\m_spanningtree\ftopic.cpp"
- >
- </File>
- <File
- RelativePath="..\src\modules\m_spanningtree\hmac.cpp"
- >
- </File>
- <File
- RelativePath="..\src\modules\m_spanningtree\kill.cpp"
- >
- </File>
- <File
- RelativePath="..\src\modules\m_spanningtree\main.cpp"
- >
- </File>
- <File
- RelativePath="..\src\modules\m_spanningtree\metadata.cpp"
- >
- </File>
- <File
- RelativePath="..\src\modules\m_spanningtree\motd.cpp"
- >
- </File>
- <File
- RelativePath="..\src\modules\m_spanningtree\netburst.cpp"
- >
- </File>
- <File
- RelativePath="..\src\modules\m_spanningtree\nickcollide.cpp"
- >
- </File>
- <File
- RelativePath="..\src\modules\m_spanningtree\operquit.cpp"
- >
- </File>
- <File
- RelativePath="..\src\modules\m_spanningtree\opertype.cpp"
- >
- </File>
- <File
- RelativePath="..\src\modules\m_spanningtree\override_admin.cpp"
- >
- </File>
- <File
- RelativePath="..\src\modules\m_spanningtree\override_map.cpp"
- >
- </File>
- <File
- RelativePath="..\src\modules\m_spanningtree\override_motd.cpp"
- >
- </File>
- <File
- RelativePath="..\src\modules\m_spanningtree\override_squit.cpp"
- >
- </File>
- <File
- RelativePath="..\src\modules\m_spanningtree\override_stats.cpp"
- >
- </File>
- <File
- RelativePath="..\src\modules\m_spanningtree\override_time.cpp"
- >
- </File>
- <File
- RelativePath="..\src\modules\m_spanningtree\override_whois.cpp"
- >
- </File>
- <File
- RelativePath="..\src\modules\m_spanningtree\ping.cpp"
- >
- </File>
- <File
- RelativePath="..\src\modules\m_spanningtree\pong.cpp"
- >
- </File>
- <File
- RelativePath="..\src\modules\m_spanningtree\postcommand.cpp"
- >
- </File>
- <File
- RelativePath="..\src\modules\m_spanningtree\precommand.cpp"
- >
- </File>
- <File
- RelativePath="..\src\modules\m_spanningtree\protocolinterface.cpp"
- >
- </File>
- <File
- RelativePath="..\src\modules\m_spanningtree\push.cpp"
- >
- </File>
- <File
- RelativePath="..\src\modules\m_spanningtree\rconnect.cpp"
- >
- </File>
- <File
- RelativePath="..\src\modules\m_spanningtree\resolvers.cpp"
- >
- </File>
- <File
- RelativePath="..\src\modules\m_spanningtree\rsquit.cpp"
- >
- </File>
- <File
- RelativePath="..\src\modules\m_spanningtree\save.cpp"
- >
- </File>
- <File
- RelativePath="..\src\modules\m_spanningtree\server.cpp"
- >
- </File>
- <File
- RelativePath="..\src\modules\m_spanningtree\stats.cpp"
- >
- </File>
- <File
- RelativePath="..\src\modules\m_spanningtree\svsjoin.cpp"
- >
- </File>
- <File
- RelativePath="..\src\modules\m_spanningtree\svsnick.cpp"
- >
- </File>
- <File
- RelativePath="..\src\modules\m_spanningtree\svspart.cpp"
- >
- </File>
- <File
- RelativePath="..\src\modules\m_spanningtree\time.cpp"
- >
- </File>
- <File
- RelativePath="..\src\modules\m_spanningtree\treeserver.cpp"
- >
- </File>
- <File
- RelativePath="..\src\modules\m_spanningtree\treesocket1.cpp"
- >
- </File>
- <File
- RelativePath="..\src\modules\m_spanningtree\treesocket2.cpp"
- >
- </File>
- <File
- RelativePath="..\src\modules\m_spanningtree\uid.cpp"
- >
- </File>
- <File
- RelativePath="..\src\modules\m_spanningtree\utils.cpp"
- >
- </File>
- <File
- RelativePath="..\src\modules\m_spanningtree\version.cpp"
- >
- </File>
- <File
- RelativePath="..\src\modules\m_spanningtree\whois.cpp"
- >
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
- >
- <File
- RelativePath="..\src\modules\m_spanningtree\cachetimer.h"
- >
- </File>
- <File
- RelativePath="..\src\modules\m_spanningtree\link.h"
- >
- </File>
- <File
- RelativePath="..\src\modules\m_spanningtree\main.h"
- >
- </File>
- <File
- RelativePath="..\src\modules\m_spanningtree\protocolinterface.h"
- >
- </File>
- <File
- RelativePath="..\src\modules\m_spanningtree\rconnect.h"
- >
- </File>
- <File
- RelativePath="..\src\modules\m_spanningtree\resolvers.h"
- >
- </File>
- <File
- RelativePath="..\src\modules\m_spanningtree\rsquit.h"
- >
- </File>
- <File
- RelativePath="..\src\modules\m_spanningtree\treeserver.h"
- >
- </File>
- <File
- RelativePath="..\src\modules\m_spanningtree\treesocket.h"
- >
- </File>
- <File
- RelativePath="..\src\modules\m_spanningtree\utils.h"
- >
- </File>
- </Filter>
- <Filter
- Name="Resource Files"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- >
- <File
- RelativePath=".\inspircd_memory_functions.cpp"
- >
- </File>
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/win/makeinstaller.bat b/win/makeinstaller.bat deleted file mode 100644 index 817a06a00..000000000 --- a/win/makeinstaller.bat +++ /dev/null @@ -1,10 +0,0 @@ -move ..\bin\release\modules\m_ssl_gnutls.so c:\temp\ -move ..\bin\release\modules\m_sslinfo.so c:\temp\ -move ..\bin\release\modules\m_ssl_oper_cert.so c:\temp\ -move ..\bin\release\modules\m_filter_pcre.so c:\temp\ -"C:\Program Files\NSIS\makensisw.exe" "inspircd.nsi" -move c:\temp\m_ssl_gnutls.so ..\bin\release\modules -move c:\temp\m_sslinfo.so ..\bin\release\modules -move c:\temp\m_ssl_oper_cert.so ..\bin\release\modules -move c:\temp\m_filter_pcre.so ..\bin\release\modules - diff --git a/win/vs2010.sln b/win/vs2010.sln index 3047ae5cd..56b0a4599 100644 --- a/win/vs2010.sln +++ b/win/vs2010.sln @@ -1,13 +1,13 @@ Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 10
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "inspircd", "inspircdVC90.vcxproj", "{FE82A6FC-41C7-4CB1-AA46-6DBCB6C682C8}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "inspircd", "inspircd.vcxproj", "{FE82A6FC-41C7-4CB1-AA46-6DBCB6C682C8}"
ProjectSection(ProjectDependencies) = postProject
{B922B569-727E-4EB0-827A-04E133A91DE7} = {B922B569-727E-4EB0-827A-04E133A91DE7}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "configure", "configureVC90.vcxproj", "{B922B569-727E-4EB0-827A-04E133A91DE7}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "configure", "configure.vcxproj", "{B922B569-727E-4EB0-827A-04E133A91DE7}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "m_spanningtree", "m_spanningtreeVC90.vcxproj", "{1EC86B60-AB2A-4984-8A7E-0422C15601E0}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "m_spanningtree", "m_spanningtree.vcxproj", "{1EC86B60-AB2A-4984-8A7E-0422C15601E0}"
ProjectSection(ProjectDependencies) = postProject
{FE82A6FC-41C7-4CB1-AA46-6DBCB6C682C8} = {FE82A6FC-41C7-4CB1-AA46-6DBCB6C682C8}
EndProjectSection
|