Innovation by sed
This commit is contained in:
parent
a9b8506b34
commit
a6f63a829e
97 changed files with 176 additions and 176 deletions
|
@ -4,6 +4,6 @@ export MSYSTEM=MINGW64
|
||||||
export PATH=/mingw64/bin:/usr/local/bin:/usr/bin:/bin:/c/Windows/system32:/c/Windows:/c/Windows/System32/Wbem:/c/Windows/System32/WindowsPowerShell/v1.0:/usr/bin/site_perl:/usr/bin/vendor_perl:/usr/bin/core_perl
|
export PATH=/mingw64/bin:/usr/local/bin:/usr/bin:/bin:/c/Windows/system32:/c/Windows:/c/Windows/System32/Wbem:/c/Windows/System32/WindowsPowerShell/v1.0:/usr/bin/site_perl:/usr/bin/vendor_perl:/usr/bin/core_perl
|
||||||
|
|
||||||
sh ./autogen.sh
|
sh ./autogen.sh
|
||||||
./configure --prefix=c:/projects/charybdis/build --enable-openssl=/mingw64
|
./configure --prefix=c:/projects/solanum/build --enable-openssl=/mingw64
|
||||||
make -j2
|
make -j2
|
||||||
make install
|
make install
|
||||||
|
|
|
@ -9,7 +9,7 @@ install:
|
||||||
- ps: Push-AppveyorArtifact cygcheck.log
|
- ps: Push-AppveyorArtifact cygcheck.log
|
||||||
build_script:
|
build_script:
|
||||||
- c:\msys64\usr\bin\sh.exe -lc "cd $APPVEYOR_BUILD_FOLDER; sh .appveyor-build.sh"
|
- c:\msys64\usr\bin\sh.exe -lc "cd $APPVEYOR_BUILD_FOLDER; sh .appveyor-build.sh"
|
||||||
# - c:\msys64\usr\bin\sh.exe -lc "cd $APPVEYOR_BUILD_FOLDER/build/bin; ./charybdis -version"
|
# - c:\msys64\usr\bin\sh.exe -lc "cd $APPVEYOR_BUILD_FOLDER/build/bin; ./solanum -version"
|
||||||
on_failure:
|
on_failure:
|
||||||
- ps: Push-AppveyorArtifact config.log
|
- ps: Push-AppveyorArtifact config.log
|
||||||
- ps: Push-AppveyorArtifact librb\include\librb-config.h
|
- ps: Push-AppveyorArtifact librb\include\librb-config.h
|
||||||
|
|
8
.gitignore
vendored
8
.gitignore
vendored
|
@ -48,7 +48,7 @@ scripts/*.tar.bz2
|
||||||
scripts/*.tar.gz
|
scripts/*.tar.gz
|
||||||
include/setup.h
|
include/setup.h
|
||||||
include/setup.h.in
|
include/setup.h.in
|
||||||
ircd/charybdis
|
ircd/solanum
|
||||||
ircd/ircd_parser.c
|
ircd/ircd_parser.c
|
||||||
ircd/ircd_parser.h
|
ircd/ircd_parser.h
|
||||||
ircd/ircd_lexer.c
|
ircd/ircd_lexer.c
|
||||||
|
@ -74,13 +74,13 @@ tests/*.c.pid
|
||||||
!tests/runtime/modules/*.so
|
!tests/runtime/modules/*.so
|
||||||
!tests/runtime/modules/autoload/*.so
|
!tests/runtime/modules/autoload/*.so
|
||||||
testsuite/ircd.pid.*
|
testsuite/ircd.pid.*
|
||||||
tools/charybdis-mkpasswd
|
tools/solanum-mkpasswd
|
||||||
tools/charybdis-mkfingerprint
|
tools/solanum-mkfingerprint
|
||||||
tools/genssl
|
tools/genssl
|
||||||
tools/mkpasswd
|
tools/mkpasswd
|
||||||
tools/viconf
|
tools/viconf
|
||||||
include/serno.h
|
include/serno.h
|
||||||
ircd/charybdis
|
ircd/solanum
|
||||||
ircd/version.c
|
ircd/version.c
|
||||||
ircd/version.c.last
|
ircd/version.c.last
|
||||||
/libtool
|
/libtool
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
# Travis-CI Build for charybdis
|
# Travis-CI Build for solanum
|
||||||
# see travis-ci.org for details
|
# see travis-ci.org for details
|
||||||
|
|
||||||
language: c
|
language: c
|
||||||
|
@ -10,7 +10,7 @@ sudo: false
|
||||||
notifications:
|
notifications:
|
||||||
irc:
|
irc:
|
||||||
channels:
|
channels:
|
||||||
- "chat.freenode.net#charybdis"
|
- "chat.freenode.net#solanum"
|
||||||
|
|
||||||
matrix:
|
matrix:
|
||||||
include:
|
include:
|
||||||
|
|
22
README.md
22
README.md
|
@ -1,6 +1,6 @@
|
||||||
# charybdis [![POSIX Build Status](https://travis-ci.org/charybdis-ircd/charybdis.svg?branch=master)](https://travis-ci.org/charybdis-ircd/charybdis) [![Windows Build Status](https://ci.appveyor.com/api/projects/status/is0obsml8xyq2qk7/branch/master?svg=true)](https://ci.appveyor.com/project/kaniini/charybdis/branch/master)
|
# solanum [![POSIX Build Status](https://travis-ci.org/solanum-ircd/solanum.svg?branch=master)](https://travis-ci.org/solanum-ircd/solanum) [![Windows Build Status](https://ci.appveyor.com/api/projects/status/is0obsml8xyq2qk7/branch/master?svg=true)](https://ci.appveyor.com/project/kaniini/solanum/branch/master)
|
||||||
|
|
||||||
Charybdis is an IRCv3 server designed to be highly scalable. It implements IRCv3.1 and some parts of IRCv3.2.
|
Solanum is an IRCv3 server designed to be highly scalable. It implements IRCv3.1 and some parts of IRCv3.2.
|
||||||
|
|
||||||
It is meant to be used with an IRCv3-capable services implementation such as [Atheme][atheme] or [Anope][anope].
|
It is meant to be used with an IRCv3-capable services implementation such as [Atheme][atheme] or [Anope][anope].
|
||||||
|
|
||||||
|
@ -15,7 +15,7 @@ It is meant to be used with an IRCv3-capable services implementation such as [At
|
||||||
|
|
||||||
# platforms
|
# platforms
|
||||||
|
|
||||||
Charybdis is designed with portability in mind, but does not target older systems nor those of solely academic
|
Solanum is designed with portability in mind, but does not target older systems nor those of solely academic
|
||||||
interest.
|
interest.
|
||||||
|
|
||||||
Do note that operating systems are only supported if they are supported by their vendor.
|
Do note that operating systems are only supported if they are supported by their vendor.
|
||||||
|
@ -44,7 +44,7 @@ resolution may not be possible.
|
||||||
|
|
||||||
## Tier 3
|
## Tier 3
|
||||||
|
|
||||||
Anything else that hasn't been tested. Charybdis may or may not work on it; patches welcome if they don't.
|
Anything else that hasn't been tested. Solanum may or may not work on it; patches welcome if they don't.
|
||||||
|
|
||||||
# platform specific errata
|
# platform specific errata
|
||||||
|
|
||||||
|
@ -68,7 +68,7 @@ These are known issues and workarounds for supported platforms.
|
||||||
# building from git
|
# building from git
|
||||||
|
|
||||||
We no longer supply a prebuilt configure script in git, due to use of automake and libtool causing problems.
|
We no longer supply a prebuilt configure script in git, due to use of automake and libtool causing problems.
|
||||||
You will need to run `autogen.sh` to build the autotools files prior to building charybdis.
|
You will need to run `autogen.sh` to build the autotools files prior to building solanum.
|
||||||
|
|
||||||
# feature specific requirements
|
# feature specific requirements
|
||||||
|
|
||||||
|
@ -89,7 +89,7 @@ You will need to run `autogen.sh` to build the autotools files prior to building
|
||||||
|
|
||||||
# tips
|
# tips
|
||||||
|
|
||||||
* To report bugs in charybdis, visit us at irc.charybdis.io #charybdis
|
* To report bugs in solanum, visit us at chat.freenode.net #solanum
|
||||||
|
|
||||||
* Please read doc/index.txt to get an overview of the current documentation.
|
* Please read doc/index.txt to get an overview of the current documentation.
|
||||||
|
|
||||||
|
@ -97,13 +97,13 @@ You will need to run `autogen.sh` to build the autotools files prior to building
|
||||||
|
|
||||||
* The files, /etc/services, /etc/protocols, and /etc/resolv.conf, SHOULD be
|
* The files, /etc/services, /etc/protocols, and /etc/resolv.conf, SHOULD be
|
||||||
readable by the user running the server in order for ircd to start with
|
readable by the user running the server in order for ircd to start with
|
||||||
the correct settings. If these files are wrong, charybdis will try to use
|
the correct settings. If these files are wrong, solanum will try to use
|
||||||
127.0.0.1 for a resolver as a last-ditch effort.
|
127.0.0.1 for a resolver as a last-ditch effort.
|
||||||
|
|
||||||
# git access
|
# git access
|
||||||
|
|
||||||
* The Charybdis GIT repository can be checked out using the following command:
|
* The Solanum GIT repository can be checked out using the following command:
|
||||||
`git clone https://github.com/charybdis-ircd/charybdis`
|
`git clone https://github.com/solanum-ircd/solanum`
|
||||||
|
|
||||||
* Charybdis's GIT repository depot can be browsed over the Internet at the following address:
|
* Solanum's GIT repository depot can be browsed over the Internet at the following address:
|
||||||
https://github.com/charybdis-ircd/charybdis
|
https://github.com/solanum-ircd/solanum
|
||||||
|
|
|
@ -18,8 +18,8 @@
|
||||||
* POSSIBILITY OF SUCH DAMAGE.
|
* POSSIBILITY OF SUCH DAMAGE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef __CHARYBDIS_AUTHD_NOTICE_H__
|
#ifndef __SOLANUM_AUTHD_NOTICE_H__
|
||||||
#define __CHARYBDIS_AUTHD_NOTICE_H__
|
#define __SOLANUM_AUTHD_NOTICE_H__
|
||||||
|
|
||||||
typedef enum
|
typedef enum
|
||||||
{
|
{
|
||||||
|
@ -35,4 +35,4 @@ void stats_result(uint32_t cid, char letter, const char *fmt, ...);
|
||||||
void stats_error(uint32_t cid, char letter, const char *fmt, ...);
|
void stats_error(uint32_t cid, char letter, const char *fmt, ...);
|
||||||
void stats_done(uint32_t cid, char letter);
|
void stats_done(uint32_t cid, char letter);
|
||||||
|
|
||||||
#endif /* __CHARYBDIS_AUTHD_NOTICE_H__ */
|
#endif /* __SOLANUM_AUTHD_NOTICE_H__ */
|
||||||
|
|
|
@ -18,8 +18,8 @@
|
||||||
* POSSIBILITY OF SUCH DAMAGE.
|
* POSSIBILITY OF SUCH DAMAGE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef __CHARYBDIS_AUTHD_PROVIDER_H__
|
#ifndef __SOLANUM_AUTHD_PROVIDER_H__
|
||||||
#define __CHARYBDIS_AUTHD_PROVIDER_H__
|
#define __SOLANUM_AUTHD_PROVIDER_H__
|
||||||
|
|
||||||
#include "stdinc.h"
|
#include "stdinc.h"
|
||||||
#include "authd.h"
|
#include "authd.h"
|
||||||
|
@ -243,4 +243,4 @@ get_provider_timeout(struct auth_client *auth, uint32_t id)
|
||||||
return auth->data[id].timeout;
|
return auth->data[id].timeout;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif /* __CHARYBDIS_AUTHD_PROVIDER_H__ */
|
#endif /* __SOLANUM_AUTHD_PROVIDER_H__ */
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* charybdis: A slightly useful ircd.
|
* Solanum: a slightly advanced ircd
|
||||||
* dnsbl.c: Manages DNSBL entries and lookups
|
* dnsbl.c: Manages DNSBL entries and lookups
|
||||||
*
|
*
|
||||||
* Copyright (C) 2006-2011 charybdis development team
|
* Copyright (C) 2006-2011 charybdis development team
|
||||||
|
@ -31,7 +31,7 @@
|
||||||
* POSSIBILITY OF SUCH DAMAGE.
|
* POSSIBILITY OF SUCH DAMAGE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* Originally written for charybdis circa 2006 (by nenolod?).
|
/* Originally written for solanum circa 2006 (by nenolod?).
|
||||||
* Tweaked for authd. Some functions and structs renamed. Public/private
|
* Tweaked for authd. Some functions and structs renamed. Public/private
|
||||||
* interfaces have been shifted around. Some code has been cleaned up too.
|
* interfaces have been shifted around. Some code has been cleaned up too.
|
||||||
* -- Elizafox 24 March 2016
|
* -- Elizafox 24 March 2016
|
||||||
|
|
|
@ -105,7 +105,7 @@ static uint16_t generate_random_id(void);
|
||||||
* author:
|
* author:
|
||||||
* paul vixie, 29may94
|
* paul vixie, 29may94
|
||||||
* revised for ircd, cryogen(stu) may03
|
* revised for ircd, cryogen(stu) may03
|
||||||
* slightly modified for charybdis, mr_flea oct12
|
* slightly modified for solanum, mr_flea oct12
|
||||||
*/
|
*/
|
||||||
static int
|
static int
|
||||||
res_ourserver(const struct rb_sockaddr_storage *inp)
|
res_ourserver(const struct rb_sockaddr_storage *inp)
|
||||||
|
|
|
@ -3,11 +3,11 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef _CHARYBDIS_RES_H
|
#ifndef _SOLANUM_RES_H
|
||||||
#define _CHARYBDIS_RES_H
|
#define _SOLANUM_RES_H
|
||||||
|
|
||||||
/* Maximum number of nameservers in /etc/resolv.conf we care about
|
/* Maximum number of nameservers in /etc/resolv.conf we care about
|
||||||
* In hybrid, this was 2 -- but in Charybdis, we want to track
|
* In hybrid, this was 2 -- but in Solanum, we want to track
|
||||||
* a few more than that ;) --nenolod
|
* a few more than that ;) --nenolod
|
||||||
*/
|
*/
|
||||||
#define IRCD_MAXNS 10
|
#define IRCD_MAXNS 10
|
||||||
|
|
|
@ -3,8 +3,8 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef _CHARYBDIS_RESLIB_H
|
#ifndef _SOLANUM_RESLIB_H
|
||||||
#define _CHARYBDIS_RESLIB_H
|
#define _SOLANUM_RESLIB_H
|
||||||
|
|
||||||
/* Longest hostname we're willing to work with.
|
/* Longest hostname we're willing to work with.
|
||||||
* Due to DNSBLs this is more than HOSTLEN.
|
* Due to DNSBLs this is more than HOSTLEN.
|
||||||
|
|
|
@ -306,7 +306,7 @@ main(int argc, char *argv[])
|
||||||
if(bandb_helper == NULL)
|
if(bandb_helper == NULL)
|
||||||
{
|
{
|
||||||
fprintf(stderr,
|
fprintf(stderr,
|
||||||
"This is the charybdis bandb for internal ircd use.\n");
|
"This is the solanum bandb for internal ircd use.\n");
|
||||||
fprintf(stderr,
|
fprintf(stderr,
|
||||||
"You aren't supposed to run me directly (did you want bantool?). Exiting.\n");
|
"You aren't supposed to run me directly (did you want bantool?). Exiting.\n");
|
||||||
exit(1);
|
exit(1);
|
||||||
|
|
|
@ -196,7 +196,7 @@ main(int argc, char *argv[])
|
||||||
rb_strlcpy(etc, ETCPATH, sizeof(ETCPATH));
|
rb_strlcpy(etc, ETCPATH, sizeof(ETCPATH));
|
||||||
|
|
||||||
fprintf(stdout,
|
fprintf(stdout,
|
||||||
"* charybdis bantool v.%s\n", BT_VERSION);
|
"* solanum bantool v.%s\n", BT_VERSION);
|
||||||
|
|
||||||
if(flag.pretend == false)
|
if(flag.pretend == false)
|
||||||
{
|
{
|
||||||
|
@ -864,7 +864,7 @@ bt_smalldate(const char *string)
|
||||||
void
|
void
|
||||||
print_help(int i_exit)
|
print_help(int i_exit)
|
||||||
{
|
{
|
||||||
fprintf(stderr, "bantool v.%s - the charybdis database tool.\n", BT_VERSION);
|
fprintf(stderr, "bantool v.%s - the solanum database tool.\n", BT_VERSION);
|
||||||
fprintf(stderr, "Copyright (C) 2008 Daniel J Reidy <dubkat@gmail.com>\n");
|
fprintf(stderr, "Copyright (C) 2008 Daniel J Reidy <dubkat@gmail.com>\n");
|
||||||
fprintf(stderr, "This program is distributed in the hope that it will be useful,\n"
|
fprintf(stderr, "This program is distributed in the hope that it will be useful,\n"
|
||||||
"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
|
"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
|
||||||
|
|
48
configure.ac
48
configure.ac
|
@ -4,7 +4,7 @@ dnl said functions need to be just about as complex as they already are.
|
||||||
|
|
||||||
AC_PREREQ(2.60)
|
AC_PREREQ(2.60)
|
||||||
|
|
||||||
AC_INIT([charybdis], [4.1.3-dev])
|
AC_INIT([solanum], [1.0-dev])
|
||||||
|
|
||||||
AC_LANG(C)
|
AC_LANG(C)
|
||||||
AC_USE_SYSTEM_EXTENSIONS
|
AC_USE_SYSTEM_EXTENSIONS
|
||||||
|
@ -13,7 +13,7 @@ AC_GNU_SOURCE
|
||||||
AC_PROG_CC_C99
|
AC_PROG_CC_C99
|
||||||
|
|
||||||
if test x"$ac_cv_prog_cc_c99" = "xno"; then
|
if test x"$ac_cv_prog_cc_c99" = "xno"; then
|
||||||
AC_ERROR([charybdis requires a C99 capable compiler])
|
AC_ERROR([solanum requires a C99 capable compiler])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AC_PREFIX_DEFAULT($HOME/ircd)
|
AC_PREFIX_DEFAULT($HOME/ircd)
|
||||||
|
@ -183,7 +183,7 @@ AC_SUBST(CRYPT_LIB)
|
||||||
AC_C_BIGENDIAN
|
AC_C_BIGENDIAN
|
||||||
|
|
||||||
dnl Check for stdarg.h - if we can't find it, halt configure
|
dnl Check for stdarg.h - if we can't find it, halt configure
|
||||||
AC_CHECK_HEADER(stdarg.h, , [AC_MSG_ERROR([** stdarg.h could not be found - charybdis will not compile without it **])])
|
AC_CHECK_HEADER(stdarg.h, , [AC_MSG_ERROR([** stdarg.h could not be found - solanum will not compile without it **])])
|
||||||
AC_CHECK_FUNCS([strlcat strlcpy])
|
AC_CHECK_FUNCS([strlcat strlcpy])
|
||||||
|
|
||||||
AC_TYPE_INT16_T
|
AC_TYPE_INT16_T
|
||||||
|
@ -561,7 +561,7 @@ if test "$profile" = yes; then
|
||||||
if test "$ac_cv_c_compiler_gnu" = yes; then
|
if test "$ac_cv_c_compiler_gnu" = yes; then
|
||||||
IRC_CFLAGS="$IRC_CFLAGS -pg"
|
IRC_CFLAGS="$IRC_CFLAGS -pg"
|
||||||
AC_MSG_RESULT([yes, adding -pg])
|
AC_MSG_RESULT([yes, adding -pg])
|
||||||
AC_DEFINE(CHARYBDIS_PROFILE, 1, [Define this if you are profiling.])
|
AC_DEFINE(SOLANUM_PROFILE, 1, [Define this if you are profiling.])
|
||||||
else
|
else
|
||||||
AC_MSG_RESULT([no, profile builds only work with gcc])
|
AC_MSG_RESULT([no, profile builds only work with gcc])
|
||||||
fi
|
fi
|
||||||
|
@ -646,26 +646,26 @@ AC_HELP_STRING([--enable-warnings],[Enable all sorts of warnings for debugging.]
|
||||||
IRC_CFLAGS="$IRC_CFLAGS -O0"
|
IRC_CFLAGS="$IRC_CFLAGS -O0"
|
||||||
CFLAGS="$IRC_CFLAGS"
|
CFLAGS="$IRC_CFLAGS"
|
||||||
|
|
||||||
CHARYBDIS_C_GCC_TRY_FLAGS([-Wall], charybdis_cv_c_gcc_w_all)
|
SOLANUM_C_GCC_TRY_FLAGS([-Wall], solanum_cv_c_gcc_w_all)
|
||||||
CHARYBDIS_C_GCC_TRY_FLAGS([-Wpointer-arith], charybdis_cv_c_gcc_w_pointer_arith)
|
SOLANUM_C_GCC_TRY_FLAGS([-Wpointer-arith], solanum_cv_c_gcc_w_pointer_arith)
|
||||||
CHARYBDIS_C_GCC_TRY_FLAGS([-Wimplicit -Wnested-externs], charybdis_cv_c_gcc_w_implicit)
|
SOLANUM_C_GCC_TRY_FLAGS([-Wimplicit -Wnested-externs], solanum_cv_c_gcc_w_implicit)
|
||||||
CHARYBDIS_C_GCC_TRY_FLAGS([-Wcast-align], charybdis_cv_c_gcc_w_cast_align)
|
SOLANUM_C_GCC_TRY_FLAGS([-Wcast-align], solanum_cv_c_gcc_w_cast_align)
|
||||||
CHARYBDIS_C_GCC_TRY_FLAGS([-Wcast-qual], charybdis_cv_c_gcc_w_cast_qual)
|
SOLANUM_C_GCC_TRY_FLAGS([-Wcast-qual], solanum_cv_c_gcc_w_cast_qual)
|
||||||
CHARYBDIS_C_GCC_TRY_FLAGS([-Wwrite-strings], charybdis_cv_c_gcc_w_write_strings)
|
SOLANUM_C_GCC_TRY_FLAGS([-Wwrite-strings], solanum_cv_c_gcc_w_write_strings)
|
||||||
CHARYBDIS_C_GCC_TRY_FLAGS([-Werror-implicit-function-declaration], charybdis_cv_c_gcc_w_error_implicit_function_declaration)
|
SOLANUM_C_GCC_TRY_FLAGS([-Werror-implicit-function-declaration], solanum_cv_c_gcc_w_error_implicit_function_declaration)
|
||||||
CHARYBDIS_C_GCC_TRY_FLAGS([-Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations], charybdis_cv_c_gcc_prototypes)
|
SOLANUM_C_GCC_TRY_FLAGS([-Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations], solanum_cv_c_gcc_prototypes)
|
||||||
CHARYBDIS_C_GCC_TRY_FLAGS([-Wparentheses], charybdis_cv_c_gcc_parentheses)
|
SOLANUM_C_GCC_TRY_FLAGS([-Wparentheses], solanum_cv_c_gcc_parentheses)
|
||||||
CHARYBDIS_C_GCC_TRY_FLAGS([-W -Wno-unused], charybdis_cv_c_gcc_w)
|
SOLANUM_C_GCC_TRY_FLAGS([-W -Wno-unused], solanum_cv_c_gcc_w)
|
||||||
CHARYBDIS_C_GCC_TRY_FLAGS([-Wextra], charybdis_cv_c_gcc_w_extra)
|
SOLANUM_C_GCC_TRY_FLAGS([-Wextra], solanum_cv_c_gcc_w_extra)
|
||||||
CHARYBDIS_C_GCC_TRY_FLAGS([-Wshadow], charybdis_cv_c_gcc_w_shadow)
|
SOLANUM_C_GCC_TRY_FLAGS([-Wshadow], solanum_cv_c_gcc_w_shadow)
|
||||||
CHARYBDIS_C_GCC_TRY_FLAGS([-Wmissing-noreturn], charybdis_cv_c_gcc_w_missing_noreturn)
|
SOLANUM_C_GCC_TRY_FLAGS([-Wmissing-noreturn], solanum_cv_c_gcc_w_missing_noreturn)
|
||||||
CHARYBDIS_C_GCC_TRY_FLAGS([-Wundef], charybdis_cv_c_gcc_w_undef)
|
SOLANUM_C_GCC_TRY_FLAGS([-Wundef], solanum_cv_c_gcc_w_undef)
|
||||||
CHARYBDIS_C_GCC_TRY_FLAGS([-Wpacked], charybdis_cv_c_gcc_w_packed)
|
SOLANUM_C_GCC_TRY_FLAGS([-Wpacked], solanum_cv_c_gcc_w_packed)
|
||||||
CHARYBDIS_C_GCC_TRY_FLAGS([-Wnested-externs], charybdis_cv_c_gcc_w_nested_externs)
|
SOLANUM_C_GCC_TRY_FLAGS([-Wnested-externs], solanum_cv_c_gcc_w_nested_externs)
|
||||||
CHARYBDIS_C_GCC_TRY_FLAGS([-Wunused-function -Wunused-label -Wunused-value -Wunused-variable], charybdis_cv_c_gcc_w_unused)
|
SOLANUM_C_GCC_TRY_FLAGS([-Wunused-function -Wunused-label -Wunused-value -Wunused-variable], solanum_cv_c_gcc_w_unused)
|
||||||
CHARYBDIS_C_GCC_TRY_FLAGS([-Wredundant-decls], charybdis_cv_c_gcc_w_redundant_decls)
|
SOLANUM_C_GCC_TRY_FLAGS([-Wredundant-decls], solanum_cv_c_gcc_w_redundant_decls)
|
||||||
CHARYBDIS_C_GCC_TRY_FLAGS([-Wfloat-equal], charybdis_cv_c_gcc_w_float_equal)
|
SOLANUM_C_GCC_TRY_FLAGS([-Wfloat-equal], solanum_cv_c_gcc_w_float_equal)
|
||||||
CHARYBDIS_C_GCC_TRY_FLAGS([-Wformat -Wformat-y2k -Wno-format-security], charybdis_cv_c_gcc_w_format)
|
SOLANUM_C_GCC_TRY_FLAGS([-Wformat -Wformat-y2k -Wno-format-security], solanum_cv_c_gcc_w_format)
|
||||||
|
|
||||||
IRC_CFLAGS="$CFLAGS"
|
IRC_CFLAGS="$CFLAGS"
|
||||||
],[])
|
],[])
|
||||||
|
|
|
@ -1,2 +1,2 @@
|
||||||
This is charybdis MOTD you might replace it, but if not your friends will
|
This is solanum MOTD you might replace it, but if not your friends will
|
||||||
laugh at you.
|
laugh at you.
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
/* doc/reference.conf - charybdis Example configuration file
|
/* doc/reference.conf - solanum example configuration file
|
||||||
*
|
*
|
||||||
* Copyright (C) 2000-2002 Hybrid Development Team
|
* Copyright (C) 2000-2002 Hybrid Development Team
|
||||||
* Copyright (C) 2002-2005 ircd-ratbox development team
|
* Copyright (C) 2002-2005 ircd-ratbox development team
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
This directory contains extensions (modules) to charybdis ircd that
|
This directory contains extensions (modules) to solanum ircd that
|
||||||
have been contributed by other people, or written by our development
|
have been contributed by other people, or written by our development
|
||||||
team. Unsupported extensions live under unsupported/.
|
team. Unsupported extensions live under unsupported/.
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* charybdis: an advanced ircd.
|
* Solanum: a slightly advanced ircd
|
||||||
* chm_nonotice: block NOTICEs (+T mode).
|
* chm_nonotice: block NOTICEs (+T mode).
|
||||||
*
|
*
|
||||||
* Copyright (c) 2012 William Pitcock <nenolod@dereferenced.org>
|
* Copyright (c) 2012 William Pitcock <nenolod@dereferenced.org>
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
*
|
*
|
||||||
* Make it short, sweet, and to the point.
|
* Make it short, sweet, and to the point.
|
||||||
*/
|
*/
|
||||||
static const char example_desc[] = "This is an example Charybdis module.";
|
static const char example_desc[] = "This is an example Solanum module.";
|
||||||
|
|
||||||
/* Declare the void's initially up here, as modules dont have an
|
/* Declare the void's initially up here, as modules dont have an
|
||||||
* include file, we will normally have client_p, source_p, parc
|
* include file, we will normally have client_p, source_p, parc
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* charybdis: an advanced Internet Relay Chat Daemon(ircd).
|
* Solanum: a slightly advanced ircd
|
||||||
*
|
*
|
||||||
* Copyright (C) 2006 charybdis development team
|
* Copyright (C) 2006 charybdis development team
|
||||||
* All rights reserved
|
* All rights reserved
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Charybdis: an advanced ircd
|
* Solanum: a slightly advanced ircd
|
||||||
* ip_cloaking.c: provide user hostname cloaking
|
* ip_cloaking.c: provide user hostname cloaking
|
||||||
*
|
*
|
||||||
* Written originally by nenolod, altered to use FNV by Elizabeth in 2008
|
* Written originally by nenolod, altered to use FNV by Elizabeth in 2008
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Charybdis: an advanced ircd
|
* Solanum: a slightly advanced ircd
|
||||||
* ip_cloaking.c: provide user hostname cloaking
|
* ip_cloaking.c: provide user hostname cloaking
|
||||||
*
|
*
|
||||||
* Written originally by nenolod, altered to use FNV by Elizabeth in 2008
|
* Written originally by nenolod, altered to use FNV by Elizabeth in 2008
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* charybdis
|
* solanum
|
||||||
* m_extendchans.c: Allow an oper or service to let a given user join more channels.
|
* m_extendchans.c: Allow an oper or service to let a given user join more channels.
|
||||||
*
|
*
|
||||||
* Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center
|
* Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Charybdis: an advanced Internet Relay Chat Daemon(ircd).
|
* Solanum: a slightly advanced ircd
|
||||||
* m_omode.c: allows oper mode hacking
|
* m_omode.c: allows oper mode hacking
|
||||||
*
|
*
|
||||||
* Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center
|
* Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* roleplay commands for charybdis.
|
* roleplay commands for solanum.
|
||||||
*
|
*
|
||||||
* adds NPC, NPCA, and SCENE which allow users to send messages from 'fake'
|
* adds NPC, NPCA, and SCENE which allow users to send messages from 'fake'
|
||||||
* nicknames. in the case of NPC and NPCA, the nickname will be underlined
|
* nicknames. in the case of NPC and NPCA, the nickname will be underlined
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* oper-override for charybdis.
|
* oper-override for solanum.
|
||||||
*
|
*
|
||||||
* adds usermode +p and has a timer event that is iterated over to disable
|
* adds usermode +p and has a timer event that is iterated over to disable
|
||||||
* usermode +p after a while...
|
* usermode +p after a while...
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* charybdis
|
* solanum
|
||||||
* authproc.h: A header with the authd functions.
|
* authproc.h: A header with the authd functions.
|
||||||
*
|
*
|
||||||
* Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center
|
* Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center
|
||||||
|
@ -23,8 +23,8 @@
|
||||||
* USA
|
* USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef CHARYBDIS_AUTHD_H
|
#ifndef SOLANUM_AUTHD_H
|
||||||
#define CHARYBDIS_AUTHD_H
|
#define SOLANUM_AUTHD_H
|
||||||
|
|
||||||
#include "stdinc.h"
|
#include "stdinc.h"
|
||||||
#include "rb_dictionary.h"
|
#include "rb_dictionary.h"
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* charybdis: A useful ircd.
|
* Solanum: a slightly advanced ircd
|
||||||
* certpf.h: Fingerprint method strings
|
* certpf.h: Fingerprint method strings
|
||||||
*
|
*
|
||||||
* Copyright 2016 Simon Arlott
|
* Copyright 2016 Simon Arlott
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* charybdis: An advanced ircd.
|
* Solanum: a slightly advanced ircd
|
||||||
* chmode.h: The ircd channel header.
|
* chmode.h: The ircd channel header.
|
||||||
*
|
*
|
||||||
* Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center
|
* Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* charybdis: A useful ircd.
|
* Solanum: a slightly advanced ircd
|
||||||
* client.h: The ircd client header.
|
* client.h: The ircd client header.
|
||||||
*
|
*
|
||||||
* Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center
|
* Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* charybdis
|
* solanum
|
||||||
* dns.h: A header with the DNS functions.
|
* dns.h: A header with the DNS functions.
|
||||||
*
|
*
|
||||||
* Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center
|
* Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center
|
||||||
|
@ -23,8 +23,8 @@
|
||||||
* USA
|
* USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef CHARYBDIS_DNS_H
|
#ifndef SOLANUM_DNS_H
|
||||||
#define CHARYBDIS_DNS_H
|
#define SOLANUM_DNS_H
|
||||||
|
|
||||||
#include "stdinc.h"
|
#include "stdinc.h"
|
||||||
#include "authproc.h"
|
#include "authproc.h"
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* charybdis: an advanced Internet Relay Chat Daemon(ircd).
|
* Solanum: a slightly advanced ircd
|
||||||
* hostmask.h: A header for the hostmask code.
|
* hostmask.h: A header for the hostmask code.
|
||||||
*
|
*
|
||||||
* Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center
|
* Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* charybdis: an advanced ircd.
|
* Solanum: a slightly advanced ircd
|
||||||
* inline/stringops.h: inlined string operations used in a few places
|
* inline/stringops.h: inlined string operations used in a few places
|
||||||
*
|
*
|
||||||
* Copyright (c) 2005-2008 charybdis development team
|
* Copyright (c) 2005-2008 charybdis development team
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* charybdis: An advanced IRCd.
|
* solanum: An advanced IRCd.
|
||||||
* ircd_defs.h: A header for ircd global definitions.
|
* ircd_defs.h: A header for ircd global definitions.
|
||||||
*
|
*
|
||||||
* Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center
|
* Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* charybdis: An advanced ircd.
|
* Solanum: a slightly advanced ircd
|
||||||
* ircd_linker.h: IRCd symbol table linking and maintainance
|
* ircd_linker.h: IRCd symbol table linking and maintainance
|
||||||
*
|
*
|
||||||
* Copyright (c) 2006 William Pitcock <nenolod@nenolod.net>
|
* Copyright (c) 2006 William Pitcock <nenolod@nenolod.net>
|
||||||
|
@ -31,8 +31,8 @@
|
||||||
* POSSIBILITY OF SUCH DAMAGE.
|
* POSSIBILITY OF SUCH DAMAGE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef _CHARYBDIS_IRCD_LINKER_H
|
#ifndef _SOLANUM_IRCD_LINKER_H
|
||||||
#define _CHARYBDIS_IRCD_LINKER_H
|
#define _SOLANUM_IRCD_LINKER_H
|
||||||
|
|
||||||
#include <dlfcn.h>
|
#include <dlfcn.h>
|
||||||
|
|
||||||
|
|
|
@ -63,10 +63,10 @@ Info MyInformation[] = {
|
||||||
#endif /* UH PATH */
|
#endif /* UH PATH */
|
||||||
|
|
||||||
#ifdef SOMAXCONN
|
#ifdef SOMAXCONN
|
||||||
{"CHARYBDIS_SOMAXCONN", "", SOMAXCONN,
|
{"SOLANUM_SOMAXCONN", "", SOMAXCONN,
|
||||||
"Maximum Queue Length of Pending Connections"},
|
"Maximum Queue Length of Pending Connections"},
|
||||||
#else
|
#else
|
||||||
{"CHARYBDIS_SOMAXCONN", "", CHARYBDIS_SOMAXCONN,
|
{"SOLANUM_SOMAXCONN", "", SOLANUM_SOMAXCONN,
|
||||||
"Maximum Queue Length of Pending Connections"},
|
"Maximum Queue Length of Pending Connections"},
|
||||||
#endif /* SOMAXCONN */
|
#endif /* SOMAXCONN */
|
||||||
|
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
#include "parse.h"
|
#include "parse.h"
|
||||||
#include "client.h" /* for IDLEN */
|
#include "client.h" /* for IDLEN */
|
||||||
|
|
||||||
#define MAPI_CHARYBDIS 2
|
#define MAPI_SOLANUM 2
|
||||||
|
|
||||||
#include <ltdl.h>
|
#include <ltdl.h>
|
||||||
|
|
||||||
|
@ -97,8 +97,8 @@ struct mapi_mheader_av1
|
||||||
};
|
};
|
||||||
|
|
||||||
#define MAPI_ORIGIN_UNKNOWN 0 /* Unknown provenance (AV1 etc.) */
|
#define MAPI_ORIGIN_UNKNOWN 0 /* Unknown provenance (AV1 etc.) */
|
||||||
#define MAPI_ORIGIN_EXTENSION 1 /* Charybdis extension */
|
#define MAPI_ORIGIN_EXTENSION 1 /* Solanum extension */
|
||||||
#define MAPI_ORIGIN_CORE 2 /* Charybdis core module */
|
#define MAPI_ORIGIN_CORE 2 /* Solanum core module */
|
||||||
|
|
||||||
struct mapi_mheader_av2
|
struct mapi_mheader_av2
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* charybdis - an advanced ircd.
|
* solanum - an advanced ircd.
|
||||||
* Copyright (c) 2016 William Pitcock <nenolod@dereferenced.org>.
|
* Copyright (c) 2016 William Pitcock <nenolod@dereferenced.org>.
|
||||||
*
|
*
|
||||||
* Permission to use, copy, modify, and/or distribute this software for any
|
* Permission to use, copy, modify, and/or distribute this software for any
|
||||||
|
@ -19,8 +19,8 @@
|
||||||
* POSSIBILITY OF SUCH DAMAGE.
|
* POSSIBILITY OF SUCH DAMAGE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef CHARYBDIS__MSGBUF_H
|
#ifndef SOLANUM__MSGBUF_H
|
||||||
#define CHARYBDIS__MSGBUF_H
|
#define SOLANUM__MSGBUF_H
|
||||||
|
|
||||||
#define MAXPARA (15)
|
#define MAXPARA (15)
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* charybdis: an advanced ircd.
|
* Solanum: a slightly advanced ircd
|
||||||
* privilege.h: Dynamic privileges API.
|
* privilege.h: Dynamic privileges API.
|
||||||
*
|
*
|
||||||
* Copyright (c) 2008 William Pitcock <nenolod@dereferenced.org>
|
* Copyright (c) 2008 William Pitcock <nenolod@dereferenced.org>
|
||||||
|
@ -21,8 +21,8 @@
|
||||||
* POSSIBILITY OF SUCH DAMAGE.
|
* POSSIBILITY OF SUCH DAMAGE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef __CHARYBDIS_PRIVILEGE_H
|
#ifndef __SOLANUM_PRIVILEGE_H
|
||||||
#define __CHARYBDIS_PRIVILEGE_H
|
#define __SOLANUM_PRIVILEGE_H
|
||||||
|
|
||||||
#include "stdinc.h"
|
#include "stdinc.h"
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* charybdis: an advanced Internet Relay Chat Daemon(ircd).
|
* Solanum: a slightly advanced ircd
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 Keith Buck <mr_flea@esper.net>
|
* Copyright (C) 2012 Keith Buck <mr_flea@esper.net>
|
||||||
*
|
*
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* charybdis: An advanced IRCd.
|
* solanum: An advanced IRCd.
|
||||||
* s_assert.h: Definition of the soft assert (s_assert) macro.
|
* s_assert.h: Definition of the soft assert (s_assert) macro.
|
||||||
*
|
*
|
||||||
* Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center
|
* Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* charybdis: Advanced, scalable Internet Relay Chat.
|
* solanum: Advanced, scalable Internet Relay Chat.
|
||||||
* s_conf.h: A header for the configuration functions.
|
* s_conf.h: A header for the configuration functions.
|
||||||
*
|
*
|
||||||
* Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center
|
* Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* charybdis: An advanced ircd.
|
* Solanum: a slightly advanced ircd
|
||||||
* snomask.h: Management for user server-notice masks.
|
* snomask.h: Management for user server-notice masks.
|
||||||
*
|
*
|
||||||
* Copyright (c) 2006 William Pitcock <nenolod@nenolod.net>
|
* Copyright (c) 2006 William Pitcock <nenolod@nenolod.net>
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* charybdis: an advanced ircd
|
* Solanum: a slightly advanced ircd
|
||||||
* markup.h: parses markup into human-readable strings
|
* markup.h: parses markup into human-readable strings
|
||||||
*
|
*
|
||||||
* Copyright (c) 2006-2007 William Pitcock <nenolod@nenolod.net>
|
* Copyright (c) 2006-2007 William Pitcock <nenolod@nenolod.net>
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* charybdis: A slightly useful ircd.
|
* Solanum: a slightly advanced ircd
|
||||||
* supported.h: isupport (005) numeric
|
* supported.h: isupport (005) numeric
|
||||||
*
|
*
|
||||||
* Entirely rewritten, August 2006 by Jilles Tjoelker
|
* Entirely rewritten, August 2006 by Jilles Tjoelker
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* charybdis: an advanced Internet Relay Chat Daemon(ircd).
|
* Solanum: a slightly advanced ircd
|
||||||
*
|
*
|
||||||
* Copyright (C) 2004-2005 Lee Hardy <lee@leeh.co.uk>
|
* Copyright (C) 2004-2005 Lee Hardy <lee@leeh.co.uk>
|
||||||
* Copyright (C) 2005-2010 Jilles Tjoelker <jilles@stack.nl>
|
* Copyright (C) 2005-2010 Jilles Tjoelker <jilles@stack.nl>
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* wsproc.h: An interface to the charybdis websocket helper daemon
|
* wsproc.h: An interface to the solanum websocket helper daemon
|
||||||
* Copyright (C) 2007 Aaron Sethman <androsyn@ratbox.org>
|
* Copyright (C) 2007 Aaron Sethman <androsyn@ratbox.org>
|
||||||
* Copyright (C) 2007 ircd-ratbox development team
|
* Copyright (C) 2007 ircd-ratbox development team
|
||||||
* Copyright (C) 2016 William Pitcock <nenolod@dereferenced.org>
|
* Copyright (C) 2016 William Pitcock <nenolod@dereferenced.org>
|
||||||
|
|
|
@ -69,10 +69,10 @@ libircd_la_LDFLAGS = $(EXTRA_FLAGS) -avoid-version -no-undefined
|
||||||
libircd_la_LIBADD = @LIBLTDL@ -L$(top_srcdir)/librb/src -lrb
|
libircd_la_LIBADD = @LIBLTDL@ -L$(top_srcdir)/librb/src -lrb
|
||||||
libircd_LTLIBRARIES = libircd.la
|
libircd_LTLIBRARIES = libircd.la
|
||||||
|
|
||||||
bin_PROGRAMS = charybdis
|
bin_PROGRAMS = solanum
|
||||||
charybdis_SOURCES = main.c
|
solanum_SOURCES = main.c
|
||||||
charybdis_LDFLAGS = $(EXTRA_FLAGS) -dlopen self
|
solanum_LDFLAGS = $(EXTRA_FLAGS) -dlopen self
|
||||||
charybdis_LDADD = libircd.la -L$(top_srcdir)/librb/src -lrb
|
solanum_LDADD = libircd.la -L$(top_srcdir)/librb/src -lrb
|
||||||
|
|
||||||
install-exec-hook: install-libircdLTLIBRARIES
|
install-exec-hook: install-libircdLTLIBRARIES
|
||||||
$(RM) -f version.c
|
$(RM) -f version.c
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* charybdis: A slightly useful ircd.
|
* Solanum: a slightly advanced ircd
|
||||||
* chmode.c: channel mode management
|
* chmode.c: channel mode management
|
||||||
*
|
*
|
||||||
* Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center
|
* Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* charybdis: an advanced ircd.
|
* Solanum: a slightly advanced ircd
|
||||||
* client.c: Controls clients.
|
* client.c: Controls clients.
|
||||||
*
|
*
|
||||||
* Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center
|
* Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center
|
||||||
|
@ -1147,7 +1147,7 @@ free_exited_clients(void *unused)
|
||||||
target_p->name, (unsigned int) target_p->status,
|
target_p->name, (unsigned int) target_p->status,
|
||||||
(unsigned long long)target_p->flags, target_p->handler);
|
(unsigned long long)target_p->flags, target_p->handler);
|
||||||
sendto_realops_snomask(SNO_GENERAL, L_ALL,
|
sendto_realops_snomask(SNO_GENERAL, L_ALL,
|
||||||
"Please report this to the charybdis developers!");
|
"Please report this to the solanum developers!");
|
||||||
found++;
|
found++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1291,7 +1291,7 @@ exit_aborted_clients(void *unused)
|
||||||
abt->client->name, (unsigned int) abt->client->status,
|
abt->client->name, (unsigned int) abt->client->status,
|
||||||
(unsigned long long)abt->client->flags, abt->client->handler);
|
(unsigned long long)abt->client->flags, abt->client->handler);
|
||||||
sendto_realops_snomask(SNO_GENERAL, L_ALL,
|
sendto_realops_snomask(SNO_GENERAL, L_ALL,
|
||||||
"Please report this to the charybdis developers!");
|
"Please report this to the solanum developers!");
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* charybdis: A slightly useful ircd.
|
* Solanum: a slightly advanced ircd
|
||||||
* extban.c: extended ban types ($type:data)
|
* extban.c: extended ban types ($type:data)
|
||||||
*
|
*
|
||||||
* Copyright (C) 2006 charybdis development team
|
* Copyright (C) 2006 charybdis development team
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* charybdis: an advanced internet relay chat daemon (ircd).
|
* Solanum: a slightly advanced ircd
|
||||||
* hostmask.c: Code to efficiently find IP & hostmask based configs.
|
* hostmask.c: Code to efficiently find IP & hostmask based configs.
|
||||||
*
|
*
|
||||||
* Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center
|
* Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* charybdis: A slightly useful ircd.
|
* Solanum: a slightly advanced ircd
|
||||||
* ircd.c: Starts up and runs the ircd.
|
* ircd.c: Starts up and runs the ircd.
|
||||||
*
|
*
|
||||||
* Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center
|
* Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center
|
||||||
|
@ -206,7 +206,7 @@ init_sys(void)
|
||||||
if(maxconnections <= MAX_BUFFER)
|
if(maxconnections <= MAX_BUFFER)
|
||||||
{
|
{
|
||||||
fprintf(stderr, "ERROR: Shell FD limits are too low.\n");
|
fprintf(stderr, "ERROR: Shell FD limits are too low.\n");
|
||||||
fprintf(stderr, "ERROR: charybdis reserves %d FDs, shell limits must be above this\n", MAX_BUFFER);
|
fprintf(stderr, "ERROR: solanum reserves %d FDs, shell limits must be above this\n", MAX_BUFFER);
|
||||||
exit(EXIT_FAILURE);
|
exit(EXIT_FAILURE);
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
|
@ -553,7 +553,7 @@ ircd_restart_cb(const char *str)
|
||||||
/*
|
/*
|
||||||
* Why EXIT_FAILURE here?
|
* Why EXIT_FAILURE here?
|
||||||
* Because if ircd_die_cb() is called it's because of a fatal
|
* Because if ircd_die_cb() is called it's because of a fatal
|
||||||
* error inside libcharybdis, and we don't know how to handle the
|
* error inside libsolanum, and we don't know how to handle the
|
||||||
* exception, so it is logical to return a FAILURE exit code here.
|
* exception, so it is logical to return a FAILURE exit code here.
|
||||||
* --nenolod
|
* --nenolod
|
||||||
*/
|
*/
|
||||||
|
@ -627,7 +627,7 @@ seed_random(void *unused)
|
||||||
* Side Effects - this is where the ircd gets going right now
|
* Side Effects - this is where the ircd gets going right now
|
||||||
*/
|
*/
|
||||||
int
|
int
|
||||||
charybdis_main(int argc, char * const argv[])
|
solanum_main(int argc, char * const argv[])
|
||||||
{
|
{
|
||||||
int fd;
|
int fd;
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* charybdis: an advanced Internet Relay Chat Daemon(ircd).
|
* Solanum: a slightly advanced ircd
|
||||||
*
|
*
|
||||||
* Copyright (C) 2003 Lee H <lee@leeh.co.uk>
|
* Copyright (C) 2003 Lee H <lee@leeh.co.uk>
|
||||||
* Copyright (C) 2003-2005 ircd-ratbox development team
|
* Copyright (C) 2003-2005 ircd-ratbox development team
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
/* This file is in the public domain. */
|
/* This file is in the public domain. */
|
||||||
|
|
||||||
extern int charybdis_main(int argc, const char *argv[]);
|
extern int solanum_main(int argc, const char *argv[]);
|
||||||
|
|
||||||
int
|
int
|
||||||
main(int argc, const char *argv[])
|
main(int argc, const char *argv[])
|
||||||
{
|
{
|
||||||
return charybdis_main(argc, argv);
|
return solanum_main(argc, argv);
|
||||||
}
|
}
|
||||||
|
|
|
@ -41,7 +41,7 @@
|
||||||
#include <ltdl.h>
|
#include <ltdl.h>
|
||||||
|
|
||||||
#ifndef LT_MODULE_EXT
|
#ifndef LT_MODULE_EXT
|
||||||
# error "Charybdis requires loadable module support."
|
# error "Solanum requires loadable module support."
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
rb_dlink_list module_list;
|
rb_dlink_list module_list;
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* charybdis - an advanced ircd.
|
* solanum - an advanced ircd.
|
||||||
* Copyright (c) 2016 William Pitcock <nenolod@dereferenced.org>.
|
* Copyright (c) 2016 William Pitcock <nenolod@dereferenced.org>.
|
||||||
*
|
*
|
||||||
* Permission to use, copy, modify, and/or distribute this software for any
|
* Permission to use, copy, modify, and/or distribute this software for any
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
/* charybdis
|
/* solanum
|
||||||
* operhash.c - Hashes nick!user@host{oper}
|
* operhash.c - Hashes nick!user@host{oper}
|
||||||
*
|
*
|
||||||
* Copyright (C) 2005 Lee Hardy <lee -at- leeh.co.uk>
|
* Copyright (C) 2005 Lee Hardy <lee -at- leeh.co.uk>
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* charybdis: an advanced ircd.
|
* Solanum: a slightly advanced ircd
|
||||||
* parse.c: The message parser.
|
* parse.c: The message parser.
|
||||||
*
|
*
|
||||||
* Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center
|
* Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* charybdis: an advanced ircd.
|
* Solanum: a slightly advanced ircd
|
||||||
* privilege.c: Dynamic privileges API.
|
* privilege.c: Dynamic privileges API.
|
||||||
*
|
*
|
||||||
* Copyright (c) 2008 William Pitcock <nenolod@dereferenced.org>
|
* Copyright (c) 2008 William Pitcock <nenolod@dereferenced.org>
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* charybdis: an advanced ircd
|
* Solanum: a slightly advanced ircd
|
||||||
* ratelimit.c: Per-client ratelimiting for high-bandwidth commands.
|
* ratelimit.c: Per-client ratelimiting for high-bandwidth commands.
|
||||||
*
|
*
|
||||||
* Copyright (c) 2012 Keith Buck <mr_flea -at- esper.net>
|
* Copyright (c) 2012 Keith Buck <mr_flea -at- esper.net>
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* charybdis
|
* solanum
|
||||||
* scache.c: Server names cache.
|
* scache.c: Server names cache.
|
||||||
*
|
*
|
||||||
* Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center
|
* Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* charybdis: An advanced ircd.
|
* Solanum: a slightly advanced ircd
|
||||||
* snomask.c: Management for user server-notice masks.
|
* snomask.c: Management for user server-notice masks.
|
||||||
*
|
*
|
||||||
* Copyright (c) 2006 William Pitcock <nenolod@nenolod.net>
|
* Copyright (c) 2006 William Pitcock <nenolod@nenolod.net>
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* charybdis: an advanced ircd
|
* Solanum: a slightly advanced ircd
|
||||||
* substitution.c: parses substitution-keyword expansions
|
* substitution.c: parses substitution-keyword expansions
|
||||||
*
|
*
|
||||||
* Copyright (c) 2006-2007 William Pitcock <nenolod@nenolod.net>
|
* Copyright (c) 2006-2007 William Pitcock <nenolod@nenolod.net>
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* charybdis: A slightly useful ircd.
|
* Solanum: a slightly advanced ircd
|
||||||
* supported.c: isupport (005) numeric
|
* supported.c: isupport (005) numeric
|
||||||
*
|
*
|
||||||
* Copyright (C) 2006 Jilles Tjoelker
|
* Copyright (C) 2006 Jilles Tjoelker
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* charybdis: an advanced Internet Relay Chat Daemon(ircd).
|
* Solanum: a slightly advanced ircd
|
||||||
* tgchange.c - code for restricting private messages
|
* tgchange.c - code for restricting private messages
|
||||||
*
|
*
|
||||||
* Copyright (C) 2004-2005 Lee Hardy <lee@leeh.co.uk>
|
* Copyright (C) 2004-2005 Lee Hardy <lee@leeh.co.uk>
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
spitshell=cat
|
spitshell=cat
|
||||||
package=charybdis
|
package=solanum
|
||||||
|
|
||||||
echo "Extracting $package/src/version.c..."
|
echo "Extracting $package/src/version.c..."
|
||||||
|
|
||||||
|
|
|
@ -1,2 +1,2 @@
|
||||||
librb was based on ircd-ratbox's libratbox. This contains various utility
|
librb was based on ircd-ratbox's libratbox. This contains various utility
|
||||||
functions. See the CREDITS in Charybdis for more information.
|
functions. See the CREDITS in Solanum for more information.
|
||||||
|
|
|
@ -20,7 +20,7 @@ dnl Checks for programs.
|
||||||
AC_PROG_CC_C99
|
AC_PROG_CC_C99
|
||||||
|
|
||||||
if test x"$ac_cv_prog_cc_c99" = "xno"; then
|
if test x"$ac_cv_prog_cc_c99" = "xno"; then
|
||||||
AC_ERROR([charybdis requires a C99 capable compiler])
|
AC_ERROR([solanum requires a C99 capable compiler])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* charybdis: an advanced ircd.
|
* Solanum: a slightly advanced ircd
|
||||||
* rb_dictionary.h: Dictionary-based storage.
|
* rb_dictionary.h: Dictionary-based storage.
|
||||||
*
|
*
|
||||||
* Copyright (c) 2007 William Pitcock <nenolod -at- sacredspiral.co.uk>
|
* Copyright (c) 2007 William Pitcock <nenolod -at- sacredspiral.co.uk>
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* charybdis: an advanced ircd.
|
* Solanum: a slightly advanced ircd
|
||||||
* rb_radixtree.h: Dictionary-based storage.
|
* rb_radixtree.h: Dictionary-based storage.
|
||||||
*
|
*
|
||||||
* Copyright (c) 2007-2016 William Pitcock <nenolod -at- dereferenced.org>
|
* Copyright (c) 2007-2016 William Pitcock <nenolod -at- dereferenced.org>
|
||||||
|
|
|
@ -8,7 +8,7 @@ include_dir=@includedir@/librb
|
||||||
lib_dir=@libdir@
|
lib_dir=@libdir@
|
||||||
|
|
||||||
Name: librb
|
Name: librb
|
||||||
Description: Portable runtime for charybdis and other things, based on libratbox
|
Description: Portable runtime for solanum and other things, based on libratbox
|
||||||
Version: @PACKAGE_VERSION@
|
Version: @PACKAGE_VERSION@
|
||||||
Libs: -L${lib_dir} -lrb
|
Libs: -L${lib_dir} -lrb
|
||||||
Cflags: -I${include_dir}
|
Cflags: -I${include_dir}
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* charybdis: an advanced ircd
|
* Solanum: a slightly advanced ircd
|
||||||
* rb_dictionary.c: Dictionary-based information storage.
|
* rb_dictionary.c: Dictionary-based information storage.
|
||||||
*
|
*
|
||||||
* Copyright (c) 2007 William Pitcock <nenolod -at- sacredspiral.co.uk>
|
* Copyright (c) 2007 William Pitcock <nenolod -at- sacredspiral.co.uk>
|
||||||
|
|
|
@ -40,7 +40,7 @@
|
||||||
/*
|
/*
|
||||||
* Personalization string for CTR-DRBG initialization
|
* Personalization string for CTR-DRBG initialization
|
||||||
*/
|
*/
|
||||||
static const char rb_mbedtls_personal_str[] = "charybdis/librb personalization string";
|
static const char rb_mbedtls_personal_str[] = "solanum/librb personalization string";
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Default list of supported ciphersuites
|
* Default list of supported ciphersuites
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* charybdis: an advanced ircd.
|
* Solanum: a slightly advanced ircd
|
||||||
* rb_radixtree.c: Dictionary-based information storage.
|
* rb_radixtree.c: Dictionary-based information storage.
|
||||||
*
|
*
|
||||||
* Copyright (c) 2007-2016 William Pitcock <nenolod -at- dereferenced.org>
|
* Copyright (c) 2007-2016 William Pitcock <nenolod -at- dereferenced.org>
|
||||||
|
|
|
@ -18,7 +18,7 @@ generation=`expr $generation + 1`
|
||||||
|
|
||||||
$spitshell >version.c <<!SUB!THIS!
|
$spitshell >version.c <<!SUB!THIS!
|
||||||
/*
|
/*
|
||||||
* librb: a library used by charybdis and other things
|
* librb: a library used by solanum and other things
|
||||||
* src/version.c
|
* src/version.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 1990 Chelsea Ashley Dyerman
|
* Copyright (C) 1990 Chelsea Ashley Dyerman
|
||||||
|
|
|
@ -372,7 +372,7 @@ rb_init_netio_win32(void)
|
||||||
{
|
{
|
||||||
/* this muchly sucks, but i'm too lazy to do overlapped i/o, maybe someday... -androsyn */
|
/* this muchly sucks, but i'm too lazy to do overlapped i/o, maybe someday... -androsyn */
|
||||||
WNDCLASS wc;
|
WNDCLASS wc;
|
||||||
static const char *classname = "charybdis-class";
|
static const char *classname = "solanum-class";
|
||||||
|
|
||||||
wc.style = 0;
|
wc.style = 0;
|
||||||
wc.lpfnWndProc = (WNDPROC) rb_process_events;
|
wc.lpfnWndProc = (WNDPROC) rb_process_events;
|
||||||
|
|
|
@ -29,8 +29,8 @@ AC_DEFUN([AC_SUBST_DIR], [
|
||||||
AC_SUBST($1)
|
AC_SUBST($1)
|
||||||
])
|
])
|
||||||
|
|
||||||
dnl CHARYBDIS_C_GCC_TRY_FLAGS(<warnings>,<cachevar>)
|
dnl SOLANUM_C_GCC_TRY_FLAGS(<warnings>,<cachevar>)
|
||||||
AC_DEFUN([CHARYBDIS_C_GCC_TRY_FLAGS],[
|
AC_DEFUN([SOLANUM_C_GCC_TRY_FLAGS],[
|
||||||
AC_MSG_CHECKING([GCC flag(s) $1])
|
AC_MSG_CHECKING([GCC flag(s) $1])
|
||||||
if test "${GCC-no}" = yes
|
if test "${GCC-no}" = yes
|
||||||
then
|
then
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* charybdis: an advanced ircd.
|
* Solanum: a slightly advanced ircd
|
||||||
* cap_account_tag.c: implement the account-tag IRCv3.2 capability
|
* cap_account_tag.c: implement the account-tag IRCv3.2 capability
|
||||||
*
|
*
|
||||||
* Copyright (c) 2016 William Pitcock <nenolod@dereferenced.org>
|
* Copyright (c) 2016 William Pitcock <nenolod@dereferenced.org>
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* charybdis: an advanced ircd.
|
* Solanum: a slightly advanced ircd
|
||||||
* cap_server_time.c: implement the server-time IRCv3.2 capability
|
* cap_server_time.c: implement the server-time IRCv3.2 capability
|
||||||
*
|
*
|
||||||
* Copyright (c) 2016 William Pitcock <nenolod@dereferenced.org>
|
* Copyright (c) 2016 William Pitcock <nenolod@dereferenced.org>
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* charybdis: an advanced ircd.
|
* Solanum: a slightly advanced ircd
|
||||||
* chm_nocolour: strip colours (+c mode).
|
* chm_nocolour: strip colours (+c mode).
|
||||||
*
|
*
|
||||||
* Copyright (c) 2012 William Pitcock <nenolod@dereferenced.org>
|
* Copyright (c) 2012 William Pitcock <nenolod@dereferenced.org>
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* charybdis: an advanced ircd.
|
* Solanum: a slightly advanced ircd
|
||||||
* chm_noctcp: block non-action CTCP (+C mode).
|
* chm_noctcp: block non-action CTCP (+C mode).
|
||||||
*
|
*
|
||||||
* Copyright (c) 2012 William Pitcock <nenolod@dereferenced.org>
|
* Copyright (c) 2012 William Pitcock <nenolod@dereferenced.org>
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* charybdis: An advanced ircd.
|
* Solanum: a slightly advanced ircd
|
||||||
* m_ban.c: Propagates network bans across servers.
|
* m_ban.c: Propagates network bans across servers.
|
||||||
*
|
*
|
||||||
* Copyright (C) 2010 Jilles Tjoelker
|
* Copyright (C) 2010 Jilles Tjoelker
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* charybdis: An advanced ircd.
|
* Solanum: a slightly advanced ircd
|
||||||
* m_list_safelist.c: Version of /list that uses the safelist code.
|
* m_list_safelist.c: Version of /list that uses the safelist code.
|
||||||
*
|
*
|
||||||
* Copyright (c) 2006 William Pitcock <nenolod@nenolod.net>
|
* Copyright (c) 2006 William Pitcock <nenolod@nenolod.net>
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* charybdis: an advanced Internet Relay Chat Daemon(ircd).
|
* Solanum: a slightly advanced ircd
|
||||||
* m_scan.c: Provides information about various targets on various topics
|
* m_scan.c: Provides information about various targets on various topics
|
||||||
*
|
*
|
||||||
* Copyright (c) 2006 William Pitcock <nenolod -at- nenolod.net>
|
* Copyright (c) 2006 William Pitcock <nenolod -at- nenolod.net>
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* charybdis: an advanced Internet Relay Chat Daemon(ircd).
|
* Solanum: a slightly advanced ircd
|
||||||
* m_snote.c: Server notice listener
|
* m_snote.c: Server notice listener
|
||||||
*
|
*
|
||||||
* Copyright (c) 2006 William Pitcock <nenolod -at- nenolod.net>
|
* Copyright (c) 2006 William Pitcock <nenolod -at- nenolod.net>
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* charybdis: an advanced Internet Relay Chat Daemon(ircd).
|
* Solanum: a slightly advanced ircd
|
||||||
* sno_routing.c: Shows notices about netjoins and netsplits
|
* sno_routing.c: Shows notices about netjoins and netsplits
|
||||||
*
|
*
|
||||||
* Copyright (c) 2005-2006 Jilles Tjoelker <jilles-at-stack.nl>
|
* Copyright (c) 2005-2006 Jilles Tjoelker <jilles-at-stack.nl>
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
# application.sh: Special package building rules for charybdis.
|
# application.sh: Special package building rules for solanum.
|
||||||
#
|
#
|
||||||
# Copyright (c) 2007-2008 atheme.org
|
# Copyright (c) 2007-2008 atheme.org
|
||||||
#
|
#
|
||||||
|
@ -24,11 +24,11 @@ if [ "x$TIP" = "x" ]; then
|
||||||
exit
|
exit
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Charybdis wants the git head to be in include/serno.h, in its own format.
|
# Solanum wants the git head to be in include/serno.h, in its own format.
|
||||||
SERNO=`git log -1 --date=format:%Y%m%d --pretty=format:%cd-%h`
|
SERNO=`git log -1 --date=format:%Y%m%d --pretty=format:%cd-%h`
|
||||||
DATECODE=`git log -1 --pretty=format:%ct`
|
DATECODE=`git log -1 --pretty=format:%ct`
|
||||||
|
|
||||||
echo "[charybdis] Generating include/serno.h for tip $MYTIP."
|
echo "[solanum] Generating include/serno.h for tip $MYTIP."
|
||||||
cat << _EOF_ > include/serno.h
|
cat << _EOF_ > include/serno.h
|
||||||
/* Generated automatically by makepackage. Any changes made here will be lost. */
|
/* Generated automatically by makepackage. Any changes made here will be lost. */
|
||||||
#define SERNO "$SERNO"
|
#define SERNO "$SERNO"
|
||||||
|
|
|
@ -1169,7 +1169,7 @@ main(int argc, char **argv)
|
||||||
if(s_ctlfd == NULL || s_pipe == NULL || s_pid == NULL)
|
if(s_ctlfd == NULL || s_pipe == NULL || s_pid == NULL)
|
||||||
{
|
{
|
||||||
fprintf(stderr,
|
fprintf(stderr,
|
||||||
"This is the charybdis ssld for internal ircd use.\n");
|
"This is the solanum ssld for internal ircd use.\n");
|
||||||
fprintf(stderr,
|
fprintf(stderr,
|
||||||
"You aren't supposed to run me directly. Exiting.\n");
|
"You aren't supposed to run me directly. Exiting.\n");
|
||||||
exit(1);
|
exit(1);
|
||||||
|
|
|
@ -31,7 +31,7 @@
|
||||||
|
|
||||||
#define MSG "%s:%d (%s)", __FILE__, __LINE__, __FUNCTION__
|
#define MSG "%s:%d (%s)", __FILE__, __LINE__, __FUNCTION__
|
||||||
|
|
||||||
extern int charybdis_main(int argc, const char *argv[]);
|
extern int solanum_main(int argc, const char *argv[]);
|
||||||
|
|
||||||
static char argv0[BUFSIZE];
|
static char argv0[BUFSIZE];
|
||||||
static char configfile[BUFSIZE];
|
static char configfile[BUFSIZE];
|
||||||
|
@ -94,7 +94,7 @@ void ircd_util_init(const char *name)
|
||||||
ircd_paths[IRCD_PATH_BIN] = rb_strdup(buf);
|
ircd_paths[IRCD_PATH_BIN] = rb_strdup(buf);
|
||||||
ircd_paths[IRCD_PATH_LIBEXEC] = rb_strdup(buf);
|
ircd_paths[IRCD_PATH_LIBEXEC] = rb_strdup(buf);
|
||||||
|
|
||||||
is_int(0, charybdis_main(ARRAY_SIZE(argv) - 1, argv), MSG);
|
is_int(0, solanum_main(ARRAY_SIZE(argv) - 1, argv), MSG);
|
||||||
}
|
}
|
||||||
|
|
||||||
void ircd_util_reload_module(const char *name)
|
void ircd_util_reload_module(const char *name)
|
||||||
|
|
|
@ -19,7 +19,7 @@ serverinfo {
|
||||||
|
|
||||||
admin {
|
admin {
|
||||||
name = "Here";
|
name = "Here";
|
||||||
description = "Charybdis testsuite server";
|
description = "Solanum testsuite server";
|
||||||
email = "root@localhost";
|
email = "root@localhost";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -19,7 +19,7 @@ serverinfo {
|
||||||
|
|
||||||
admin {
|
admin {
|
||||||
name = "Here";
|
name = "Here";
|
||||||
description = "Charybdis testsuite server";
|
description = "Solanum testsuite server";
|
||||||
email = "root@localhost";
|
email = "root@localhost";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -19,7 +19,7 @@ serverinfo {
|
||||||
|
|
||||||
admin {
|
admin {
|
||||||
name = "Here";
|
name = "Here";
|
||||||
description = "Charybdis testsuite server";
|
description = "Solanum testsuite server";
|
||||||
email = "root@localhost";
|
email = "root@localhost";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -3,6 +3,6 @@ testdir=`pwd`
|
||||||
prefix=`sed -n -e 's/^#define IRCD_PREFIX "\(.*\)"/\1/p' "$testdir/../include/setup.h"`
|
prefix=`sed -n -e 's/^#define IRCD_PREFIX "\(.*\)"/\1/p' "$testdir/../include/setup.h"`
|
||||||
[ -d $prefix ] || { echo Unable to find installation prefix; exit 1; }
|
[ -d $prefix ] || { echo Unable to find installation prefix; exit 1; }
|
||||||
|
|
||||||
$prefix/bin/charybdis -configfile $testdir/ircd.conf.1 -pidfile $testdir/ircd.pid.1
|
$prefix/bin/solanum -configfile $testdir/ircd.conf.1 -pidfile $testdir/ircd.pid.1
|
||||||
$prefix/bin/charybdis -configfile $testdir/ircd.conf.2 -pidfile $testdir/ircd.pid.2
|
$prefix/bin/solanum -configfile $testdir/ircd.conf.2 -pidfile $testdir/ircd.pid.2
|
||||||
$prefix/bin/charybdis -configfile $testdir/ircd.conf.3 -pidfile $testdir/ircd.pid.3
|
$prefix/bin/solanum -configfile $testdir/ircd.conf.3 -pidfile $testdir/ircd.pid.3
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
bin_PROGRAMS = charybdis-mkpasswd charybdis-mkfingerprint
|
bin_PROGRAMS = solanum-mkpasswd solanum-mkfingerprint
|
||||||
AM_CFLAGS=$(WARNFLAGS)
|
AM_CFLAGS=$(WARNFLAGS)
|
||||||
AM_CPPFLAGS = $(DEFAULT_INCLUDES) -I../librb/include -I.
|
AM_CPPFLAGS = $(DEFAULT_INCLUDES) -I../librb/include -I.
|
||||||
|
|
||||||
charybdis_mkpasswd_SOURCES = mkpasswd.c
|
solanum_mkpasswd_SOURCES = mkpasswd.c
|
||||||
charybdis_mkpasswd_LDADD = ../librb/src/librb.la
|
solanum_mkpasswd_LDADD = ../librb/src/librb.la
|
||||||
|
|
||||||
charybdis_mkfingerprint_SOURCES = mkfingerprint.c
|
solanum_mkfingerprint_SOURCES = mkfingerprint.c
|
||||||
charybdis_mkfingerprint_LDADD = ../librb/src/librb.la
|
solanum_mkfingerprint_LDADD = ../librb/src/librb.la
|
||||||
|
|
|
@ -32,7 +32,7 @@ A Blowfish salt consists of up to 22 alphanumeric characters (plus '.' and
|
||||||
Blowfish may not always be available, but MD5, SHA256, and SHA512 are
|
Blowfish may not always be available, but MD5, SHA256, and SHA512 are
|
||||||
guaranteed to be.
|
guaranteed to be.
|
||||||
|
|
||||||
This program should work anywhere Charybdis does; if you find otherwise, file
|
This program should work anywhere Solanum does; if you find otherwise, file
|
||||||
a bug.
|
a bug.
|
||||||
|
|
||||||
* Blowfish's rounds parameter is a logarithm, not an integer value
|
* Blowfish's rounds parameter is a logarithm, not an integer value
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* wsockd.c: charybdis websockets helper
|
* wsockd.c: solanum websockets helper
|
||||||
* Copyright (C) 2007 Aaron Sethman <androsyn@ratbox.org>
|
* Copyright (C) 2007 Aaron Sethman <androsyn@ratbox.org>
|
||||||
* Copyright (C) 2007 ircd-ratbox development team
|
* Copyright (C) 2007 ircd-ratbox development team
|
||||||
* Copyright (C) 2016 William Pitcock <nenolod@dereferenced.org>
|
* Copyright (C) 2016 William Pitcock <nenolod@dereferenced.org>
|
||||||
|
@ -961,7 +961,7 @@ main(int argc, char **argv)
|
||||||
if(s_ctlfd == NULL || s_pipe == NULL || s_pid == NULL)
|
if(s_ctlfd == NULL || s_pipe == NULL || s_pid == NULL)
|
||||||
{
|
{
|
||||||
fprintf(stderr,
|
fprintf(stderr,
|
||||||
"This is the charybdis wsockd for internal ircd use.\n");
|
"This is the solanum wsockd for internal ircd use.\n");
|
||||||
fprintf(stderr,
|
fprintf(stderr,
|
||||||
"You aren't supposed to run me directly. Exiting.\n");
|
"You aren't supposed to run me directly. Exiting.\n");
|
||||||
exit(1);
|
exit(1);
|
||||||
|
|
Loading…
Reference in a new issue