gmane.network.irc.bot.wraith.scm
http://blog.gmane.org/gmane.network.irc.bot.wraith.scm
hourly11901-01-01T00:00+00:00Gmanehttp://gmane.org/img/gmane-25t.png
http://gmane.org
branch 'maint' updated. v1.3.4-506-g3aba8b0
http://permalink.gmane.org/gmane.network.irc.bot.wraith.scm/770
<pre>The branch 'maint' has been updated
Summary of changes:
.gitignore | 20 +-
Makefile.in | 58 +-
README | 24 +-
autotools/Makefile | 35 -
autotools/depcomp | 105 -
{autotools => build/autotools}/.gitignore | 0
build/autotools/Makefile | 40 +
{autotools => build/autotools}/README | 0
{autotools => build/autotools}/configure.ac | 108 +-
build/autotools/depcomp | 630 ++++++
.../autotools}/includes/acinclude.m4 | 94 +-
{autotools => build/autotools}/includes/depend.m4 | 1 -
build/autotools/includes/libtcl.m4 | 593 ++++++
{autotools => build/autotools}/includes/stat.m4 | 0
{autotools => build/autotools}/includes/wrap.m4 | 0
build/cc1plus | 58 +
configure | 2229 +++++++++++++-------
doc/UPDATES | 55 +
doc/help.txt | 185 ++-
doc/responses.txt | 2 +-
doc/settings.txt | 22 +-
lib/bdlib | 2 +-
src/.gitignore | 2 +
src/Makefile.in | 43 +-
src/binary.c | 37 +-
src/binary.h | 1 +
src/botcmd.c | 22 +
src/botmsg.c | 2 +-
src/botmsg.h | 2 +-
src/botnet.c | 130 +-
src/chan.h | 81 +-
src/chanprog.c | 291 ++--
src/chanprog.h | 13 +-
src/cmds.c | 247 ++-
src/compat/Makefile.in | 23 +-
src/conf.c | 84 +-
src/conf.h | 7 +-
config.h.in => src/config.h.in | 100 +-
src/crypt.c | 2 +-
src/crypt.h | 2 +-
src/crypto/Makefile.in | 26 +-
src/crypto/aes_util.c | 2 +-
src/crypto/bf_util.c | 26 +-
src/crypto/crypto.h | 12 -
src/crypto/dh_util.c | 154 ++
src/crypto/dh_util.h | 22 +
src/dcc.c | 12 +-
src/dcc.h | 6 +-
src/dccutil.c | 84 +-
src/dccutil.h | 9 +-
src/debug.c | 82 +-
src/dhparam.c | 108 +
src/{mod/compress.mod/compress.h => dl.c} | 40 +-
src/dl.h | 35 +
src/eggdrop.h | 36 +-
src/enclink.c | 20 +-
src/flags.c | 72 +-
src/flags.h | 41 +-
src/garble.h | 2 +
src/generate_defs.sh | 65 +
src/generate_symbol.sh | 56 +
src/libcrypto.c | 133 ++
src/libcrypto.h | 33 +
src/libssl.c | 106 +
src/libssl.h | 30 +
src/libtcl.c | 152 ++
src/libtcl.h | 26 +
src/log.c | 2 +-
src/main.c | 34 +-
src/main.h | 2 +-
src/misc.c | 79 +-
src/mod/Makefile.in | 2 +-
src/mod/channels.mod/Makefile | 11 +-
src/mod/channels.mod/{tclchan.c => chanmisc.c} | 206 ++-
src/mod/channels.mod/channels.c | 43 +-
src/mod/channels.mod/channels.h | 2 +-
src/mod/channels.mod/cmdschan.c | 85 +-
src/mod/channels.mod/userchan.c | 47 +-
src/mod/compress.mod/Makefile | 10 +-
src/mod/console.mod/Makefile | 10 +-
src/mod/ctcp.mod/Makefile | 10 +-
src/mod/ctcp.mod/ctcp.c | 30 +-
src/mod/irc.mod/Makefile | 11 +-
src/mod/irc.mod/chan.c | 461 +++--
src/mod/irc.mod/cmdsirc.c | 73 +-
src/mod/irc.mod/irc.c | 578 +++---
src/mod/irc.mod/irc.h | 40 +-
src/mod/irc.mod/mode.c | 174 ++-
src/mod/irc.mod/msgcmds.c | 28 +-
src/mod/mod.mk.in | 14 +
src/mod/server.mod/Makefile | 10 +-
src/mod/server.mod/cmdsserv.c | 63 +-
src/mod/server.mod/server.c | 82 +-
src/mod/server.mod/server.h | 16 +-
src/mod/server.mod/servmsg.c | 151 ++-
src/mod/share.mod/Makefile | 10 +-
src/mod/share.mod/share.c | 8 +
src/mod/transfer.mod/Makefile | 10 +-
src/mod/transfer.mod/transfer.c | 14 +-
src/mod/transfer.mod/transfer.h | 6 +-
src/mod/update.mod/Makefile | 10 +-
src/net.c | 199 ++-
src/net.h | 26 +-
src/openssl.c | 162 ++
src/openssl.h | 22 +
src/set.c | 144 +-
src/set.h | 6 +-
src/settings.h | 12 +-
src/shell.c | 47 +-
src/socket.h | 2 +-
src/stringfix.c | 54 +-
src/tandem.h | 1 -
src/types.h | 21 +-
src/userent.c | 41 +-
src/userrec.c | 38 +-
src/userrec.h | 3 +-
src/users.h | 6 +-
117 files changed, 7187 insertions(+), 2669 deletions(-)
delete mode 100755 autotools/Makefile
delete mode 100755 autotools/depcomp
rename {autotools => build/autotools}/.gitignore (100%)
create mode 100755 build/autotools/Makefile
rename {autotools => build/autotools}/README (100%)
rename {autotools => build/autotools}/configure.ac (63%)
create mode 100755 build/autotools/depcomp
rename {autotools => build/autotools}/includes/acinclude.m4 (86%)
rename {autotools => build/autotools}/includes/depend.m4 (97%)
create mode 100644 build/autotools/includes/libtcl.m4
rename {autotools => build/autotools}/includes/stat.m4 (100%)
rename {autotools => build/autotools}/includes/wrap.m4 (100%)
create mode 100755 build/cc1plus
rename config.h.in => src/config.h.in (79%)
delete mode 100755 src/crypto/crypto.h
create mode 100644 src/crypto/dh_util.c
create mode 100644 src/crypto/dh_util.h
create mode 100644 src/dhparam.c
copy src/{mod/compress.mod/compress.h => dl.c} (50%)
mode change 100755 => 100644
create mode 100644 src/dl.h
create mode 100755 src/generate_defs.sh
create mode 100755 src/generate_symbol.sh
create mode 100644 src/libcrypto.c
create mode 100644 src/libcrypto.h
create mode 100644 src/libssl.c
create mode 100644 src/libssl.h
create mode 100644 src/libtcl.c
create mode 100644 src/libtcl.h
rename src/mod/channels.mod/{tclchan.c => chanmisc.c} (83%)
create mode 100644 src/mod/mod.mk.in
create mode 100644 src/openssl.c
create mode 100644 src/openssl.h
...from 1b15e9a4113b761557522b1b0043df5ab1687802 (commit) to (3aba8b0c8143d232a6a6dd648432e1f5c2ece405)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Complete Diff
diff --git a/.gitignore b/.gitignore
index 9a9342c..992037f 100644
--- a/.gitignore
+++ b/.gitignore
< at >< at > -1,11 +1,13 < at >< at >
/Makefile
-/confcache
-/config.cache
-/confdefs.h
-/config.h
-/config.log
-/config.status
-/stamp.*
+/build/confcache
+/build/config.cache
+/build/confdefs.h
+/src/config.h
+/build/config.log
+/build/config.status
+/build/stamp.*
+/build/autotools/src
+/src/mod/mod.mk
/*.tgz
/leaf
/hub
< at >< at > -16,5 +18,7 < at >< at >
/ts
/...
/.l-*
-.*.swp
+.*.sw*
+.hosts
+.resolv.conf
.buildbot
diff --git a/Makefile.in b/Makefile.in
index d1dad17..736a7cb 100755
--- a/Makefile.in
+++ b/Makefile.in
< at >< at > -12,10 +12,10 < at >< at > VPATH = < at >srcdir< at >
CCDEPMODE = < at >CCDEPMODE< at >
BINEXEC = wraith< at >EXEEXT< at >
-STATICMAKEFILES = lib/Makefile src/mod/Makefile src/crypto/Makefile src/compat/Makefile src/Makefile Makefile
-CONFIGFILES = config.cache config.log config.status config.h src/buildinfo.h
+STATICMAKEFILES = lib/Makefile src/mod/Makefile src/crypto/Makefile src/compat/Makefile src/Makefile Makefile src/mod/mod.mk
+CONFIGFILES = build/config.cache build/config.log build/config.status src/config.h src/buildinfo.h
-DISTROFILES = README LICENSE config.h.in autotools doc scripts lib Makefile.in build.sh configure src BSDmakefile
+DISTROFILES = README LICENSE build doc scripts lib Makefile.in build.sh configure src BSDmakefile
EXCLUDES = $(CONFIGFILES) $(STATICMAKEFILES)
COMMIT_FULL := $(shell git log -1 --pretty=format:%H HEAD)
< at >< at > -30,7 +30,7 < at >< at > SETTINGSFILE = doc/settings.txt
RESPONSESFILE = doc/responses.txt
# defaults
-CXX = < at >CCACHE< at > < at >DISTCC< at > < at >CXX< at > < at >STATIC< at >
+CXX = < at >CCACHE< at > < at >DISTCC< at > < at >CXX< at > < at >STATIC< at > -no-integrated-cpp
LD_DYNAMIC = < at >CXX< at >
LD_STATIC = < at >CXX< at > < at >STATIC< at >
CCDEBUG = < at >CCACHE< at > < at >DISTCC< at > < at >CXX< at >
< at >< at > -39,7 +39,8 < at >< at > STRIP = < at >STRIP< at >
DIFF = < at >DIFF< at >
#LIBS = < at >LIBS< at > < at >ZLIB< at >
-LIBS = < at >LIBS< at > < at >SSL_LIBS< at >
+LIBS = < at >LIBS< at >
+INCLUDES = < at >TCL_INCLUDES< at >
DEBCXXFLAGS = -DDEBUG -fno-inline -g3 -ggdb3 -O0 -Wshadow -Wpointer-arith -Wcast-align < at >GCC3DEB< at > < at >GCC4DEB< at >
CFLGS = < at >GCC3< at > -fno-rtti < at >SSL_INCLUDES< at >
< at >< at > -57,26 +58,28 < at >< at > _CFLGS = -fno-strict-aliasing -W -Wformat \
MAKEFLAGS = -s < at >MAKEJOBS< at >
-MAKE_STATIC = $(MAKE) 'MAKE=$(MAKE)' 'CXX=$(CXX)' 'LD=$(LD_STATIC)' \
+STRINGFIX = src/stringfix
+
+MAKE_STATIC = $(MAKE) 'MAKE=$(MAKE)' 'CXX=$(CXX)' 'LD=$(LD_STATIC)' 'INCLUDES=$(INCLUDES)' \
'CCDEPMODE=$(CCDEPMODE)' 'BRANCH=$(BRANCH)' 'COMMIT=$(COMMIT_SHORT)' 'BUILDTS=$(BUILDTS)' 'VERSION=$(VERSION)' \
-'STRIP=$(STRIP)' 'CFLGS=$(CFLGS) -DBIN_TYPE_STATIC' \
+'STRIP=$(STRIP)' 'CFLGS=$(CFLGS) -DBIN_TYPE_STATIC' 'STRINGFIX=$(STRINGFIX)' \
'LIBS=$(LIBS)' 'EGGEXEC=$(BINEXEC)' 'EGGBUILD=(wraith)'
-MAKE_DYNAMIC = $(MAKE) 'MAKE=$(MAKE)' 'CXX=$(CXX)' 'LD=$(LD_DYNAMIC)' \
+MAKE_DYNAMIC = $(MAKE) 'MAKE=$(MAKE)' 'CXX=$(CXX)' 'LD=$(LD_DYNAMIC)' 'INCLUDES=$(INCLUDES)' \
'CCDEPMODE=$(CCDEPMODE)' 'BRANCH=$(BRANCH)' 'COMMIT=$(COMMIT_SHORT)' 'BUILDTS=$(BUILDTS)' 'VERSION=$(VERSION)' \
-'STRIP=$(STRIP)' 'CFLGS=$(CFLGS) -DBIN_TYPE_DYNAMIC' \
+'STRIP=$(STRIP)' 'CFLGS=$(CFLGS) -DBIN_TYPE_DYNAMIC' 'STRINGFIX=$(STRINGFIX)' \
'LIBS=$(LIBS)' 'EGGEXEC=$(BINEXEC)' 'EGGBUILD=(wraith)'
-MAKE_DEBUG = $(MAKE) 'MAKE=$(MAKE)' 'CXX=$(CCDEBUG)' 'LD=$(LD_DEBUG) -g' \
+MAKE_DEBUG = $(MAKE) 'MAKE=$(MAKE)' 'CXX=$(CCDEBUG)' 'LD=$(LD_DEBUG) -g' 'INCLUDES=$(INCLUDES)' \
'CCDEPMODE=$(CCDEPMODE)' 'BRANCH=$(BRANCH)' 'COMMIT=$(COMMIT_SHORT)' 'BUILDTS=$(BUILDTS)' 'VERSION=$(VERSION)' \
-'STRIP=touch' 'CFLGS=$(CFLGS) $(DEBCXXFLAGS) -DBIN_TYPE_DYNAMIC' \
+'STRIP=touch' 'CFLGS=$(CFLGS) $(DEBCXXFLAGS) -DBIN_TYPE_DYNAMIC' 'STRINGFIX=' \
'LIBS=$(LIBS)' 'EGGEXEC=$(BINEXEC)' 'EGGBUILD=(debug)'
-MAKE_UTILS = $(MAKE) 'MAKE=$(MAKE)' 'CXX=$(CCDEBUG)' 'STRIP=touch' \
+MAKE_UTILS = $(MAKE) 'MAKE=$(MAKE)' 'CXX=$(CCDEBUG)' 'STRIP=touch' 'INCLUDES=$(INCLUDES)' \
'CCDEPMODE=$(CCDEPMODE)' \
'CFLGS=$(CFLGS) $(DEBCXXFLAGS)' 'LIBS=$(LIBS)' 'LD=$(LD_DEBUG) -g'
-MAKE_UTILS_NR = $(MAKE) 'CXX=$(CXX)' 'STRIP=touch' \
+MAKE_UTILS_NR = $(MAKE) 'CXX=$(CXX)' 'STRIP=touch' 'INCLUDES=$(INCLUDES)' \
'CCDEPMODE=$(CCDEPMODE)' \
'CFLGS=$(CFLGS) $(DEBCXXFLAGS)' 'LIBS=$(LIBS)' 'LD=$(LD) -g'
< at >< at > -89,7 +92,7 < at >< at > all: dynamic
test:
cleanutils:
-< at >rm -f src/stringfix< at >EXEEXT< at > src/sorthelp< at >EXEEXT< at > src/makehelp< at >EXEEXT< at > src/makeres< at >EXEEXT< at > src/makeset< at >EXEEXT< at >
+< at >rm -f $(STRINGFIX) src/sorthelp< at >EXEEXT< at > src/makehelp< at >EXEEXT< at > src/makeres< at >EXEEXT< at > src/makeset< at >EXEEXT< at >
clean: cleanutils
+< at >cd src && $(MAKE) clean
< at >< at > -97,14 +100,14 < at >< at > clean: cleanutils
+< at >cd src/crypto && $(MAKE) clean
+< at >cd src/mod && $(MAKE) distclean
-+< at >cd lib && $(MAKE) clean
-< at >rm -f $(BINEXEC) stamp.* *~ src/*~ configure.temp .mangled
+< at >rm -f $(BINEXEC) build/stamp.* *~ src/*~ configure.temp .mangled stamp.*
< at >rm -f src/help.h src/response.h src/responses.h utctime< at >EXEEXT< at > ts< at >EXEEXT< at >
distclean: clean
< at >rm -rf *-$(VERSION)/ autom4te.cache/ autoscan.log configure.scan
-< at >rm -rf src/.deps/ src/compat/.deps/ src/strucutres/.deps/ src/mod/*.mod/.deps/ src/crypto/.deps
+< at >rm -rf src/.deps/ src/compat/.deps/ src/strucutres/.deps/ src/mod/*.mod/.deps/ src/crypto/.deps src/.defs/
-+< at >cd lib && $(MAKE) distclean
-< at >rm -f $(STATICMAKEFILES) $(CONFIGFILES)
+< at >rm -f $(STATICMAKEFILES) $(CONFIGFILES) config.h config.log config.status config.cache
distrib: clean
< at >< at > -149,12 +152,11 < at >< at > sort: sorthelp
< at >(src/sorthelp< at >EXEEXT< at > $(HELPFILE) $(HELPFILE) || (cp -f help.txt~ $(HELPFILE); echo "Sort failed, restoring backup."))
< at >rm -f help.txt~
-help: makehelp stringfix
-< at >src/makehelp< at >EXEEXT< at > $(HELPFILE) src/help.h.tmp~
+help: makehelp
+< at >src/makehelp< at >EXEEXT< at > $(HELPFILE) src/help.h~
< at >(if [ ! -f src/help.h ]; then \
touch src/help.h; \
fi)
-< at >src/stringfix< at >EXEEXT< at > src/help.h.tmp~ src/help.h~ 1
< at >(if test "x`$(DIFF) -qurN src/help.h~ src/help.h`" != "x"; then \
cp -f src/help.h~ src/help.h; \
fi)
< at >< at > -184,7 +186,7 < at >< at > res: makeres
cp -f src/responses.h~ src/responses.h; \
fi)
-stringfix: src/stringfix.c config.h
+stringfix: src/stringfix.c src/config.h
+< at >cd src && ${MAKE_UTILS} stringfix
makeres: src/makeres.c
< at >< at > -204,30 +206,30 < at >< at > utils: stringfix makehelp
crypto:
+< at >cd src/crypto && ${MAKE_UTILS} crypto
-general: help res set
+general: help res set stringfix
.NOTPARALLEL: checkclean.static checkclean.dynamic checkclean.debug
checkclean.static:
-< at >(if test -f stamp.dynamic -o -f stamp.debug; then \
+< at >(if test -f build/stamp.dynamic -o -f build/stamp.debug; then \
echo "[*] Cleaning up alternate build"; \
$(MAKE) MAKEFLAGS=-s clean; \
fi)
-< at >touch stamp.static
+< at >touch build/stamp.static
checkclean.dynamic:
-< at >(if test -f stamp.static -o -f stamp.debug; then \
+< at >(if test -f build/stamp.static -o -f build/stamp.debug; then \
echo "[*] Cleaning up alternate build"; \
$(MAKE) MAKEFLAGS=-s clean; \
fi)
-< at >touch stamp.dynamic
+< at >touch build/stamp.dynamic
checkclean.debug:
-< at >(if test -f stamp.static -o -f stamp.dynamic; then \
+< at >(if test -f build/stamp.static -o -f build/stamp.dynamic; then \
echo "[*] Cleaning up alternate build"; \
$(MAKE) MAKEFLAGS=-s clean; \
fi)
-< at >touch stamp.debug
+< at >touch build/stamp.debug
lib:
+< at >cd lib && $(MAKE)
diff --git a/README b/README
index e08fdeb..2b0a67c 100644
--- a/README
+++ b/README
< at >< at > -5,10 +5,13 < at >< at > __ _ ______________ |__|/ |_| |__
\/\_/ |__| (____ /__||__| |___| /
\/ \/
http://wraith.botpack.net
+ < at >wraithbotpack
-Wraith is an IRC bot written purely in C/C++. It has been in development since late 2003.
-It is based on Eggdrop 1.6.12 but has since evolved into something much different at its
-core. TCL and loadable modules are currently not supported.
+Wraith is an IRC channel management bot written purely in C/C++.
+It has been in development since late 2003. It is based on
+Eggdrop 1.6.12 but has since evolved into something much
+different at its core. TCL and loadable modules are currently
+not supported.
Wraith aims to be a secure and easy to setup and manage botnet.
A botnet can be setup in a matter of minutes and updated later with 1 command.
< at >< at > -24,16 +27,13 < at >< at > Git: git://github.com/wraith/wraith.git
See git for a list of Contributors: git shortlog -sen master
-You can also follow us on twitter: http://twitter.com/wraithbotpack
-
Support:
- How To Contribute: http://wraith.botpack.net/wiki/Contributing
- Getting Started: http://wraith.botpack.net/wiki/GettingStarted
- FAQ: http://wraith.botpack.net/wiki/FrequentlyAskedQuestions
- Documentation Index: http://wraith.botpack.net/wiki/Documentation
- Bugs can be reported at: http://wraith.botpack.net/newticket
- Bugs can be looked up by #, i.e., '#24' in url: http://wraith.botpack.net/ticket/24
- #wraith < at > EFnet
+* How To Contribute: http://wraith.botpack.net/wiki/Contributing
+* Getting Started: http://wraith.botpack.net/wiki/GettingStarted
+* FAQ: http://wraith.botpack.net/wiki/FrequentlyAskedQuestions
+* Documentation Index: http://wraith.botpack.net/wiki/Documentation
+* Issues can be reported at: https://github.com/wraith/wraith/issues
+* #wraith < at > EFnet
Please support wraith by signing up for a shell at http://www.xzibition.com (coupon 'wraith' for 30% off)
diff --git a/autotools/Makefile b/autotools/Makefile
deleted file mode 100755
index 7c78797..0000000
--- a/autotools/Makefile
+++ /dev/null
< at >< at > -1,35 +0,0 < at >< at >
-
-all: clean aclocal autoheader autoconf clean_again
-
-
-aclocal:
-< at >rm -rf aclocal.m4
-aclocal -I includes/
-
-autoheader:
-< at >rm -rf ../config.h.in
-< at >echo "Autoheader..."
-< at >autoheader
-< at >mv -f config.h.in ../config.h.in
-< at >ls -al ../config.h.in
-
-autoconf:
-< at >rm -rf ../configure
-< at >echo "Autoconf...."
-< at >autoconf
-< at >echo "Fixing configure for cache_file"
-< at >(if ! sed configure -e "s/^cache_file=\/dev\/null/cache_file=\.\/config.cache/" \
--e "s/&& echo \"updating cache .cache_file\"//" > ../configure; then \
-cp configure ../configure; \
-rm configure; \
-fi)
-< at >chmod 700 ../configure
-< at >ls -al ../configure
-
-clean:
-< at >echo "Cleaning..."
-< at >rm -rf autom4te.cache/ configure config.h.in aclocal.m4
-
-clean_again:
-< at >echo "Cleaning..."
-< at >rm -rf autom4te.cache/ configure config.h.in aclocal.m4
diff --git a/autotools/depcomp b/autotools/depcomp
deleted file mode 100755
index 55d653b..0000000
--- a/autotools/depcomp
+++ /dev/null
< at >< at > -1,105 +0,0 < at >< at >
-#! /bin/sh
-
-# depcomp - compile a program generating dependencies as side-effects
-# Copyright 1999, 2000 Free Software Foundation, Inc.
-
-if test -z "$depmode" || test -z "$source" || test -z "$object"; then
- echo "depcomp: Variables source, object and depmode must be set" 1>&2
- exit 1
-fi
-
-if test -z "$depfile"; then
- base=`echo "$object" | sed -e 's,^.*/,,' -e 's,\.\([^.]*\)$,.P\1,'`
- dir=`echo "$object" | sed 's,/.*$,/,'`
- if test "$dir" = "$object"; then
- dir=
- fi
- depfile="$dir.deps/$base"
-fi
-
-tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
-
-rm -f "$tmpdepfile"
-
-# Some modes work just like other modes, but use different flags. We
-# parameterize here, but still list the modes in the big case below,
-# to make depend.m4 easier to write. Note that we *cannot* use a case
-# here, because this file can only contain one case statement.
-
-case "$depmode" in
-gcc3)
-## gcc 3 implements dependency tracking that does exactly what
-## we want. Yay! Note: for some reason libtool 1.4 doesn't like
-## it if -MD -MP comes after the -MF stuff. Hmm.
- if test -z "$MM"; then
- "$< at >" -MT "$object" -MD -MP -MF "$tmpdepfile"
- else
- "$< at >" -MM "$object" -MD -MP -MF "$tmpdepfile"
- fi
- stat=$?
- if test $stat -eq 0; then :
- else
- rm -f "$tmpdepfile"
- exit $stat
- fi
- mv "$tmpdepfile" "$depfile"
- ;;
-
-gcc)
-## There are various ways to get dependency output from gcc. Here's
-## why we pick this rather obscure method:
-## - Don't want to use -MD because we'd like the dependencies to end
-## up in a subdir. Having to rename by hand is ugly.
-## (We might end up doing this anyway to support other compilers.)
-## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-## -MM, not -M (despite what the docs say).
-## - Using -M directly means running the compiler twice (even worse
-## than renaming).
- if test -z "$gccflag"; then
- gccflag=-MD,
- fi
- "$< at >" -Wp,"$gccflag$tmpdepfile"
- stat=$?
- if test $stat -eq 0; then :
- else
- rm -f "$tmpdepfile"
- exit $stat
- fi
- rm -f "$depfile"
- echo "$object : \\" > "$depfile"
- alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-## The second -e expression handles DOS-style file names with drive letters.
- sed -e 's/^[^:]*: / /' \
- -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
-## This next piece of magic avoids the `deleted header file' problem.
-## The problem is that when a header file which appears in a .P file
-## is deleted, the dependency causes make to die (because there is
-## typically no way to rebuild the header). We avoid this by adding
-## dummy dependencies for each header file. Too bad gcc doesn't do
-## this for us directly.
- tr ' ' '
-' < "$tmpdepfile" |
-## Some versions of gcc put a space before the `:'. On the theory
-## that the space means something, we add a space to the output as
-## well.
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly. Breaking it into two sed invocations is a workaround.
- sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
- rm -f "$tmpdepfile"
- ;;
-
-#nosideeffect)
- # This comment above is used by automake to tell side-effect
- # dependency tracking mechanisms from slower ones.
-
-none)
- exec "$< at >"
- ;;
-
-*)
- echo "Unknown depmode $depmode" 1>&2
- exit 1
- ;;
-esac
-
-exit 0
diff --git a/autotools/.gitignore b/build/autotools/.gitignore
similarity index 100%
rename from autotools/.gitignore
rename to build/autotools/.gitignore
diff --git a/build/autotools/Makefile b/build/autotools/Makefile
new file mode 100755
index 0000000..23a86ea
--- /dev/null
+++ b/build/autotools/Makefile
< at >< at > -0,0 +1,40 < at >< at >
+
+all: clean aclocal autoheader autoconf clean_again
+
+
+aclocal:
+< at >rm -rf aclocal.m4
+< at >mkdir src
+aclocal -I includes/
+
+autoheader:
+< at >rm -f ../../src/config.h.in
+< at >echo "Autoheader..."
+< at >autoheader
+< at >mv -f src/config.h.in ../../src/config.h.in
+< at >ls -al ../../src/config.h.in
+
+autoconf:
+< at >rm -rf ../../configure
+< at >echo "Autoconf...."
+< at >autoconf
+< at >echo "Fixing configure temp paths"
+< at >(if ! sed configure \
+ -e 's:config\.log:build/config.log:g' \
+ -e 's:config\.status:build/config.status:g' \
+ -e 's:confdefs\.h:build/confdefs.h:g' \
+ > ../../configure; then \
+ echo "FAILED TO FIX configure" >&2; \
+ cp configure ../../configure; \
+ rm configure; \
+fi)
+< at >chmod 700 ../../configure
+< at >ls -al ../../configure
+
+clean:
+< at >echo "Cleaning..."
+< at >rm -rf autom4te.cache/ configure aclocal.m4 src/
+
+clean_again:
+< at >echo "Cleaning..."
+< at >rm -rf autom4te.cache/ configure aclocal.m4 src/
diff --git a/autotools/README b/build/autotools/README
similarity index 100%
rename from autotools/README
rename to build/autotools/README
diff --git a/autotools/configure.ac b/build/autotools/configure.ac
similarity index 63%
rename from autotools/configure.ac
rename to build/autotools/configure.ac
index 85bc837..d0ef1db 100755
--- a/autotools/configure.ac
+++ b/build/autotools/configure.ac
< at >< at > -5,8 +5,8 < at >< at > dnl
AC_PREREQ(2.59)
AC_INIT([wraith],[],[wraith< at >botpack.net])
AC_CONFIG_SRCDIR(src/eggdrop.h)
-AC_CONFIG_HEADER(config.h)
-AC_COPYRIGHT([Copyright (c) 2003 - 2010 Bryan Drewery])
+AC_CONFIG_HEADER(src/config.h)
+AC_COPYRIGHT([Copyright (c) Bryan Drewery])
AC_REVISION($Revision$)
EGG_SAVE_PARAMETERS
< at >< at > -15,7 +15,7 < at >< at > EGG_SAVE_PARAMETERS
dnl Search for newer gcc versions before older
#AC_REQUIRE_CPP
AC_LANG(C++)
-AC_PROG_CXX([g++45 g++-4.5 g++-4.4 g++-4.4.1 g++-4.4.2 g++-4.4.0 g++44 g++4 g++-3.3 g++33 g++-3 g++3 g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC])
+AC_PROG_CXX([g++47 g++-4.7 g++46 g++-4.6 g++45 g++-4.5 g++-4.4 g++-4.4.1 g++-4.4.2 g++-4.4.0 g++44 g++4 eg++ g++-3.3 g++33 g++-3 g++3 g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC])
dnl AC_PROG_CC([gcc34 gcc-3.4 gcc33 gcc3 gcc-3.3 gcc cc c1])
EGG_CHECK_CC
< at >< at > -38,6 +38,7 < at >< at > AC_CACHE_SAVE
# Checks for programs
AC_PROG_MAKE_SET
+AC_PROG_SED
EGG_PROG_HEAD_1
EGG_PROG_AWK
EGG_PROG_BASENAME
< at >< at > -79,7 +80,7 < at >< at > AC_HEADER_STAT
#checkpoint
AC_CACHE_SAVE
AC_CHECK_HEADERS([stdarg.h std_arg.h arpa/inet.h fcntl.h limits.h locale.h netdb.h netinet/in.h])
-AC_CHECK_HEADERS([sys/file.h sys/ioctl.h sys/param.h sys/socket.h wchar.h sys/ptrace.h paths.h])
+AC_CHECK_HEADERS([sys/file.h sys/ioctl.h sys/param.h sys/socket.h wchar.h sys/ptrace.h paths.h sys/prctl.h])
#checkpoint
AC_CACHE_SAVE
< at >< at > -88,6 +89,60 < at >< at > AC_CACHE_SAVE
#EGG_CHECK_ZLIB
CHECK_SSL
+# TCL checks
+
+# Tcl version to recommend if no Tcl is found, and the site where it can be
+# found for download.
+tclrecommendver="8.5.X"
+tclrecommendsite="ftp://tcl.activestate.com/pub/tcl/tcl8_5/"
+
+# Tcl library filename prefixes, suffixes, and search paths.
+tcllibnames="tcl8.5 tcl85 tcl8.4 tcl84 tcl8.3 tcl83 tcl8.2 tcl82 \
+ tcl8.1 tcl81 tcl8.0 tcl80 tcl tcl7.6 tcl76 tcl7.5 tcl75 \
+ tcl7.4 tcl74 tcl7.3 tcl73 tcl7.2 tcl72 tcl7.1 tcl71 \
+ tcl7.0 tcl70"
+
+tcllibextensions=".so .so.1 .so.1.0 .so.1.1 .so.1.2 .dll .dylib .sl .a"
+
+tcllibpaths="$HOME/lib $HOME/tcl/lib \
+ /usr/local/lib /usr/lib /lib /lib64 /usr/lib64 \
+ /usr/local/lib/tcl8.5 /usr/lib/tcl8.5 \
+ /usr/local/lib/tcl8.4 /usr/lib/tcl8.4 \
+ /usr/local/lib/tcl8.3 /usr/lib/tcl8.3 \
+ /usr/local/pkgs/tcl/lib /sys/lib /usr/pkg/lib \
+ /usr/i486-linuxaout/lib /beos/system/lib $HOME"
+
+# Tcl header filenames and search paths.
+tclheadernames="tcl.h"
+tclheaderpaths="$HOME/include $HOME/tcl/include \
+ /usr/local/include /usr/include \
+ /usr/local/include/tcl8.5 /usr/include/tcl8.5 \
+ /usr/local/include/tcl8.4 /usr/include/tcl8.4 \
+ /usr/local/include/tcl8.3 /usr/include/tcl8.3 \
+ /usr/local/pkgs/tcl/include /sys/include \
+ /usr/pkg/lib /beos/system/include /beos/devel/include $HOME"
+
+
+# Misc Tcl checks.
+EGG_TCL_OPTIONS
+EGG_TCL_ENV
+EGG_TCL_WITH_TCLLIB
+EGG_TCL_WITH_TCLINC
+EGG_TCL_FIND_LIBRARY
+EGG_TCL_FIND_HEADER
+EGG_TCL_CHECK_LIBRARY
+EGG_TCL_CHECK_HEADER
+EGG_TCL_DETECT_CHANGE
+EGG_TCL_CHECK_VERSION
+EGG_TCL_CHECK_PRE70
+EGG_TCL_TESTLIBS
+EGG_TCL_CHECK_FREE
+#EGG_TCL_CHECK_GETCURRENTTHREAD
+#EGG_TCL_CHECK_GETTHREADDATA
+EGG_TCL_CHECK_SETNOTIFIER
+EGG_TCL_LIB_REQS
+
+AC_CACHE_SAVE
#AC_SUBST(ZLIB)dnl
< at >< at > -108,13 +163,19 < at >< at > AC_C_CHAR_UNSIGNED
#checkpoint
AC_CACHE_SAVE
-AC_CHECK_SIZEOF(short, 0)
-AC_CHECK_SIZEOF(int, 0)
-AC_CHECK_SIZEOF(long, 0)
-AC_CHECK_SIZEOF(long long,0)
-AC_CHECK_SIZEOF(size_t, 0)
-AC_CHECK_SIZEOF(ptrdiff_t, 0)
-AC_CHECK_SIZEOF(time_t, 0)
+# Checks for typedefs, structures, and compiler characteristics
+AC_TYPE_PID_T
+AC_TYPE_SIZE_T
+AC_TYPE_UID_T
+AC_TYPE_LONG_LONG_INT
+AC_TYPE_INT8_T
+AC_TYPE_UINT8_T
+AC_TYPE_INT16_T
+AC_TYPE_UINT16_T
+AC_TYPE_INT32_T
+AC_TYPE_UINT32_T
+AC_TYPE_INT64_T
+AC_TYPE_UINT64_T
AC_STRUCT_TIMEZONE
< at >< at > -159,7 +220,7 < at >< at > EGG_SUBST_VERSION
EGG_SUBST_MOD_UPDIR
DO_DEPS
-AC_CONFIG_FILES([Makefile lib/Makefile src/Makefile src/compat/Makefile src/crypto/Makefile src/mod/Makefile src/buildinfo.h])
+AC_CONFIG_FILES([Makefile lib/Makefile src/Makefile src/compat/Makefile src/crypto/Makefile src/mod/Makefile src/buildinfo.h src/mod/mod.mk])
AC_OUTPUT
AH_TEMPLATE(HAVE_ST_MTIM, [Define to 1 if your struct stat has an st_mtim member])
< at >< at > -199,6 +260,13 < at >< at > AH_BOTTOM([/*
# endif
# endif
#endif
+
+/* TCL sanity check */
+#ifdef USE_SCRIPT_TCL
+# ifndef HAVE_LIBTCL
+# undef USE_SCRIPT_TCL
+# endif
+#endif
])
[
< at >< at > -217,13 +285,21 < at >< at > if [ "$GIT_REQUIRED" = "1" ]; then
fi
]
-echo ""
-echo ""
-echo "------------ Configuring BDLIB ------------"
[
if test -d .git; then
git submodule init
git submodule update
fi
]
-test -f lib/bdlib/configure && cd lib/bdlib && MAKEJOBS="$MAKEJOBS" ./configure
+
+CXX="$CXX" TCL_INCLUDES="$TCL_INCLUDES" SSL_INCLUDES="$SSL_INCLUDES" SED="$SED" src/generate_defs.sh
+[
+if [ $? -ne 0 ]; then
+ exit 1
+fi
+]
+
+echo ""
+echo ""
+echo "------------ Configuring BDLIB ------------"
+test -f lib/bdlib/configure && cd lib/bdlib && CXX="$CXX" MAKEJOBS="$MAKEJOBS" ./configure
diff --git a/build/autotools/depcomp b/build/autotools/depcomp
new file mode 100755
index 0000000..df8eea7
--- /dev/null
+++ b/build/autotools/depcomp
< at >< at > -0,0 +1,630 < at >< at >
+#! /bin/sh
+# depcomp - compile a program generating dependencies as side-effects
+
+scriptversion=2009-04-28.21; # UTC
+
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free
+# Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Originally written by Alexandre Oliva <oliva< at >dcc.unicamp.br>.
+
+case $1 in
+ '')
+ echo "$0: No command. Try \`$0 --help' for more information." 1>&2
+ exit 1;
+ ;;
+ -h | --h*)
+ cat <<\EOF
+Usage: depcomp [--help] [--version] PROGRAM [ARGS]
+
+Run PROGRAMS ARGS to compile a file, generating dependencies
+as side-effects.
+
+Environment variables:
+ depmode Dependency tracking mode.
+ source Source file read by `PROGRAMS ARGS'.
+ object Object file output by `PROGRAMS ARGS'.
+ DEPDIR directory where to store dependencies.
+ depfile Dependency file to output.
+ tmpdepfile Temporary file to use when outputing dependencies.
+ libtool Whether libtool is used (yes/no).
+
+Report bugs to <bug-automake< at >gnu.org>.
+EOF
+ exit $?
+ ;;
+ -v | --v*)
+ echo "depcomp $scriptversion"
+ exit $?
+ ;;
+esac
+
+if test -z "$depmode" || test -z "$source" || test -z "$object"; then
+ echo "depcomp: Variables source, object and depmode must be set" 1>&2
+ exit 1
+fi
+
+# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
+depfile=${depfile-`echo "$object" |
+ sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
+tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
+
+rm -f "$tmpdepfile"
+
+# Some modes work just like other modes, but use different flags. We
+# parameterize here, but still list the modes in the big case below,
+# to make depend.m4 easier to write. Note that we *cannot* use a case
+# here, because this file can only contain one case statement.
+if test "$depmode" = hp; then
+ # HP compiler uses -M and no extra arg.
+ gccflag=-M
+ depmode=gcc
+fi
+
+if test "$depmode" = dashXmstdout; then
+ # This is just like dashmstdout with a different argument.
+ dashmflag=-xM
+ depmode=dashmstdout
+fi
+
+cygpath_u="cygpath -u -f -"
+if test "$depmode" = msvcmsys; then
+ # This is just like msvisualcpp but w/o cygpath translation.
+ # Just convert the backslash-escaped backslashes to single forward
+ # slashes to satisfy depend.m4
+ cygpath_u="sed s,\\\\\\\\,/,g"
+ depmode=msvisualcpp
+fi
+
+case "$depmode" in
+gcc3)
+## gcc 3 implements dependency tracking that does exactly what
+## we want. Yay! Note: for some reason libtool 1.4 doesn't like
+## it if -MD -MP comes after the -MF stuff. Hmm.
+## Unfortunately, FreeBSD c89 acceptance of flags depends upon
+## the command line argument order; so add the flags where they
+## appear in depend2.am. Note that the slowdown incurred here
+## affects only configure: in makefiles, %FASTDEP% shortcuts this.
+ for arg
+ do
+ case $arg in
+ -c) set fnord "$< at >" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
+ *) set fnord "$< at >" "$arg" ;;
+ esac
+ shift # fnord
+ shift # $arg
+ done
+ "$< at >"
+ stat=$?
+ if test $stat -eq 0; then :
+ else
+ rm -f "$tmpdepfile"
+ exit $stat
+ fi
+ mv "$tmpdepfile" "$depfile"
+ ;;
+
+gcc)
+## There are various ways to get dependency output from gcc. Here's
+## why we pick this rather obscure method:
+## - Don't want to use -MD because we'd like the dependencies to end
+## up in a subdir. Having to rename by hand is ugly.
+## (We might end up doing this anyway to support other compilers.)
+## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
+## -MM, not -M (despite what the docs say).
+## - Using -M directly means running the compiler twice (even worse
+## than renaming).
+ if test -z "$gccflag"; then
+ gccflag=-MD,
+ fi
+ "$< at >" -Wp,"$gccflag$tmpdepfile"
+ stat=$?
+ if test $stat -eq 0; then :
+ else
+ rm -f "$tmpdepfile"
+ exit $stat
+ fi
+ rm -f "$depfile"
+ echo "$object : \\" > "$depfile"
+ alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
+## The second -e expression handles DOS-style file names with drive letters.
+ sed -e 's/^[^:]*: / /' \
+ -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
+## This next piece of magic avoids the `deleted header file' problem.
+## The problem is that when a header file which appears in a .P file
+## is deleted, the dependency causes make to die (because there is
+## typically no way to rebuild the header). We avoid this by adding
+## dummy dependencies for each header file. Too bad gcc doesn't do
+## this for us directly.
+ tr ' ' '
+' < "$tmpdepfile" |
+## Some versions of gcc put a space before the `:'. On the theory
+## that the space means something, we add a space to the output as
+## well.
+## Some versions of the HPUX 10.20 sed can't process this invocation
+## correctly. Breaking it into two sed invocations is a workaround.
+ sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+ rm -f "$tmpdepfile"
+ ;;
+
+hp)
+ # This case exists only to let depend.m4 do its work. It works by
+ # looking at the text of this script. This case will never be run,
+ # since it is checked for above.
+ exit 1
+ ;;
+
+sgi)
+ if test "$libtool" = yes; then
+ "$< at >" "-Wp,-MDupdate,$tmpdepfile"
+ else
+ "$< at >" -MDupdate "$tmpdepfile"
+ fi
+ stat=$?
+ if test $stat -eq 0; then :
+ else
+ rm -f "$tmpdepfile"
+ exit $stat
+ fi
+ rm -f "$depfile"
+
+ if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files
+ echo "$object : \\" > "$depfile"
+
+ # Clip off the initial element (the dependent). Don't try to be
+ # clever and replace this with sed code, as IRIX sed won't handle
+ # lines with more than a fixed number of characters (4096 in
+ # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines;
+ # the IRIX cc adds comments like `#:fec' to the end of the
+ # dependency line.
+ tr ' ' '
+' < "$tmpdepfile" \
+ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
+ tr '
+' ' ' >> "$depfile"
+ echo >> "$depfile"
+
+ # The second pass generates a dummy entry for each header file.
+ tr ' ' '
+' < "$tmpdepfile" \
+ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
+ >> "$depfile"
+ else
+ # The sourcefile does not contain any dependencies, so just
+ # store a dummy comment line, to avoid errors with the Makefile
+ # "include basename.Plo" scheme.
+ echo "#dummy" > "$depfile"
+ fi
+ rm -f "$tmpdepfile"
+ ;;
+
+aix)
+ # The C for AIX Compiler uses -M and outputs the dependencies
+ # in a .u file. In older versions, this file always lives in the
+ # current directory. Also, the AIX compiler puts `$object:' at the
+ # start of each line; $object doesn't have directory information.
+ # Version 6 uses the directory in both cases.
+ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+ test "x$dir" = "x$object" && dir=
+ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+ if test "$libtool" = yes; then
+ tmpdepfile1=$dir$base.u
+ tmpdepfile2=$base.u
+ tmpdepfile3=$dir.libs/$base.u
+ "$< at >" -Wc,-M
+ else
+ tmpdepfile1=$dir$base.u
+ tmpdepfile2=$dir$base.u
+ tmpdepfile3=$dir$base.u
+ "$< at >" -M
+ fi
+ stat=$?
+
+ if test $stat -eq 0; then :
+ else
+ rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+ exit $stat
+ fi
+
+ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+ do
+ test -f "$tmpdepfile" && break
+ done
+ if test -f "$tmpdepfile"; then
+ # Each line is of the form `foo.o: dependent.h'.
+ # Do two passes, one to just change these to
+ # `$object: dependent.h' and one to simply `dependent.h:'.
+ sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
+ # That's a tab and a space in the [].
+ sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+ else
+ # The sourcefile does not contain any dependencies, so just
+ # store a dummy comment line, to avoid errors with the Makefile
+ # "include basename.Plo" scheme.
+ echo "#dummy" > "$depfile"
+ fi
+ rm -f "$tmpdepfile"
+ ;;
+
+icc)
+ # Intel's C compiler understands `-MD -MF file'. However on
+ # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
+ # ICC 7.0 will fill foo.d with something like
+ # foo.o: sub/foo.c
+ # foo.o: sub/foo.h
+ # which is wrong. We want:
+ # sub/foo.o: sub/foo.c
+ # sub/foo.o: sub/foo.h
+ # sub/foo.c:
+ # sub/foo.h:
+ # ICC 7.1 will output
+ # foo.o: sub/foo.c sub/foo.h
+ # and will wrap long lines using \ :
+ # foo.o: sub/foo.c ... \
+ # sub/foo.h ... \
+ # ...
+
+ "$< at >" -MD -MF "$tmpdepfile"
+ stat=$?
+ if test $stat -eq 0; then :
+ else
+ rm -f "$tmpdepfile"
+ exit $stat
+ fi
+ rm -f "$depfile"
+ # Each line is of the form `foo.o: dependent.h',
+ # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
+ # Do two passes, one to just change these to
+ # `$object: dependent.h' and one to simply `dependent.h:'.
+ sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
+ # Some versions of the HPUX 10.20 sed can't process this invocation
+ # correctly. Breaking it into two sed invocations is a workaround.
+ sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
+ sed -e 's/$/ :/' >> "$depfile"
+ rm -f "$tmpdepfile"
+ ;;
+
+hp2)
+ # The "hp" stanza above does not work with aCC (C++) and HP's ia64
+ # compilers, which have integrated preprocessors. The correct option
+ # to use with these is +Maked; it writes dependencies to a file named
+ # 'foo.d', which lands next to the object file, wherever that
+ # happens to be.
+ # Much of this is similar to the tru64 case; see comments there.
+ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+ test "x$dir" = "x$object" && dir=
+ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+ if test "$libtool" = yes; then
+ tmpdepfile1=$dir$base.d
+ tmpdepfile2=$dir.libs/$base.d
+ "$< at >" -Wc,+Maked
+ else
+ tmpdepfile1=$dir$base.d
+ tmpdepfile2=$dir$base.d
+ "$< at >" +Maked
+ fi
+ stat=$?
+ if test $stat -eq 0; then :
+ else
+ rm -f "$tmpdepfile1" "$tmpdepfile2"
+ exit $stat
+ fi
+
+ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
+ do
+ test -f "$tmpdepfile" && break
+ done
+ if test -f "$tmpdepfile"; then
+ sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
+ # Add `dependent.h:' lines.
+ sed -ne '2,${
+ s/^ *//
+ s/ \\*$//
+ s/$/:/
+ p
+ }' "$tmpdepfile" >> "$depfile"
+ else
+ echo "#dummy" > "$depfile"
+ fi
+ rm -f "$tmpdepfile" "$tmpdepfile2"
+ ;;
+
+tru64)
+ # The Tru64 compiler uses -MD to generate dependencies as a side
+ # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
+ # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
+ # dependencies in `foo.d' instead, so we check for that too.
+ # Subdirectories are respected.
+ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+ test "x$dir" = "x$object" && dir=
+ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+
+ if test "$libtool" = yes; then
+ # With Tru64 cc, shared objects can also be used to make a
+ # static library. This mechanism is used in libtool 1.4 series to
+ # handle both shared and static libraries in a single compilation.
+ # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
+ #
+ # With libtool 1.5 this exception was removed, and libtool now
+ # generates 2 separate objects for the 2 libraries. These two
+ # compilations output dependencies in $dir.libs/$base.o.d and
+ # in $dir$base.o.d. We have to check for both files, because
+ # one of the two compilations can be disabled. We should prefer
+ # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
+ # automatically cleaned when .libs/ is deleted, while ignoring
+ # the former would cause a distcleancheck panic.
+ tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4
+ tmpdepfile2=$dir$base.o.d # libtool 1.5
+ tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5
+ tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504
+ "$< at >" -Wc,-MD
+ else
+ tmpdepfile1=$dir$base.o.d
+ tmpdepfile2=$dir$base.d
+ tmpdepfile3=$dir$base.d
+ tmpdepfile4=$dir$base.d
+ "$< at >" -MD
+ fi
+
+ stat=$?
+ if test $stat -eq 0; then :
+ else
+ rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
+ exit $stat
+ fi
+
+ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
+ do
+ test -f "$tmpdepfile" && break
+ done
+ if test -f "$tmpdepfile"; then
+ sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
+ # That's a tab and a space in the [].
+ sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+ else
+ echo "#dummy" > "$depfile"
+ fi
+ rm -f "$tmpdepfile"
+ ;;
+
+#nosideeffect)
+ # This comment above is used by automake to tell side-effect
+ # dependency tracking mechanisms from slower ones.
+
+dashmstdout)
+ # Important note: in order to support this mode, a compiler *must*
+ # always write the preprocessed file to stdout, regardless of -o.
+ "$< at >" || exit $?
+
+ # Remove the call to Libtool.
+ if test "$libtool" = yes; then
+ while test "X$1" != 'X--mode=compile'; do
+ shift
+ done
+ shift
+ fi
+
+ # Remove `-o $object'.
+ IFS=" "
+ for arg
+ do
+ case $arg in
+ -o)
+ shift
+ ;;
+ $object)
+ shift
+ ;;
+ *)
+ set fnord "$< at >" "$arg"
+ shift # fnord
+ shift # $arg
+ ;;
+ esac
+ done
+
+ test -z "$dashmflag" && dashmflag=-M
+ # Require at least two characters before searching for `:'
+ # in the target name. This is to cope with DOS-style filenames:
+ # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
+ "$< at >" $dashmflag |
+ sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile"
+ rm -f "$depfile"
+ cat < "$tmpdepfile" > "$depfile"
+ tr ' ' '
+' < "$tmpdepfile" | \
+## Some versions of the HPUX 10.20 sed can't process this invocation
+## correctly. Breaking it into two sed invocations is a workaround.
+ sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+ rm -f "$tmpdepfile"
+ ;;
+
+dashXmstdout)
+ # This case only exists to satisfy depend.m4. It is never actually
+ # run, as this mode is specially recognized in the preamble.
+ exit 1
+ ;;
+
+makedepend)
+ "$< at >" || exit $?
+ # Remove any Libtool call
+ if test "$libtool" = yes; then
+ while test "X$1" != 'X--mode=compile'; do
+ shift
+ done
+ shift
+ fi
+ # X makedepend
+ shift
+ cleared=no eat=no
+ for arg
+ do
+ case $cleared in
+ no)
+ set ""; shift
+ cleared=yes ;;
+ esac
+ if test $eat = yes; then
+ eat=no
+ continue
+ fi
+ case "$arg" in
+ -D*|-I*)
+ set fnord "$< at >" "$arg"; shift ;;
+ # Strip any option that makedepend may not understand. Remove
+ # the object too, otherwise makedepend will parse it as a source file.
+ -arch)
+ eat=yes ;;
+ -*|$object)
+ ;;
+ *)
+ set fnord "$< at >" "$arg"; shift ;;
+ esac
+ done
+ obj_suffix=`echo "$object" | sed 's/^.*\././'`
+ touch "$tmpdepfile"
+ ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$< at >"
+ rm -f "$depfile"
+ cat < "$tmpdepfile" > "$depfile"
+ sed '1,2d' "$tmpdepfile" | tr ' ' '
+' | \
+## Some versions of the HPUX 10.20 sed can't process this invocation
+## correctly. Breaking it into two sed invocations is a workaround.
+ sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+ rm -f "$tmpdepfile" "$tmpdepfile".bak
+ ;;
+
+cpp)
+ # Important note: in order to support this mode, a compiler *must*
+ # always write the preprocessed file to stdout.
+ "$< at >" || exit $?
+
+ # Remove the call to Libtool.
+ if test "$libtool" = yes; then
+ while test "X$1" != 'X--mode=compile'; do
+ shift
+ done
+ shift
+ fi
+
+ # Remove `-o $object'.
+ IFS=" "
+ for arg
+ do
+ case $arg in
+ -o)
+ shift
+ ;;
+ $object)
+ shift
+ ;;
+ *)
+ set fnord "$< at >" "$arg"
+ shift # fnord
+ shift # $arg
+ ;;
+ esac
+ done
+
+ "$< at >" -E |
+ sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+ -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
+ sed '$ s: \\$::' > "$tmpdepfile"
+ rm -f "$depfile"
+ echo "$object : \\" > "$depfile"
+ cat < "$tmpdepfile" >> "$depfile"
+ sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
+ rm -f "$tmpdepfile"
+ ;;
+
+msvisualcpp)
+ # Important note: in order to support this mode, a compiler *must*
+ # always write the preprocessed file to stdout.
+ "$< at >" || exit $?
+
+ # Remove the call to Libtool.
+ if test "$libtool" = yes; then
+ while test "X$1" != 'X--mode=compile'; do
+ shift
+ done
+ shift
+ fi
+
+ IFS=" "
+ for arg
+ do
+ case "$arg" in
+ -o)
+ shift
+ ;;
+ $object)
+ shift
+ ;;
+ "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
+set fnord "$< at >"
+shift
+shift
+;;
+ *)
+set fnord "$< at >" "$arg"
+shift
+shift
+;;
+ esac
+ done
+ "$< at >" -E 2>/dev/null |
+ sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
+ rm -f "$depfile"
+ echo "$object : \\" > "$depfile"
+ sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1 \\:p' >> "$depfile"
+ echo "" >> "$depfile"
+ sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
+ rm -f "$tmpdepfile"
+ ;;
+
+msvcmsys)
+ # This case exists only to let depend.m4 do its work. It works by
+ # looking at the text of this script. This case will never be run,
+ # since it is checked for above.
+ exit 1
+ ;;
+
+none)
+ exec "$< at >"
+ ;;
+
+*)
+ echo "Unknown depmode $depmode" 1>&2
+ exit 1
+ ;;
+esac
+
+exit 0
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/autotools/includes/acinclude.m4 b/build/autotools/includes/acinclude.m4
similarity index 86%
rename from autotools/includes/acinclude.m4
rename to build/autotools/includes/acinclude.m4
index 709d258..1856708 100755
--- a/autotools/includes/acinclude.m4
+++ b/build/autotools/includes/acinclude.m4
< at >< at > -3,6 +3,65 < at >< at > dnl macros autoconf uses when building configure from configure.in
dnl
dnl
+AC_DEFUN([MY_ARG_WITH], [
+ AC_ARG_WITH(m4_translit([[$1]], [_], [-]),
+ [AS_HELP_STRING([--with-m4_translit([$1], [_], [-])],
+ [use $1 (default is $2)])],
+ [with_[]$1=$withval],
+ [with_[]$1=$2])
+])
+
+AC_DEFUN([MY_ARG_WITH_PATH], [
+ AC_ARG_WITH(m4_translit([[$1]], [_], [-]),
+ [AS_HELP_STRING([--with-m4_translit([$1], [_], [-])=PATH],
+ [$2])],
+ [with_[]$1_path=$withval],
+ [with_[]$1_path=$3])
+])
+
+AC_DEFUN([MY_ARG_ENABLE], [
+ AC_MSG_CHECKING([whether $2 is enabled])
+ AC_ARG_ENABLE(m4_translit([[$1]], [_], [-]),
+ [AS_HELP_STRING([--enable-m4_translit([$1], [_], [-])],
+ [enable $2 support])],
+ [
+ enable_[]$1=$enableval
+ AC_MSG_RESULT([$enableval])
+ AC_DEFINE(m4_translit([[USE_$1]], [a-z], [A-Z]), 1, [Define if you want $2 support])
+ ],
+ [
+ # default if not given is DISABLED
+ if test "x$enableval" = "x"; then
+ enableval="no"
+ fi
+ enable_[]$1=$enableval
+ AC_MSG_RESULT([$enableval])
+ ]
+ )
+])
+
+AC_DEFUN([MY_ARG_DISABLE], [
+ AC_MSG_CHECKING([whether $2 is enabled])
+ AC_ARG_ENABLE(m4_translit([[$1]], [_], [-]),
+ [AS_HELP_STRING([--disable-m4_translit([$1], [_], [-])],
+ [disable $2 support])],
+ [
+ enable_[]$1=$enableval
+ AC_MSG_RESULT([$enableval])
+ ],
+ [
+ # default if not given is ENABLED
+ if test "x$enableval" = "x"; then
+ enableval="yes"
+ fi
+ enable_[]$1=$enableval
+ AC_MSG_RESULT([$enableval])
+ AC_DEFINE(m4_translit([[USE_$1]], [a-z], [A-Z]), 1, [Define if you want $2 support])
+ ]
+ )
+])
+
+
dnl EGG_CHECK_CC()
dnl
AC_DEFUN([EGG_CHECK_CC],
< at >< at > -13,7 +72,7 < at >< at > then
configure: error:
This system does not appear to have a working C compiler.
- A working C compiler is required to compile Eggdrop.
+ A working C compiler is required to compile Wraith.
EOF
exit 1
< at >< at > -29,21 +88,7 < at >< at > dnl EGG_IPV6_OPTIONS()
dnl
AC_DEFUN([EGG_IPV6_OPTIONS],
[
-AC_MSG_CHECKING(whether or not you disabled IPv6 support)
-AC_ARG_ENABLE(ipv6, [AS_HELP_STRING([--disable-ipv6], [disable IPv6 support])],
-[ ac_cv_dipv6="yes"
- AC_MSG_RESULT(yes)
-],
-[ ac_cv_dipv6="no"
- if test "$egg_cv_ipv6_supported" = "no"; then
- ac_cv_dipv6="no"
- fi
- AC_MSG_RESULT($ac_cv_dipv6)
-])
-
-if test "$ac_cv_dipv6" = "no"; then
- AC_DEFINE(USE_IPV6, 1, [Define if you want ipv6 support])
-fi
+MY_ARG_DISABLE(ipv6, [IPv6])
])
< at >< at > -203,7 +248,7 < at >< at > then
configure: error:
This system seems to lack a working 'head -1' or 'head -n 1' command.
- A working 'head -1' (or equivalent) command is required to compile Eggdrop.
+ A working 'head -1' (or equivalent) command is required to compile Wraith.
EOF
exit 1
< at >< at > -226,7 +271,7 < at >< at > then
configure: error:
This system seems to lack a working 'awk' command.
- A working 'awk' command is required to compile Eggdrop.
+ A working 'awk' command is required to compile Wraith.
EOF
exit 1
< at >< at > -246,7 +291,7 < at >< at > then
configure: error:
This system seems to lack a working 'basename' command.
- A working 'basename' command is required to compile Eggdrop.
+ A working 'basename' command is required to compile Wraith.
EOF
exit 1
< at >< at > -460,16 +505,12 < at >< at > AC_DEFUN([CHECK_SSL],
dnl Adapted from Ratbox configure.ac
dnl OpenSSL support
AC_MSG_CHECKING(for path to OpenSSL)
-AC_ARG_WITH(openssl,
-[AS_HELP_STRING([--with-openssl=DIR],[Path to OpenSSL])],
-[cf_with_openssl=$withval],
-[cf_with_openssl="auto"]
-)
+MY_ARG_WITH_PATH(openssl, [Path to OpenSSL], [auto])
cf_openssl_basedir=""
-if test "$cf_with_openssl" != "auto"; then
+if test "$with_openssl_path" != "auto"; then
dnl Support for --with-openssl=/some/place
- cf_openssl_basedir="`echo ${cf_with_openssl} | sed 's/\/$//'`"
+ cf_openssl_basedir="`echo ${with_openssl_path} | sed 's/\/$//'`"
else
dnl Do the auto-probe here. Check some common directory paths.
for dirs in /usr/local/ssl /usr/pkg /usr/local /usr/local/openssl; do
< at >< at > -547,6 +588,7 < at >< at > LIBS="$save_LIBS"
AC_SUBST(SSL_INCLUDES)
AC_SUBST(SSL_LIBS)
+AC_DEFINE_UNQUOTED(EGG_SSL_EXT, 1, [Defines whether or not SSL is supported])dnl
])
dnl EGG_HEADER_STDC()
diff --git a/autotools/includes/depend.m4 b/build/autotools/includes/depend.m4
similarity index 97%
rename from autotools/includes/depend.m4
rename to build/autotools/includes/depend.m4
index b6f52d1..f9762db 100755
--- a/autotools/includes/depend.m4
+++ b/build/autotools/includes/depend.m4
< at >< at > -57,7 +57,6 < at >< at > for mf in $files; do
fi
fi
echo "include .deps/$base.Po" >> "$dirpart/.deps/includes"
- echo "_$base.c:" >> "$dirpart/.deps/includes"
done
done
])
diff --git a/build/autotools/includes/libtcl.m4 b/build/autotools/includes/libtcl.m4
new file mode 100644
index 0000000..12cdbc8
--- /dev/null
+++ b/build/autotools/includes/libtcl.m4
< at >< at > -0,0 +1,593 < at >< at >
+dnl libtcl.m4
+dnl macros autoconf uses when building configure from configure.in
+dnl These are taken from Eggdrop
+dnl
+
+dnl EGG_TCL_OPTIONS()
+dnl
+AC_DEFUN([EGG_TCL_OPTIONS],
+[
+ AC_ARG_WITH(tcllib, [AS_HELP_STRING([--with-tcllib=PATH],[full path to Tcl library])], [tcllibname="$withval"])
+ AC_ARG_WITH(tclinc, [AS_HELP_STRING([--with-tclinc=PATH],[full path to Tcl header])], [tclincname="$withval"])
+
+ MY_ARG_DISABLE([script_tcl], [TCL Script])
+
+ WARN=0
+ # Make sure either both or neither $tcllibname and $tclincname are set
+ if test "x$tcllibname" != x; then
+ if test "x$tclincname" = x; then
+ WARN=1
+ tcllibname=""
+ TCLLIB=""
+ TCLINC=""
+ fi
+ else
+ if test "x$tclincname" != x; then
+ WARN=1
+ tclincname=""
+ TCLLIB=""
+ TCLINC=""
+ fi
+ fi
+
+ if test "$WARN" = 1; then
+ cat << 'EOF' >&2
+configure: WARNING:
+
+ You must specify both --with-tcllib and --with-tclinc for either to work.
+
+ configure will now attempt to autodetect both the Tcl library and header.
+
+EOF
+ fi
+])
+
+
+dnl EGG_TCL_ENV()
+dnl
+AC_DEFUN([EGG_TCL_ENV],
+[
+ WARN=0
+ # Make sure either both or neither $TCLLIB and $TCLINC are set
+ if test "x$TCLLIB" != x; then
+ if test "x$TCLINC" = x; then
+ WARN=1
+ WVAR1=TCLLIB
+ WVAR2=TCLINC
+ TCLLIB=""
+ fi
+ else
+ if test "x$TCLINC" != x; then
+ WARN=1
+ WVAR1=TCLINC
+ WVAR2=TCLLIB
+ TCLINC=""
+ fi
+ fi
+
+ if test "$WARN" = 1; then
+ cat << EOF >&2
+configure: WARNING:
+
+ Environment variable $WVAR1 was set, but I did not detect ${WVAR2}.
+ Please set both TCLLIB and TCLINC correctly if you wish to use them.
+
+ configure will now attempt to autodetect both the Tcl library and header.
+
+EOF
+ fi
+])
+
+
+dnl EGG_TCL_WITH_TCLLIB()
+dnl
+AC_DEFUN([EGG_TCL_WITH_TCLLIB],
+[
+ # Look for Tcl library: if $tcllibname is set, check there first
+ if test "x$tcllibname" != x; then
+ if test -f "$tcllibname" && test -r "$tcllibname"; then
+ TCLLIB=`echo $tcllibname | sed 's%/[[^/]][[^/]]*$%%'`
+ TCLLIBFN=`$BASENAME $tcllibname | cut -c4-`
+ TCLLIBEXT=".`echo $TCLLIBFN | $AWK '{j=split([$]1, i, "."); print i[[j]]}'`"
+ TCLLIBFNS=`$BASENAME $tcllibname $TCLLIBEXT | cut -c4-`
+ else
+ cat << EOF >&2
+configure: WARNING:
+
+ The file '$tcllibname' given to option --with-tcllib is not valid.
+
+ configure will now attempt to autodetect both the Tcl library and header.
+
+EOF
+ tcllibname=""
+ tclincname=""
+ TCLLIB=""
+ TCLLIBFN=""
+ TCLINC=""
+ TCLINCFN=""
+ fi
+ fi
+])
+
+
+dnl EGG_TCL_WITH_TCLINC()
+dnl
+AC_DEFUN([EGG_TCL_WITH_TCLINC],
+[
+ # Look for Tcl header: if $tclincname is set, check there first
+ if test "x$tclincname" != x; then
+ if test -f "$tclincname" && test -r "$tclincname"; then
+ TCLINC=`echo $tclincname | sed 's%/[[^/]][[^/]]*$%%'`
+ TCLINCFN=`$BASENAME $tclincname`
+ else
+ cat << EOF >&2
+configure: WARNING:
+
+ The file '$tclincname' given to option --with-tclinc is not valid.
+
+ configure will now attempt to autodetect both the Tcl library and header.
+
+EOF
+ tcllibname=""
+ tclincname=""
+ TCLLIB=""
+ TCLLIBFN=""
+ TCLINC=""
+ TCLINCFN=""
+ fi
+ fi
+])
+
+
+dnl EGG_TCL_FIND_LIBRARY()
+dnl
+AC_DEFUN([EGG_TCL_FIND_LIBRARY],
+[
+ # Look for Tcl library: if $TCLLIB is set, check there first
+ if test "x$TCLLIBFN" = x && test "x$TCLLIB" != x; then
+ if test -d "$TCLLIB"; then
+ for tcllibfns in $tcllibnames; do
+ for tcllibext in $tcllibextensions; do
+ if test -r "${TCLLIB}/lib${tcllibfns}${tcllibext}"; then
+ TCLLIBFN="${tcllibfns}${tcllibext}"
+ TCLLIBEXT="$tcllibext"
+ TCLLIBFNS="$tcllibfns"
+ break 2
+ fi
+ done
+ done
+ fi
+
+ if test "x$TCLLIBFN" = x; then
+ cat << 'EOF' >&2
+configure: WARNING:
+
+ Environment variable TCLLIB was set, but incorrectly.
+ Please set both TCLLIB and TCLINC correctly if you wish to use them.
+
+ configure will now attempt to autodetect both the Tcl library and header.
+
+EOF
+ TCLLIB=""
+ TCLLIBFN=""
+ TCLINC=""
+ TCLINCFN=""
+ fi
+ fi
+])
+
+
+dnl EGG_TCL_FIND_HEADER()
+dnl
+AC_DEFUN([EGG_TCL_FIND_HEADER],
+[
+ # Look for Tcl header: if $TCLINC is set, check there first
+ if test "x$TCLINCFN" = x && test "x$TCLINC" != x; then
+ if test -d "$TCLINC"; then
+ for tclheaderfn in $tclheadernames; do
+ if test -r "${TCLINC}/${tclheaderfn}"; then
+ TCLINCFN="$tclheaderfn"
+ break
+ fi
+ done
+ fi
+
+ if test "x$TCLINCFN" = x; then
+ cat << 'EOF' >&2
+configure: WARNING:
+
+ Environment variable TCLINC was set, but incorrectly.
+ Please set both TCLLIB and TCLINC correctly if you wish to use them.
+
+ configure will now attempt to autodetect both the Tcl library and header.
+
+EOF
+ TCLLIB=""
+ TCLLIBFN=""
+ TCLINC=""
+ TCLINCFN=""
+ fi
+ fi
+])
+
+
+dnl EGG_TCL_CHECK_LIBRARY()
+dnl
+AC_DEFUN([EGG_TCL_CHECK_LIBRARY],
+[
+ if test "$enable_script_tcl" = "yes"; then
+ AC_MSG_CHECKING([for Tcl library])
+
+ # Attempt autodetect for $TCLLIBFN if it's not set
+ if test "x$TCLLIBFN" != x; then
+ AC_MSG_RESULT([using ${TCLLIB}/lib${TCLLIBFN}])
+ else
+ for tcllibfns in $tcllibnames; do
+ for tcllibext in $tcllibextensions; do
+ for tcllibpath in $tcllibpaths; do
+ if test -r "${tcllibpath}/lib${tcllibfns}${tcllibext}"; then
+ AC_MSG_RESULT([found ${tcllibpath}/lib${tcllibfns}${tcllibext}])
+ TCLLIB="$tcllibpath"
+ TCLLIBFN="${tcllibfns}${tcllibext}"
+ TCLLIBEXT="$tcllibext"
+ TCLLIBFNS="$tcllibfns"
+ break 3
+ fi
+ done
+ done
+ done
+ fi
+
+ # Show if $TCLLIBFN wasn't found
+ if test "x$TCLLIBFN" = x; then
+ AC_MSG_RESULT([not found])
+ fi
+ fi
+
+ AC_SUBST(TCLLIB)
+ AC_SUBST(TCLLIBFN)
+])
+
+
+dnl EGG_TCL_CHECK_HEADER()
+dnl
+AC_DEFUN([EGG_TCL_CHECK_HEADER],
+[
+ if test "$enable_script_tcl" = "yes"; then
+ AC_MSG_CHECKING([for Tcl header])
+
+ # Attempt autodetect for $TCLINCFN if it's not set
+ if test "x$TCLINCFN" != x; then
+ AC_MSG_RESULT([using ${TCLINC}/${TCLINCFN}])
+ else
+ for tclheaderpath in $tclheaderpaths; do
+ for tclheaderfn in $tclheadernames; do
+ if test -r "${tclheaderpath}/${tclheaderfn}"; then
+ AC_MSG_RESULT([found ${tclheaderpath}/${tclheaderfn}])
+ TCLINC="$tclheaderpath"
+ TCLINCFN="$tclheaderfn"
+ break 2
+ fi
+ done
+ done
+
+ # FreeBSD hack ...
+ if test "x$TCLINCFN" = x; then
+ for tcllibfns in $tcllibnames; do
+ for tclheaderpath in $tclheaderpaths; do
+ for tclheaderfn in $tclheadernames; do
+ if test -r "${tclheaderpath}/${tcllibfns}/${tclheaderfn}"; then
+ AC_MSG_RESULT([found ${tclheaderpath}/${tcllibfns}/${tclheaderfn}])
+ TCLINC="${tclheaderpath}/${tcllibfns}"
+ TCLINCFN="$tclheaderfn"
+ break 3
+ fi
+ done
+ done
+ done
+ fi
+ fi
+
+ TCL_INCLUDES=""
+ if ! test "x$TCLINC" = x; then
+ TCL_INCLUDES="-I$TCLINC"
+ fi
+
+ if test "x$TCLINCFN" = x; then
+ AC_MSG_RESULT([not found])
+ fi
+ fi
+
+ AC_SUBST(TCL_INCLUDES)
+ AC_SUBST(TCLINCFN)
+])
+
+
+dnl EGG_CACHE_UNSET(CACHE-ID)
+dnl
+dnl Unsets a certain cache item. Typically called before using the AC_CACHE_*()
+dnl macros.
+dnl
+AC_DEFUN([EGG_CACHE_UNSET], [unset $1])
+
+
+dnl EGG_TCL_DETECT_CHANGE()
+dnl
+dnl Detect whether the Tcl system has changed since our last configure run.
+dnl Set egg_tcl_changed accordingly.
+dnl
+dnl Tcl related feature and version checks should re-run their checks as soon
+dnl as egg_tcl_changed is set to "yes".
+dnl
+AC_DEFUN([EGG_TCL_DETECT_CHANGE],
+[
+ if test "$enable_script_tcl" = "yes"; then
+ dnl NOTE: autoconf 2.50+ disables config.cache by default.
+ dnl These checks don't do us much good if cache is disabled.
+ AC_MSG_CHECKING([whether the Tcl system has changed])
+ egg_tcl_changed="yes"
+ egg_tcl_id="${TCLLIB}:${TCLLIBFN}:${TCLINC}:${TCLINCFN}"
+ if test "$egg_tcl_id" != ":::"; then
+ egg_tcl_cached="yes"
+ AC_CACHE_VAL(egg_cv_var_tcl_id, [
+ egg_cv_var_tcl_id="$egg_tcl_id"
+ egg_tcl_cached="no"
+ ])
+ if test "$egg_tcl_cached" = yes; then
+ if test "x$egg_cv_var_tcl_id" = "x$egg_tcl_id"; then
+ egg_tcl_changed="no"
+ else
+ egg_cv_var_tcl_id="$egg_tcl_id"
+ fi
+ fi
+ fi
+
+ if test "$egg_tcl_changed" = yes; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ fi
+ fi
+])
+
+
+dnl EGG_TCL_CHECK_VERSION()
+dnl
+AC_DEFUN([EGG_TCL_CHECK_VERSION],
+[
+ if test "$enable_script_tcl" = "yes"; then
+ # Both TCLLIBFN & TCLINCFN must be set, or we bail
+ TCL_FOUND=0
+ if test "x$TCLLIBFN" != x && test "x$TCLINCFN" != x; then
+ TCL_FOUND=1
+
+ # Check Tcl's version
+ if test "$egg_tcl_changed" = yes; then
+ EGG_CACHE_UNSET(egg_cv_var_tcl_version)
+ fi
+
+ AC_MSG_CHECKING([for Tcl version])
+ AC_CACHE_VAL(egg_cv_var_tcl_version, [
+ egg_cv_var_tcl_version=`grep TCL_VERSION $TCLINC/$TCLINCFN | $HEAD_1 | $AWK '{gsub(/\"/, "", [$]3); print [$]3}'`
+ ])
+
+ if test "x$egg_cv_var_tcl_version" != x; then
+ AC_MSG_RESULT([$egg_cv_var_tcl_version])
+ else
+ AC_MSG_RESULT([not found])
+ TCL_FOUND=0
+ fi
+
+ # Check Tcl's patch level (if available)
+ if test "$egg_tcl_changed" = yes; then
+ EGG_CACHE_UNSET(egg_cv_var_tcl_patch_level)
+ fi
+ AC_MSG_CHECKING([for Tcl patch level])
+ AC_CACHE_VAL(egg_cv_var_tcl_patch_level, [
+ eval "egg_cv_var_tcl_patch_level=`grep TCL_PATCH_LEVEL $TCLINC/$TCLINCFN | $HEAD_1 | $AWK '{gsub(/\"/, "", [$]3); print [$]3}'`"
+ ])
+
+ if test "x$egg_cv_var_tcl_patch_level" != x; then
+ AC_MSG_RESULT([$egg_cv_var_tcl_patch_level])
+ else
+ egg_cv_var_tcl_patch_level="unknown"
+ AC_MSG_RESULT([unknown])
+ fi
+ fi
+
+ # Check if we found Tcl's version
+ if test "$TCL_FOUND" = 0; then
+ cat << 'EOF' >&2
+configure: error:
+
+ Tcl cannot be found on this system.
+
+ Tcl is not required. Wraith will be compiled without TCL support. If you
+ already have Tcl installed on this system, please specify the path by
+ rerunning ./configure using the --with-tcllib='/path/to/libtcl.so' and
+ --with-tclinc='/path/to/tcl.h' options.
+
+EOF
+ enable_script_tcl="no"
+ else
+ AC_DEFINE(HAVE_LIBTCL, 1, [Define if you have support for libtcl])
+ fi
+ fi
+])
+
+
+dnl EGG_TCL_CHECK_PRE70()
+dnl
+AC_DEFUN([EGG_TCL_CHECK_PRE70],
+[
+ if test "$enable_script_tcl" = "yes"; then
+ # Is this version of Tcl too old for us to use ?
+ TCL_VER_PRE70=`echo $egg_cv_var_tcl_version | $AWK '{split([$]1, i, "."); if (i[[1]] < 7) print "yes"; else print "no"}'`
+ if test "$TCL_VER_PRE70" = yes; then
+ cat << EOF >&2
+configure: error:
+
+ Your Tcl version is much too old for Wraith to use. You should
+ download and compile a more recent version. The most reliable
+ current version is $tclrecommendver and can be downloaded from
+ ${tclrecommendsite}.
+
+ See doc/COMPILE-GUIDE's 'Tcl Detection and Installation' section
+ for more information.
+
+EOF
+ exit 1
+ fi
+ fi
+])
+
+
+dnl EGG_TCL_TESTLIBS()
+dnl
+AC_DEFUN([EGG_TCL_TESTLIBS],
+[
+ # Set variables for Tcl library tests
+ TCL_TEST_LIB="$TCLLIBFNS"
+ TCL_TEST_OTHERLIBS="-L$TCLLIB $EGG_MATH_LIB"
+ if test "x$ac_cv_lib_pthread" != x; then
+ TCL_TEST_OTHERLIBS="$TCL_TEST_OTHERLIBS $ac_cv_lib_pthread"
+ fi
+])
+
+
+dnl EGG_TCL_CHECK_FREE()
+dnl
+AC_DEFUN([EGG_TCL_CHECK_FREE],
+[
+ if test "$enable_script_tcl" = "yes"; then
+ if test "$egg_tcl_changed" = yes; then
+ EGG_CACHE_UNSET(egg_cv_var_tcl_free)
+ fi
+
+ # Check for Tcl_Free()
+ AC_CHECK_LIB($TCL_TEST_LIB, Tcl_Free, [egg_cv_var_tcl_free="yes"], [egg_cv_var_tcl_free="no"], $TCL_TEST_OTHERLIBS)
+
+ if test "$egg_cv_var_tcl_free" = yes; then
+ AC_DEFINE(HAVE_TCL_FREE, 1, [Define for Tcl that has Tcl_Free() (7.5p1 and later).])
+ fi
+ fi
+])
+
+
+dnl EGG_TCL_CHECK_GETCURRENTTHREAD
+dnl
+AC_DEFUN([EGG_TCL_CHECK_GETCURRENTTHREAD],
+[
+ if test "$enable_script_tcl" = "yes"; then
+ if test "$egg_tcl_changed" = yes; then
+ EGG_CACHE_UNSET(egg_cv_var_tcl_getcurrentthread)
+ fi
+
+ # Check for Tcl_GetCurrentThread()
+ AC_CHECK_LIB($TCL_TEST_LIB, Tcl_GetCurrentThread, [egg_cv_var_tcl_getcurrentthread="yes"], [egg_cv_var_tcl_getcurrentthread="no"], $TCL_TEST_OTHERLIBS)
+ if test "$egg_cv_var_tcl_getcurrentthread" = yes; then
+ AC_DEFINE(HAVE_TCL_GETCURRENTTHREAD, 1, [Define for Tcl that has Tcl_GetCurrentThread() (8.1a2 and later).])
+
+ # Add pthread library to $LIBS if we need it for threaded Tcl
+ if test "x$ac_cv_lib_pthread" != x; then
+ EGG_APPEND_VAR(LIBS, $ac_cv_lib_pthread)
+ fi
+ fi
+ fi
+])
+
+
+dnl EGG_TCL_CHECK_GETTHREADDATA
+dnl
+AC_DEFUN([EGG_TCL_CHECK_GETTHREADDATA],
+[
+ if test "$enable_script_tcl" = "yes"; then
+ if test "$egg_tcl_changed" = yes; then
+ EGG_CACHE_UNSET(egg_cv_var_tcl_getthreaddata)
+ fi
+
+ # Check for Tcl_GetThreadData()
+ AC_CHECK_LIB($TCL_TEST_LIB, Tcl_GetThreadData, [egg_cv_var_tcl_getthreaddata="yes"], [egg_cv_var_tcl_getthreaddata="no"], $TCL_TEST_OTHERLIBS)
+ if test "$egg_cv_var_tcl_getthreaddata" = yes; then
+ AC_DEFINE(HAVE_TCL_GETTHREADDATA, 1, [Define for Tcl that has Tcl_GetThreadData() (8.1a2 and later).])
+ fi
+ fi
+])
+
+
+dnl EGG_TCL_CHECK_SETNOTIFIER
+dnl
+AC_DEFUN([EGG_TCL_CHECK_SETNOTIFIER],
+[
+ if test "$enable_script_tcl" = "yes"; then
+ if test "$egg_tcl_changed" = yes; then
+ EGG_CACHE_UNSET(egg_cv_var_tcl_setnotifier)
+ fi
+
+ # Check for Tcl_SetNotifier()
+ AC_CHECK_LIB($TCL_TEST_LIB, Tcl_SetNotifier, [egg_cv_var_tcl_setnotifier="yes"], [egg_cv_var_tcl_setnotifier="no"], $TCL_TEST_OTHERLIBS)
+ if test "$egg_cv_var_tcl_setnotifier" = yes; then
+ AC_DEFINE(HAVE_TCL_SETNOTIFIER, 1, [Define for Tcl that has Tcl_SetNotifier() (8.2b1 and later).])
+ fi
+ fi
+])
+
+
+dnl EGG_TCL_LIB_REQS()
+dnl
+AC_DEFUN([EGG_TCL_LIB_REQS],
+[
+ if test "$enable_script_tcl" = "yes"; then
+ if test "$EGG_CYGWIN" = yes; then
+ TCL_REQS="${TCLLIB}/lib${TCLLIBFN}"
+ TCL_LIBS="-L$TCLLIB -l$TCLLIBFNS $EGG_MATH_LIB"
+ else
+ if test "$TCLLIBEXT" != ".a"; then
+ TCL_REQS="${TCLLIB}/lib${TCLLIBFN}"
+ TCL_LIBS="-L$TCLLIB -l$TCLLIBFNS $EGG_MATH_LIB"
+ else
+ # Set default make as static for unshared Tcl library
+ if test "$DEFAULT_MAKE" != static; then
+ cat << 'EOF' >&2
+configure: WARNING:
+
+ Your Tcl library is not a shared lib.
+ configure will now set default make type to static.
+
+EOF
+ DEFAULT_MAKE="static"
+ AC_SUBST(DEFAULT_MAKE)
+ fi
+
+ # Are we using a pre 7.4 Tcl version ?
+ TCL_VER_PRE74=`echo $egg_cv_var_tcl_version | $AWK '{split([$]1, i, "."); if (((i[[1]] == 7) && (i[[2]] < 4)) || (i[[1]] < 7)) print "yes"; else print "no"}'`
+ if test "$TCL_VER_PRE74" = no; then
+
+ # Was the --with-tcllib option given ?
+ if test "x$tcllibname" != x; then
+ TCL_REQS="${TCLLIB}/lib${TCLLIBFN}"
+ TCL_LIBS="${TCLLIB}/lib${TCLLIBFN} $EGG_MATH_LIB"
+ else
+ TCL_REQS="${TCLLIB}/lib${TCLLIBFN}"
+ TCL_LIBS="-L$TCLLIB -l$TCLLIBFNS $EGG_MATH_LIB"
+ fi
+ else
+ cat << EOF >&2
+configure: WARNING:
+
+ Your Tcl version ($egg_cv_var_tcl_version) is older than 7.4.
+ There are known problems, but we will attempt to work around them.
+
+EOF
+ TCL_REQS="libtcle.a"
+ TCL_LIBS="-L`pwd` -ltcle $EGG_MATH_LIB"
+ fi
+ fi
+ fi
+ fi
+
+ AC_SUBST(TCL_REQS)
+ AC_SUBST(TCL_LIBS)
+])
+
+
diff --git a/autotools/includes/stat.m4 b/build/autotools/includes/stat.m4
similarity index 100%
rename from autotools/includes/stat.m4
rename to build/autotools/includes/stat.m4
diff --git a/autotools/includes/wrap.m4 b/build/autotools/includes/wrap.m4
similarity index 100%
rename from autotools/includes/wrap.m4
rename to build/autotools/includes/wrap.m4
diff --git a/build/cc1plus b/build/cc1plus
new file mode 100755
index 0000000..1f27a11
--- /dev/null
+++ b/build/cc1plus
< at >< at > -0,0 +1,58 < at >< at >
+#! /bin/sh
+
+# This file intercepts the pre-processor and runs 'stringfix' on the source file before it is processed.
+# This avoids the need for the old _*.c temp files.
+
+# Only capture pre-processing
+if [ $1 != "-E" -o -z "$STRINGFIX" -o ! -f "$STRINGFIX" ]; then
+ exec $(${COLLECT_GCC} --print-prog-name=cc1plus) "$< at >"
+fi
+
+
+# Check for '-MD' as this may be the 'depcomp' call
+depcomp=0
+for arg; do
+ case "$arg" in
+ -MD)
+ depcomp=1
+ ;;
+ *)
+ ;;
+ esac
+done
+
+# Only continue if running in depcomp (avoiding a 2nd pass for -dD/-g3)
+if [ $depcomp -eq 0 ]; then
+ exec $(${COLLECT_GCC} --print-prog-name=cc1plus) "$< at >"
+fi
+
+### Is this a pipe or not? ###
+
+# Determine the last argument
+for i
+do
+ third_last="$third_last $second_last"
+ second_last=$last
+ last=$i
+done
+
+# If the last param is *.ii, there's no pipe
+case $last in
+ *.ii)
+ piping=0
+ ;;
+ *)
+ piping=1
+ ;;
+esac
+
+if [ $piping -eq 1 ]; then
+ exec $(${COLLECT_GCC} --print-prog-name=cc1plus) "$< at >" | $STRINGFIX
+else
+ gcc_status=$($(${COLLECT_GCC} --print-prog-name=cc1plus) "$< at >")
+
+ TEMPFILE=`(umask 077 && mktemp -t "ccXXXXXX") 2>/dev/null`
+ $STRINGFIX < $last > $TEMPFILE
+ mv -f $TEMPFILE $last
+ exit $gcc_status
+fi
diff --git a/configure b/configure
index e87bfb7..aa76aac 100755
--- a/configure
+++ b/configure
< at >< at > -12,7 +12,7 < at >< at >
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
#
-# Copyright (c) 2003 - 2010 Bryan Drewery
+# Copyright (c) Bryan Drewery
## -------------------- ##
## M4sh Initialization. ##
## -------------------- ##
< at >< at > -610,6 +610,13 < at >< at > MOD_UPDIR
NUMVER
VERSION
LIBOBJS
+TCL_LIBS
+TCL_REQS
+DEFAULT_MAKE
+TCLINCFN
+TCL_INCLUDES
+TCLLIBFN
+TCLLIB
SSL_LIBS
SSL_INCLUDES
MAKEJOBS
< at >< at > -626,6 +633,7 < at >< at > OBJCOPY
BASENAME
AWK
HEAD_1
+SED
SET_MAKE
GCC4DEB
GCC3DEB
< at >< at > -685,6 +693,9 < at >< at > ac_user_opts='
enable_option_checking
enable_ipv6
with_openssl
+with_tcllib
+with_tclinc
+enable_script_tcl
'
ac_precious_vars='build_alias
host_alias
< at >< at > -705,7 +716,7 < at >< at > ac_unrecognized_opts=
ac_unrecognized_sep=
# The variables have the same names as the options, with
# dashes changed to underlines.
-cache_file=./config.cache
+cache_file=/dev/null
exec_prefix=NONE
no_create=
no_recursion=
< at >< at > -1306,11 +1317,14 < at >< at > Optional Features:
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--disable-ipv6 disable IPv6 support
+ --disable-script-tcl disable TCL Script support
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
- --with-openssl=DIR Path to OpenSSL
+ --with-openssl=PATH Path to OpenSSL
+ --with-tcllib=PATH full path to Tcl library
+ --with-tclinc=PATH full path to Tcl header
Some influential environment variables:
CXX C++ compiler command
< at >< at > -1395,7 +1409,7 < at >< at > Copyright (C) 2010 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
-Copyright (c) 2003 - 2010 Bryan Drewery
+Copyright (c) Bryan Drewery
_ACEOF
exit
fi
< at >< at > -1500,8 +1514,8 < at >< at > else
# Is the header compilable?
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
$as_echo_n "checking $2 usability... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+cat build/confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end build/confdefs.h. */
$4
#include <$2>
_ACEOF
< at >< at > -1517,8 +1531,8 < at >< at > $as_echo "$ac_header_compiler" >&6; }
# Is the header present?
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
$as_echo_n "checking $2 presence... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+cat build/confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end build/confdefs.h. */
#include <$2>
_ACEOF
if ac_fn_cxx_try_cpp "$LINENO"; then :
< at >< at > -1620,8 +1634,8 < at >< at > $as_echo_n "checking for $2... " >&6; }
if eval \${$3+:} false; then :
$as_echo_n "(cached) " >&6
else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+ cat build/confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end build/confdefs.h. */
$4
#include <$2>
_ACEOF
< at >< at > -1698,8 +1712,8 < at >< at > if eval \${$3+:} false; then :
$as_echo_n "(cached) " >&6
else
eval "$3=no"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+ cat build/confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end build/confdefs.h. */
$4
int
main ()
< at >< at > -1711,8 +1725,8 < at >< at > if (sizeof ($2))
}
_ACEOF
if ac_fn_cxx_try_compile "$LINENO"; then :
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+ cat build/confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end build/confdefs.h. */
$4
int
main ()
< at >< at > -1739,23 +1753,31 < at >< at > $as_echo "$ac_res" >&6; }
} # ac_fn_cxx_check_type
-# ac_fn_cxx_compute_int LINENO EXPR VAR INCLUDES
-# ----------------------------------------------
-# Tries to find the compile-time value of EXPR in a program that includes
-# INCLUDES, setting VAR accordingly. Returns whether the value could be
-# computed
-ac_fn_cxx_compute_int ()
+# ac_fn_c_find_intX_t LINENO BITS VAR
+# -----------------------------------
+# Finds a signed integer type with width BITS, setting cache variable VAR
+# accordingly.
+ac_fn_c_find_intX_t ()
{
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$4
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for int$2_t" >&5
+$as_echo_n "checking for int$2_t... " >&6; }
+if eval \${$3+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ eval "$3=no"
+ # Order is important - never check a type that is potentially smaller
+ # than half of the expected target width.
+ for ac_type in int$2_t 'int' 'long int' \
+ 'long long int' 'short int' 'signed char'; do
+ cat build/confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end build/confdefs.h. */
+$ac_includes_default
+ enum { N = $2 / 2 - 1 };
int
main ()
{
-static int test_array [1 - 2 * !(($2) >= 0)];
+static int test_array [1 - 2 * !(0 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1))];
test_array [0] = 0
;
< at >< at > -1763,15 +1785,15 < at >< at > test_array [0] = 0
}
_ACEOF
if ac_fn_cxx_try_compile "$LINENO"; then :
- ac_lo=0 ac_mid=0
- while :; do
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$4
+ cat build/confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end build/confdefs.h. */
+$ac_includes_default
+ enum { N = $2 / 2 - 1 };
int
main ()
{
-static int test_array [1 - 2 * !(($2) <= $ac_mid)];
+static int test_array [1 - 2 * !(($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1)
+ < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 2))];
test_array [0] = 0
;
< at >< at > -1779,75 +1801,56 < at >< at > test_array [0] = 0
}
_ACEOF
if ac_fn_cxx_try_compile "$LINENO"; then :
- ac_hi=$ac_mid; break
+
else
- as_fn_arith $ac_mid + 1 && ac_lo=$as_val
-if test $ac_lo -le $ac_mid; then
- ac_lo= ac_hi=
- break
+ case $ac_type in #(
+ int$2_t) :
+ eval "$3=yes" ;; #(
+ *) :
+ eval "$3=\$ac_type" ;;
+esac
fi
-as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$4
-int
-main ()
-{
-static int test_array [1 - 2 * !(($2) < 0)];
-test_array [0] = 0
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
- ac_hi=-1 ac_mid=-1
- while :; do
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$4
-int
-main ()
-{
-static int test_array [1 - 2 * !(($2) >= $ac_mid)];
-test_array [0] = 0
+ if eval test \"x\$"$3"\" = x"no"; then :
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
- ac_lo=$ac_mid; break
else
- as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val
-if test $ac_mid -le $ac_hi; then
- ac_lo= ac_hi=
break
fi
-as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
-else
- ac_lo= ac_hi=
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
- as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$4
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_find_intX_t
+
+# ac_fn_c_find_uintX_t LINENO BITS VAR
+# ------------------------------------
+# Finds an unsigned integer type with width BITS, setting cache variable VAR
+# accordingly.
+ac_fn_c_find_uintX_t ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uint$2_t" >&5
+$as_echo_n "checking for uint$2_t... " >&6; }
+if eval \${$3+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ eval "$3=no"
+ # Order is important - never check a type that is potentially smaller
+ # than half of the expected target width.
+ for ac_type in uint$2_t 'unsigned int' 'unsigned long int' \
+ 'unsigned long long int' 'unsigned short int' 'unsigned char'; do
+ cat build/confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end build/confdefs.h. */
+$ac_includes_default
int
main ()
{
-static int test_array [1 - 2 * !(($2) <= $ac_mid)];
+static int test_array [1 - 2 * !((($ac_type) -1 >> ($2 / 2 - 1)) >> ($2 / 2 - 1) == 3)];
test_array [0] = 0
;
< at >< at > -1855,67 +1858,27 < at >< at > test_array [0] = 0
}
_ACEOF
if ac_fn_cxx_try_compile "$LINENO"; then :
- ac_hi=$ac_mid
-else
- as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val
+ case $ac_type in #(
+ uint$2_t) :
+ eval "$3=yes" ;; #(
+ *) :
+ eval "$3=\$ac_type" ;;
+esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in #((
-?*) eval "$3=\$ac_lo"; ac_retval=0 ;;
-'') ac_retval=1 ;;
-esac
- else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$4
-static long int longval () { return $2; }
-static unsigned long int ulongval () { return $2; }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
- return 1;
- if (($2) < 0)
- {
- long int i = longval ();
- if (i != ($2))
-return 1;
- fprintf (f, "%ld", i);
- }
- else
- {
- unsigned long int i = ulongval ();
- if (i != ($2))
-return 1;
- fprintf (f, "%lu", i);
- }
- /* Do not output a trailing newline, as this causes \r\n confusion
- on some platforms. */
- return ferror (f) || fclose (f) != 0;
+ if eval test \"x\$"$3"\" = x"no"; then :
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_run "$LINENO"; then :
- echo >>conftest.val; read $3 <conftest.val; ac_retval=0
else
- ac_retval=1
+ break
fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
-rm -f conftest.val
-
+ done
fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
- as_fn_set_status $ac_retval
-} # ac_fn_cxx_compute_int
+} # ac_fn_c_find_uintX_t
# ac_fn_cxx_check_member LINENO AGGR MEMBER VAR INCLUDES
# ------------------------------------------------------
< at >< at > -1929,8 +1892,8 < at >< at > $as_echo_n "checking for $2.$3... " >&6; }
if eval \${$4+:} false; then :
$as_echo_n "(cached) " >&6
else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+ cat build/confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end build/confdefs.h. */
$5
int
main ()
< at >< at > -1945,8 +1908,8 < at >< at > _ACEOF
if ac_fn_cxx_try_compile "$LINENO"; then :
eval "$4=yes"
else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+ cat build/confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end build/confdefs.h. */
$5
int
main ()
< at >< at > -1988,8 +1951,8 < at >< at > $as_echo_n "checking whether $as_decl_name is declared... " >&6; }
if eval \${$3+:} false; then :
$as_echo_n "(cached) " >&6
else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+ cat build/confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end build/confdefs.h. */
$4
int
main ()
< at >< at > -2031,8 +1994,8 < at >< at > $as_echo_n "checking for $2... " >&6; }
if eval \${$3+:} false; then :
$as_echo_n "(cached) " >&6
else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+ cat build/confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end build/confdefs.h. */
/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
#define $2 innocuous_$2
< at >< at > -2086,7 +2049,7 < at >< at > $as_echo "$ac_res" >&6; }
eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
} # ac_fn_cxx_check_func
-cat >config.log <<_ACEOF
+cat >build/config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
< at >< at > -2096,7 +2059,7 < at >< at > generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $< at >
_ACEOF
-exec 5>>config.log
+exec 5>>build/config.log
{
cat <<_ASUNAME
## --------- ##
< at >< at > -2192,12 +2155,12 < at >< at > done
{ ac_configure_args1=; unset ac_configure_args1;}
# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log. We remove comments because anyway the quotes in there
+# build/config.log. We remove comments because anyway the quotes in there
# would cause problems or look ugly.
# WARNING: Use '\'' to represent an apostrophe within the trap.
# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
trap 'exit_status=$?
- # Save into config.log some information that might help in debugging.
+ # Save into build/config.log some information that might help in debugging.
{
echo
< at >< at > -2267,12 +2230,12 < at >< at > $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
echo
fi
- if test -s confdefs.h; then
+ if test -s build/confdefs.h; then
$as_echo "## ----------- ##
-## confdefs.h. ##
+## build/confdefs.h. ##
## ----------- ##"
echo
- cat confdefs.h
+ cat build/confdefs.h
echo
fi
test "$ac_signal" != 0 &&
< at >< at > -2288,34 +2251,34 < at >< at > for ac_signal in 1 2 13 15; do
done
ac_signal=0
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -f -r conftest* confdefs.h
+# build/confdefs.h avoids OS command line length limits that DEFS can exceed.
+rm -f -r conftest* build/confdefs.h
-$as_echo "/* confdefs.h */" > confdefs.h
+$as_echo "/* build/confdefs.h */" > build/confdefs.h
# Predefined preprocessor variables.
-cat >>confdefs.h <<_ACEOF
+cat >>build/confdefs.h <<_ACEOF
#define PACKAGE_NAME "$PACKAGE_NAME"
_ACEOF
-cat >>confdefs.h <<_ACEOF
+cat >>build/confdefs.h <<_ACEOF
#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
_ACEOF
-cat >>confdefs.h <<_ACEOF
+cat >>build/confdefs.h <<_ACEOF
#define PACKAGE_VERSION "$PACKAGE_VERSION"
_ACEOF
-cat >>confdefs.h <<_ACEOF
+cat >>build/confdefs.h <<_ACEOF
#define PACKAGE_STRING "$PACKAGE_STRING"
_ACEOF
-cat >>confdefs.h <<_ACEOF
+cat >>build/confdefs.h <<_ACEOF
#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
_ACEOF
-cat >>confdefs.h <<_ACEOF
+cat >>build/confdefs.h <<_ACEOF
#define PACKAGE_URL "$PACKAGE_URL"
_ACEOF
< at >< at > -2349,7 +2312,7 < at >< at > $as_echo "$as_me: loading site script $ac_site_file" >&6;}
|| { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "failed to load site script $ac_site_file
-See \`config.log' for more details" "$LINENO" 5; }
+See \`build/config.log' for more details" "$LINENO" 5; }
fi
done
< at >< at > -2413,7 +2376,7 < at >< at > $as_echo "$as_me: former value: \`$ac_old_val'" >&2;}
$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
fi;;
esac
- # Pass precious variables to config.status.
+ # Pass precious variables to build/config.status.
if test "$ac_new_set" = set; then
case $ac_new_val in
*\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
< at >< at > -2444,7 +2407,7 < at >< at > ac_compiler_gnu=$ac_cv_c_compiler_gnu
-ac_config_headers="$ac_config_headers config.h"
+ac_config_headers="$ac_config_headers src/config.h"
< at >< at > -2496,7 +2459,7 < at >< at > if test -z "$CXX"; then
CXX=$CCC
else
if test -n "$ac_tool_prefix"; then
- for ac_prog in g++45 g++-4.5 g++-4.4 g++-4.4.1 g++-4.4.2 g++-4.4.0 g++44 g++4 g++-3.3 g++33 g++-3 g++3 g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
+ for ac_prog in g++47 g++-4.7 g++46 g++-4.6 g++45 g++-4.5 g++-4.4 g++-4.4.1 g++-4.4.2 g++-4.4.0 g++44 g++4 eg++ g++-3.3 g++33 g++-3 g++3 g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
< at >< at > -2540,7 +2503,7 < at >< at > fi
fi
if test -z "$CXX"; then
ac_ct_CXX=$CXX
- for ac_prog in g++45 g++-4.5 g++-4.4 g++-4.4.1 g++-4.4.2 g++-4.4.0 g++44 g++4 g++-3.3 g++33 g++-3 g++3 g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
+ for ac_prog in g++47 g++-4.7 g++46 g++-4.6 g++45 g++-4.5 g++-4.4 g++-4.4.1 g++-4.4.2 g++-4.4.0 g++44 g++4 eg++ g++-3.3 g++33 g++-3 g++3 g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
< at >< at > -2622,8 +2585,8 < at >< at > $as_echo "$ac_try_echo"; } >&5
test $ac_status = 0; }
done
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+cat build/confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end build/confdefs.h. */
int
main ()
< at >< at > -2710,7 +2673,7 < at >< at > sed 's/^/| /' conftest.$ac_ext >&5
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error 77 "C++ compiler cannot create executables
-See \`config.log' for more details" "$LINENO" 5; }
+See \`build/config.log' for more details" "$LINENO" 5; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
< at >< at > -2753,7 +2716,7 < at >< at > else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details" "$LINENO" 5; }
+See \`build/config.log' for more details" "$LINENO" 5; }
fi
rm -f conftest conftest$ac_cv_exeext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
< at >< at > -2762,8 +2725,8 < at >< at > $as_echo "$ac_cv_exeext" >&6; }
rm -f conftest.$ac_ext
EXEEXT=$ac_cv_exeext
ac_exeext=$EXEEXT
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+cat build/confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end build/confdefs.h. */
#include <stdio.h>
int
main ()
< at >< at > -2812,7 +2775,7 < at >< at > $as_echo "$ac_try_echo"; } >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "cannot run C++ compiled programs.
If you meant to cross compile, use \`--host'.
-See \`config.log' for more details" "$LINENO" 5; }
+See \`build/config.log' for more details" "$LINENO" 5; }
fi
fi
fi
< at >< at > -2826,8 +2789,8 < at >< at > $as_echo_n "checking for suffix of object files... " >&6; }
if ${ac_cv_objext+:} false; then :
$as_echo_n "(cached) " >&6
else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+ cat build/confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end build/confdefs.h. */
int
main ()
< at >< at > -2864,7 +2827,7 < at >< at > sed 's/^/| /' conftest.$ac_ext >&5
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details" "$LINENO" 5; }
+See \`build/config.log' for more details" "$LINENO" 5; }
fi
rm -f conftest.$ac_cv_objext conftest.$ac_ext
fi
< at >< at > -2877,8 +2840,8 < at >< at > $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
if ${ac_cv_cxx_compiler_gnu+:} false; then :
$as_echo_n "(cached) " >&6
else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+ cat build/confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end build/confdefs.h. */
int
main ()
< at >< at > -2918,8 +2881,8 < at >< at > else
ac_cxx_werror_flag=yes
ac_cv_prog_cxx_g=no
CXXFLAGS="-g"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+ cat build/confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end build/confdefs.h. */
int
main ()
< at >< at > -2933,8 +2896,8 < at >< at > if ac_fn_cxx_try_compile "$LINENO"; then :
ac_cv_prog_cxx_g=yes
else
CXXFLAGS=""
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+ cat build/confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end build/confdefs.h. */
int
main ()
< at >< at > -2949,8 +2912,8 < at >< at > if ac_fn_cxx_try_compile "$LINENO"; then :
else
ac_cxx_werror_flag=$ac_save_cxx_werror_flag
CXXFLAGS="-g"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+ cat build/confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end build/confdefs.h. */
int
main ()
< at >< at > -3000,7 +2963,7 < at >< at > then
configure: error:
This system does not appear to have a working C compiler.
- A working C compiler is required to compile Eggdrop.
+ A working C compiler is required to compile Wraith.
EOF
exit 1
< at >< at > -3037,8 +3000,8 < at >< at > do
# <limits.h> exists even on freestanding compilers.
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+ cat build/confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end build/confdefs.h. */
#ifdef __STDC__
# include <limits.h>
#else
< at >< at > -3056,8 +3019,8 < at >< at > rm -f conftest.err conftest.i conftest.$ac_ext
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+ cat build/confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end build/confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
if ac_fn_cxx_try_cpp "$LINENO"; then :
< at >< at > -3096,8 +3059,8 < at >< at > do
# <limits.h> exists even on freestanding compilers.
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+ cat build/confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end build/confdefs.h. */
#ifdef __STDC__
# include <limits.h>
#else
< at >< at > -3115,8 +3078,8 < at >< at > rm -f conftest.err conftest.i conftest.$ac_ext
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+ cat build/confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end build/confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
if ac_fn_cxx_try_cpp "$LINENO"; then :
< at >< at > -3138,7 +3101,7 < at >< at > else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5; }
+See \`build/config.log' for more details" "$LINENO" 5; }
fi
ac_ext=cpp
< at >< at > -3283,8 +3246,8 < at >< at > $as_echo_n "checking for ANSI C header files... " >&6; }
if ${ac_cv_header_stdc+:} false; then :
$as_echo_n "(cached) " >&6
else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+ cat build/confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end build/confdefs.h. */
#include <stdlib.h>
#include <stdarg.h>
#include <string.h>
< at >< at > -3307,8 +3270,8 < at >< at > rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+ cat build/confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end build/confdefs.h. */
#include <string.h>
_ACEOF
< at >< at > -3324,8 +3287,8 < at >< at > fi
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+ cat build/confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end build/confdefs.h. */
#include <stdlib.h>
_ACEOF
< at >< at > -3344,8 +3307,8 < at >< at > if test $ac_cv_header_stdc = yes; then
if test "$cross_compiling" = yes; then :
:
else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+ cat build/confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end build/confdefs.h. */
#include <ctype.h>
#include <stdlib.h>
#if ((' ' & 0x0FF) == 0x020)
< at >< at > -3386,7 +3349,7 < at >< at > fi
$as_echo "$ac_cv_header_stdc" >&6; }
if test $ac_cv_header_stdc = yes; then
-$as_echo "#define STDC_HEADERS 1" >>confdefs.h
+$as_echo "#define STDC_HEADERS 1" >>build/confdefs.h
fi
< at >< at > -3398,7 +3361,7 < at >< at > do :
ac_fn_cxx_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
"
if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
- cat >>confdefs.h <<_ACEOF
+ cat >>build/confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
< at >< at > -3418,13 +3381,13 < at >< at > fi
if test "$MINIX" = yes; then
-$as_echo "#define _POSIX_SOURCE 1" >>confdefs.h
+$as_echo "#define _POSIX_SOURCE 1" >>build/confdefs.h
-$as_echo "#define _POSIX_1_SOURCE 2" >>confdefs.h
+$as_echo "#define _POSIX_1_SOURCE 2" >>build/confdefs.h
-$as_echo "#define _MINIX 1" >>confdefs.h
+$as_echo "#define _MINIX 1" >>build/confdefs.h
fi
< at >< at > -3434,8 +3397,8 < at >< at > $as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
if ${ac_cv_safe_to_define___extensions__+:} false; then :
$as_echo_n "(cached) " >&6
else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+ cat build/confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end build/confdefs.h. */
# define __EXTENSIONS__ 1
$ac_includes_default
< at >< at > -3457,15 +3420,15 < at >< at > fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
$as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
test $ac_cv_safe_to_define___extensions__ = yes &&
- $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h
+ $as_echo "#define __EXTENSIONS__ 1" >>build/confdefs.h
- $as_echo "#define _ALL_SOURCE 1" >>confdefs.h
+ $as_echo "#define _ALL_SOURCE 1" >>build/confdefs.h
- $as_echo "#define _GNU_SOURCE 1" >>confdefs.h
+ $as_echo "#define _GNU_SOURCE 1" >>build/confdefs.h
- $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
+ $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>build/confdefs.h
- $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h
+ $as_echo "#define _TANDEM_SOURCE 1" >>build/confdefs.h
< at >< at > -3475,8 +3438,8 < at >< at > if ${ac_cv_search_strerror+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_func_search_save_LIBS=$LIBS
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+cat build/confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end build/confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
< at >< at > -3535,7 +3498,7 < at >< at > cat >confcache <<\_ACEOF
# It is not useful on other systems. If it contains results you don't
# want to keep, you may remove or edit it.
#
-# config.status only pays attention to the cache file if you give it
+# build/config.status only pays attention to the cache file if you give it
# the --recheck option to rerun configure.
#
# `ac_cv_env_foo' variables (set or unset) will be overridden when
< at >< at > -3625,8 +3588,8 < at >< at > else
ac_old_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="$CXXFLAGS -Wall"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+ cat build/confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end build/confdefs.h. */
int main ()
{
< at >< at > -3665,8 +3628,8 < at >< at > else
ac_old_CXX="$CXX"
CXX="$CXX -pipe"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+ cat build/confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end build/confdefs.h. */
int main ()
{
< at >< at > -3718,7 +3681,7 < at >< at > cat >confcache <<\_ACEOF
# It is not useful on other systems. If it contains results you don't
# want to keep, you may remove or edit it.
#
-# config.status only pays attention to the cache file if you give it
+# build/config.status only pays attention to the cache file if you give it
# the --recheck option to rerun configure.
#
# `ac_cv_env_foo' variables (set or unset) will be overridden when
< at >< at > -3829,6 +3792,75 < at >< at > $as_echo "no" >&6; }
SET_MAKE="MAKE=${MAKE-make}"
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
+$as_echo_n "checking for a sed that does not truncate output... " >&6; }
+if ${ac_cv_path_SED+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+ for ac_i in 1 2 3 4 5 6 7; do
+ ac_script="$ac_script$as_nl$ac_script"
+ done
+ echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
+ { ac_script=; unset ac_script;}
+ if test -z "$SED"; then
+ ac_path_SED_found=false
+ # Loop through the user's path and test for each of PROGNAME-LIST
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_prog in sed gsed; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
+ { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
+# Check for GNU ac_path_SED and select it if it is found.
+ # Check for GNU $ac_path_SED
+case `"$ac_path_SED" --version 2>&1` in
+*GNU*)
+ ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
+*)
+ ac_count=0
+ $as_echo_n 0123456789 >"conftest.in"
+ while :
+ do
+ cat "conftest.in" "conftest.in" >"conftest.tmp"
+ mv "conftest.tmp" "conftest.in"
+ cp "conftest.in" "conftest.nl"
+ $as_echo '' >> "conftest.nl"
+ "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+ as_fn_arith $ac_count + 1 && ac_count=$as_val
+ if test $ac_count -gt ${ac_path_SED_max-0}; then
+ # Best one so far, save it but keep looking for a better one
+ ac_cv_path_SED="$ac_path_SED"
+ ac_path_SED_max=$ac_count
+ fi
+ # 10*(2^10) chars as input seems more than enough
+ test $ac_count -gt 10 && break
+ done
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+ $ac_path_SED_found && break 3
+ done
+ done
+ done
+IFS=$as_save_IFS
+ if test -z "$ac_cv_path_SED"; then
+ as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
+ fi
+else
+ ac_cv_path_SED=$SED
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
+$as_echo "$ac_cv_path_SED" >&6; }
+ SED="$ac_cv_path_SED"
+ rm -f conftest.sed
+
cat << 'EOF' > conftest.head
a
< at >< at > -3867,7 +3899,7 < at >< at > then
configure: error:
This system seems to lack a working 'head -1' or 'head -n 1' command.
- A working 'head -1' (or equivalent) command is required to compile Eggdrop.
+ A working 'head -1' (or equivalent) command is required to compile Wraith.
EOF
exit 1
< at >< at > -3926,7 +3958,7 < at >< at > then
configure: error:
This system seems to lack a working 'awk' command.
- A working 'awk' command is required to compile Eggdrop.
+ A working 'awk' command is required to compile Wraith.
EOF
exit 1
< at >< at > -3977,7 +4009,7 < at >< at > then
configure: error:
This system seems to lack a working 'basename' command.
- A working 'basename' command is required to compile Eggdrop.
+ A working 'basename' command is required to compile Wraith.
EOF
exit 1
< at >< at > -4251,7 +4283,7 < at >< at > case "$egg_cv_var_system_type" in
;;
HP-UX)
-$as_echo "#define MD32_XARRAY 1" >>confdefs.h
+$as_echo "#define MD32_XARRAY 1" >>build/confdefs.h
;;
Ultrix)
< at >< at > -4277,19 +4309,19 < at >< at > $as_echo "#define MD32_XARRAY 1" >>confdefs.h
;;
1.0|1.1|1.2)
-$as_echo "#define OSF1_HACKS 1" >>confdefs.h
+$as_echo "#define OSF1_HACKS 1" >>build/confdefs.h
;;
1.*)
-$as_echo "#define OSF1_HACKS 1" >>confdefs.h
+$as_echo "#define OSF1_HACKS 1" >>build/confdefs.h
;;
*)
;;
esac
-$as_echo "#define STOP_UAC 1" >>confdefs.h
+$as_echo "#define STOP_UAC 1" >>build/confdefs.h
-$as_echo "#define BROKEN_SNPRINTF 1" >>confdefs.h
+$as_echo "#define BROKEN_SNPRINTF 1" >>build/confdefs.h
;;
SunOS)
SUNOS="yes"
< at >< at > -4310,7 +4342,7 < at >< at > $as_echo_n "checking if system is Mach based... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
-$as_echo "#define BORGCUBES 1" >>confdefs.h
+$as_echo "#define BORGCUBES 1" >>build/confdefs.h
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
< at >< at > -4346,32 +4378,35 < at >< at > esac
# Check for IPv6 support
#EGG_IPV6_SUPPORTED
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether or not you disabled IPv6 support" >&5
-$as_echo_n "checking whether or not you disabled IPv6 support... " >&6; }
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether IPv6 is enabled" >&5
+$as_echo_n "checking whether IPv6 is enabled... " >&6; }
# Check whether --enable-ipv6 was given.
if test "${enable_ipv6+set}" = set; then :
- enableval=$enable_ipv6; ac_cv_dipv6="yes"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+ enableval=$enable_ipv6;
+ enable_ipv6=$enableval
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enableval" >&5
+$as_echo "$enableval" >&6; }
else
- ac_cv_dipv6="no"
- if test "$egg_cv_ipv6_supported" = "no"; then
- ac_cv_dipv6="no"
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_dipv6" >&5
-$as_echo "$ac_cv_dipv6" >&6; }
+ # default if not given is ENABLED
+ if test "x$enableval" = "x"; then
+ enableval="yes"
fi
+ enable_ipv6=$enableval
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enableval" >&5
+$as_echo "$enableval" >&6; }
+$as_echo "#define USE_IPV6 1" >>build/confdefs.h
-if test "$ac_cv_dipv6" = "no"; then
-$as_echo "#define USE_IPV6 1" >>confdefs.h
fi
+
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for socklen_t" >&5
$as_echo_n "checking for socklen_t... " >&6; }
if ${egg_cv_socklen_t+:} false; then :
< at >< at > -4381,8 +4416,8 < at >< at > else
if test "$cross_compiling" = yes; then :
egg_cv_socklen_t=no
else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+ cat build/confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end build/confdefs.h. */
#include <unistd.h>
#include <sys/types.h>
< at >< at > -4411,7 +4446,7 < at >< at > fi
if test "$egg_cv_socklen_t" = "yes"; then
-$as_echo "#define HAVE_SOCKLEN_T 1" >>confdefs.h
+$as_echo "#define HAVE_SOCKLEN_T 1" >>build/confdefs.h
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
< at >< at > -4437,7 +4472,7 < at >< at > $as_echo_n "checking for random limit... " >&6; }
$as_echo "$RMAX" >&6; }
-cat >>confdefs.h <<_ACEOF
+cat >>build/confdefs.h <<_ACEOF
#define RANDOM_MAX $RMAX
_ACEOF
< at >< at > -4454,8 +4489,8 < at >< at > $as_echo_n "checking whether the compiler understands -static... " >&6; }
if ${egg_cv_var_ccstatic+:} false; then :
$as_echo_n "(cached) " >&6
else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+ cat build/confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end build/confdefs.h. */
int
main ()
< at >< at > -4503,7 +4538,7 < at >< at > cat >confcache <<\_ACEOF
# It is not useful on other systems. If it contains results you don't
# want to keep, you may remove or edit it.
#
-# config.status only pays attention to the cache file if you give it
+# build/config.status only pays attention to the cache file if you give it
# the --recheck option to rerun configure.
#
# `ac_cv_env_foo' variables (set or unset) will be overridden when
< at >< at > -4591,8 +4626,8 < at >< at > if ${ac_cv_lib_socket_socket+:} false; then :
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lsocket $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+cat build/confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end build/confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
< at >< at > -4621,7 +4656,7 < at >< at > fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_socket" >&5
$as_echo "$ac_cv_lib_socket_socket" >&6; }
if test "x$ac_cv_lib_socket_socket" = xyes; then :
- cat >>confdefs.h <<_ACEOF
+ cat >>build/confdefs.h <<_ACEOF
#define HAVE_LIBSOCKET 1
_ACEOF
< at >< at > -4637,8 +4672,8 < at >< at > if ${ac_cv_lib_dl_dlopen+:} false; then :
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldl $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+cat build/confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end build/confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
< at >< at > -4667,7 +4702,7 < at >< at > fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
- cat >>confdefs.h <<_ACEOF
+ cat >>build/confdefs.h <<_ACEOF
#define HAVE_LIBDL 1
_ACEOF
< at >< at > -4702,8 +4737,8 < at >< at > if ${ac_cv_lib_dl_main+:} false; then :
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldl $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+cat build/confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end build/confdefs.h. */
int
< at >< at > -4726,7 +4761,7 < at >< at > fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_main" >&5
$as_echo "$ac_cv_lib_dl_main" >&6; }
if test "x$ac_cv_lib_dl_main" = xyes; then :
- cat >>confdefs.h <<_ACEOF
+ cat >>build/confdefs.h <<_ACEOF
#define HAVE_LIBDL 1
_ACEOF
< at >< at > -4741,8 +4776,8 < at >< at > if ${ac_cv_lib_socket_main+:} false; then :
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lsocket $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+cat build/confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end build/confdefs.h. */
int
< at >< at > -4765,7 +4800,7 < at >< at > fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_main" >&5
$as_echo "$ac_cv_lib_socket_main" >&6; }
if test "x$ac_cv_lib_socket_main" = xyes; then :
- cat >>confdefs.h <<_ACEOF
+ cat >>build/confdefs.h <<_ACEOF
#define HAVE_LIBSOCKET 1
_ACEOF
< at >< at > -4780,8 +4815,8 < at >< at > if ${ac_cv_lib_nsl_main+:} false; then :
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lnsl $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+cat build/confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end build/confdefs.h. */
int
< at >< at > -4804,7 +4839,7 < at >< at > fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_main" >&5
$as_echo "$ac_cv_lib_nsl_main" >&6; }
if test "x$ac_cv_lib_nsl_main" = xyes; then :
- cat >>confdefs.h <<_ACEOF
+ cat >>build/confdefs.h <<_ACEOF
#define HAVE_LIBNSL 1
_ACEOF
< at >< at > -4825,8 +4860,8 < at >< at > $as_echo_n "checking for $ac_hdr that defines DIR... " >&6; }
if eval \${$as_ac_Header+:} false; then :
$as_echo_n "(cached) " >&6
else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+ cat build/confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end build/confdefs.h. */
#include <sys/types.h>
#include <$ac_hdr>
< at >< at > -4850,7 +4885,7 < at >< at > eval ac_res=\$$as_ac_Header
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
- cat >>confdefs.h <<_ACEOF
+ cat >>build/confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
_ACEOF
< at >< at > -4866,8 +4901,8 < at >< at > if ${ac_cv_search_opendir+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_func_search_save_LIBS=$LIBS
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+cat build/confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end build/confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
< at >< at > -4923,8 +4958,8 < at >< at > if ${ac_cv_search_opendir+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_func_search_save_LIBS=$LIBS
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+cat build/confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end build/confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
< at >< at > -4980,8 +5015,8 < at >< at > $as_echo_n "checking for sys/wait.h that is POSIX.1 compatible... " >&6; }
if ${ac_cv_header_sys_wait_h+:} false; then :
$as_echo_n "(cached) " >&6
else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+ cat build/confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end build/confdefs.h. */
#include <sys/types.h>
#include <sys/wait.h>
#ifndef WEXITSTATUS
< at >< at > -5012,7 +5047,7 < at >< at > fi
$as_echo "$ac_cv_header_sys_wait_h" >&6; }
if test $ac_cv_header_sys_wait_h = yes; then
-$as_echo "#define HAVE_SYS_WAIT_H 1" >>confdefs.h
+$as_echo "#define HAVE_SYS_WAIT_H 1" >>build/confdefs.h
fi
< at >< at > -5021,8 +5056,8 < at >< at > $as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6
if ${ac_cv_header_time+:} false; then :
$as_echo_n "(cached) " >&6
else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+ cat build/confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end build/confdefs.h. */
#include <sys/types.h>
#include <sys/time.h>
#include <time.h>
< at >< at > -5047,7 +5082,7 < at >< at > fi
$as_echo "$ac_cv_header_time" >&6; }
if test $ac_cv_header_time = yes; then
-$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h
+$as_echo "#define TIME_WITH_SYS_TIME 1" >>build/confdefs.h
fi
< at >< at > -5056,8 +5091,8 < at >< at > $as_echo_n "checking whether stat file-mode macros are broken... " >&6; }
if ${ac_cv_header_stat_broken+:} false; then :
$as_echo_n "(cached) " >&6
else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+ cat build/confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end build/confdefs.h. */
#include <sys/types.h>
#include <sys/stat.h>
< at >< at > -5089,7 +5124,7 < at >< at > fi
$as_echo "$ac_cv_header_stat_broken" >&6; }
if test $ac_cv_header_stat_broken = yes; then
-$as_echo "#define STAT_MACROS_BROKEN 1" >>confdefs.h
+$as_echo "#define STAT_MACROS_BROKEN 1" >>build/confdefs.h
fi
< at >< at > -5101,7 +5136,7 < at >< at > cat >confcache <<\_ACEOF
# It is not useful on other systems. If it contains results you don't
# want to keep, you may remove or edit it.
#
-# config.status only pays attention to the cache file if you give it
+# build/config.status only pays attention to the cache file if you give it
# the --recheck option to rerun configure.
#
# `ac_cv_env_foo' variables (set or unset) will be overridden when
< at >< at > -5184,7 +5219,7 < at >< at > do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_cxx_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
- cat >>confdefs.h <<_ACEOF
+ cat >>build/confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
< at >< at > -5192,12 +5227,12 < at >< at > fi
done
-for ac_header in sys/file.h sys/ioctl.h sys/param.h sys/socket.h wchar.h sys/ptrace.h paths.h
+for ac_header in sys/file.h sys/ioctl.h sys/param.h sys/socket.h wchar.h sys/ptrace.h paths.h sys/prctl.h
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_cxx_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
- cat >>confdefs.h <<_ACEOF
+ cat >>build/confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
< at >< at > -5214,7 +5249,7 < at >< at > cat >confcache <<\_ACEOF
# It is not useful on other systems. If it contains results you don't
# want to keep, you may remove or edit it.
#
-# config.status only pays attention to the cache file if you give it
+# build/config.status only pays attention to the cache file if you give it
# the --recheck option to rerun configure.
#
# `ac_cv_env_foo' variables (set or unset) will be overridden when
< at >< at > -5299,18 +5334,19 < at >< at > rm -f confcache
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for path to OpenSSL" >&5
$as_echo_n "checking for path to OpenSSL... " >&6; }
+
# Check whether --with-openssl was given.
if test "${with_openssl+set}" = set; then :
- withval=$with_openssl; cf_with_openssl=$withval
+ withval=$with_openssl; with_openssl_path=$withval
else
- cf_with_openssl="auto"
-
+ with_openssl_path=auto
fi
+
cf_openssl_basedir=""
-if test "$cf_with_openssl" != "auto"; then
- cf_openssl_basedir="`echo ${cf_with_openssl} | sed 's/\/$//'`"
+if test "$with_openssl_path" != "auto"; then
+ cf_openssl_basedir="`echo ${with_openssl_path} | sed 's/\/$//'`"
else
for dirs in /usr/local/ssl /usr/pkg /usr/local /usr/local/openssl; do
if test -f "${dirs}/include/openssl/opensslv.h" ; then
< at >< at > -5351,8 +5387,8 < at >< at > LIBS="$LIBS $SSL_LIBS"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenSSL version" >&5
$as_echo_n "checking for OpenSSL version... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+cat build/confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end build/confdefs.h. */
#include <openssl/opensslv.h>
int
main ()
< at >< at > -5389,8 +5425,8 < at >< at > if ${ac_cv_lib_crypto_AES_encrypt+:} false; then :
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lcrypto $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+cat build/confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end build/confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
< at >< at > -5442,144 +5478,888 < at >< at > LIBS="$save_LIBS"
+cat >>build/confdefs.h <<_ACEOF
+#define EGG_SSL_EXT 1
+_ACEOF
-#AC_SUBST(ZLIB)dnl
+# TCL checks
-# Checks for typedefs, structures, and compiler characteristics
-ac_fn_cxx_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default"
-if test "x$ac_cv_type_pid_t" = xyes; then :
+# Tcl version to recommend if no Tcl is found, and the site where it can be
+# found for download.
+tclrecommendver="8.5.X"
+tclrecommendsite="ftp://tcl.activestate.com/pub/tcl/tcl8_5/"
-else
+# Tcl library filename prefixes, suffixes, and search paths.
+tcllibnames="tcl8.5 tcl85 tcl8.4 tcl84 tcl8.3 tcl83 tcl8.2 tcl82 \
+ tcl8.1 tcl81 tcl8.0 tcl80 tcl tcl7.6 tcl76 tcl7.5 tcl75 \
+ tcl7.4 tcl74 tcl7.3 tcl73 tcl7.2 tcl72 tcl7.1 tcl71 \
+ tcl7.0 tcl70"
-cat >>confdefs.h <<_ACEOF
-#define pid_t int
-_ACEOF
+tcllibextensions=".so .so.1 .so.1.0 .so.1.1 .so.1.2 .dll .dylib .sl .a"
-fi
+tcllibpaths="$HOME/lib $HOME/tcl/lib \
+ /usr/local/lib /usr/lib /lib /lib64 /usr/lib64 \
+ /usr/local/lib/tcl8.5 /usr/lib/tcl8.5 \
+ /usr/local/lib/tcl8.4 /usr/lib/tcl8.4 \
+ /usr/local/lib/tcl8.3 /usr/lib/tcl8.3 \
+ /usr/local/pkgs/tcl/lib /sys/lib /usr/pkg/lib \
+ /usr/i486-linuxaout/lib /beos/system/lib $HOME"
-ac_fn_cxx_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
-if test "x$ac_cv_type_size_t" = xyes; then :
+# Tcl header filenames and search paths.
+tclheadernames="tcl.h"
+tclheaderpaths="$HOME/include $HOME/tcl/include \
+ /usr/local/include /usr/include \
+ /usr/local/include/tcl8.5 /usr/include/tcl8.5 \
+ /usr/local/include/tcl8.4 /usr/include/tcl8.4 \
+ /usr/local/include/tcl8.3 /usr/include/tcl8.3 \
+ /usr/local/pkgs/tcl/include /sys/include \
+ /usr/pkg/lib /beos/system/include /beos/devel/include $HOME"
-else
-cat >>confdefs.h <<_ACEOF
-#define size_t unsigned int
-_ACEOF
+# Misc Tcl checks.
+
+# Check whether --with-tcllib was given.
+if test "${with_tcllib+set}" = set; then :
+ withval=$with_tcllib; tcllibname="$withval"
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5
-$as_echo_n "checking for uid_t in sys/types.h... " >&6; }
-if ${ac_cv_type_uid_t+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <sys/types.h>
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "uid_t" >/dev/null 2>&1; then :
- ac_cv_type_uid_t=yes
-else
- ac_cv_type_uid_t=no
+# Check whether --with-tclinc was given.
+if test "${with_tclinc+set}" = set; then :
+ withval=$with_tclinc; tclincname="$withval"
fi
-rm -f conftest*
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether TCL Script is enabled" >&5
+$as_echo_n "checking whether TCL Script is enabled... " >&6; }
+ # Check whether --enable-script-tcl was given.
+if test "${enable_script_tcl+set}" = set; then :
+ enableval=$enable_script_tcl;
+ enable_script_tcl=$enableval
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enableval" >&5
+$as_echo "$enableval" >&6; }
+
+else
+
+ # default if not given is ENABLED
+ if test "x$enableval" = "x"; then
+ enableval="yes"
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_uid_t" >&5
-$as_echo "$ac_cv_type_uid_t" >&6; }
-if test $ac_cv_type_uid_t = no; then
+ enable_script_tcl=$enableval
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enableval" >&5
+$as_echo "$enableval" >&6; }
-$as_echo "#define uid_t int" >>confdefs.h
+$as_echo "#define USE_SCRIPT_TCL 1" >>build/confdefs.h
-$as_echo "#define gid_t int" >>confdefs.h
fi
-#AC_C_CONST
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working volatile" >&5
-$as_echo_n "checking for working volatile... " >&6; }
-if ${ac_cv_c_volatile+:} false; then :
- $as_echo_n "(cached) " >&6
+ WARN=0
+ # Make sure either both or neither $tcllibname and $tclincname are set
+ if test "x$tcllibname" != x; then
+ if test "x$tclincname" = x; then
+ WARN=1
+ tcllibname=""
+ TCLLIB=""
+ TCLINC=""
+ fi
else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+ if test "x$tclincname" != x; then
+ WARN=1
+ tclincname=""
+ TCLLIB=""
+ TCLINC=""
+ fi
+ fi
-int
-main ()
-{
+ if test "$WARN" = 1; then
+ cat << 'EOF' >&2
+configure: WARNING:
-volatile int x;
-int * volatile y = (int *) 0;
-return !x && !y;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
- ac_cv_c_volatile=yes
+ You must specify both --with-tcllib and --with-tclinc for either to work.
+
+ configure will now attempt to autodetect both the Tcl library and header.
+
+EOF
+ fi
+
+
+ WARN=0
+ # Make sure either both or neither $TCLLIB and $TCLINC are set
+ if test "x$TCLLIB" != x; then
+ if test "x$TCLINC" = x; then
+ WARN=1
+ WVAR1=TCLLIB
+ WVAR2=TCLINC
+ TCLLIB=""
+ fi
else
- ac_cv_c_volatile=no
+ if test "x$TCLINC" != x; then
+ WARN=1
+ WVAR1=TCLINC
+ WVAR2=TCLLIB
+ TCLINC=""
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_volatile" >&5
-$as_echo "$ac_cv_c_volatile" >&6; }
-if test $ac_cv_c_volatile = no; then
-$as_echo "#define volatile /**/" >>confdefs.h
+ if test "$WARN" = 1; then
+ cat << EOF >&2
+configure: WARNING:
+
+ Environment variable $WVAR1 was set, but I did not detect ${WVAR2}.
+ Please set both TCLLIB and TCLINC correctly if you wish to use them.
+ configure will now attempt to autodetect both the Tcl library and header.
+
+EOF
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
-$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
-if ${ac_cv_c_bigendian+:} false; then :
- $as_echo_n "(cached) " >&6
+
+ # Look for Tcl library: if $tcllibname is set, check there first
+ if test "x$tcllibname" != x; then
+ if test -f "$tcllibname" && test -r "$tcllibname"; then
+ TCLLIB=`echo $tcllibname | sed 's%/[^/][^/]*$%%'`
+ TCLLIBFN=`$BASENAME $tcllibname | cut -c4-`
+ TCLLIBEXT=".`echo $TCLLIBFN | $AWK '{j=split($1, i, "."); print i[j]}'`"
+ TCLLIBFNS=`$BASENAME $tcllibname $TCLLIBEXT | cut -c4-`
else
- ac_cv_c_bigendian=unknown
- # See if we're dealing with a universal compiler.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#ifndef __APPLE_CC__
- not a universal capable compiler
- #endif
- typedef int dummy;
+ cat << EOF >&2
+configure: WARNING:
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+ The file '$tcllibname' given to option --with-tcllib is not valid.
-# Check for potential -arch flags. It is not universal unless
-# there are at least two -arch flags with different values.
-ac_arch=
-ac_prev=
-for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
- if test -n "$ac_prev"; then
- case $ac_word in
- i?86 | x86_64 | ppc | ppc64)
- if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
- ac_arch=$ac_word
- else
- ac_cv_c_bigendian=universal
- break
- fi
- ;;
- esac
- ac_prev=
- elif test "x$ac_word" = "x-arch"; then
- ac_prev=arch
+ configure will now attempt to autodetect both the Tcl library and header.
+
+EOF
+ tcllibname=""
+ tclincname=""
+ TCLLIB=""
+ TCLLIBFN=""
+ TCLINC=""
+ TCLINCFN=""
fi
- done
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- if test $ac_cv_c_bigendian = unknown; then
- # See if sys/param.h defines the BYTE_ORDER macro.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+
+
+ # Look for Tcl header: if $tclincname is set, check there first
+ if test "x$tclincname" != x; then
+ if test -f "$tclincname" && test -r "$tclincname"; then
+ TCLINC=`echo $tclincname | sed 's%/[^/][^/]*$%%'`
+ TCLINCFN=`$BASENAME $tclincname`
+ else
+ cat << EOF >&2
+configure: WARNING:
+
+ The file '$tclincname' given to option --with-tclinc is not valid.
+
+ configure will now attempt to autodetect both the Tcl library and header.
+
+EOF
+ tcllibname=""
+ tclincname=""
+ TCLLIB=""
+ TCLLIBFN=""
+ TCLINC=""
+ TCLINCFN=""
+ fi
+ fi
+
+
+ # Look for Tcl library: if $TCLLIB is set, check there first
+ if test "x$TCLLIBFN" = x && test "x$TCLLIB" != x; then
+ if test -d "$TCLLIB"; then
+ for tcllibfns in $tcllibnames; do
+ for tcllibext in $tcllibextensions; do
+ if test -r "${TCLLIB}/lib${tcllibfns}${tcllibext}"; then
+ TCLLIBFN="${tcllibfns}${tcllibext}"
+ TCLLIBEXT="$tcllibext"
+ TCLLIBFNS="$tcllibfns"
+ break 2
+ fi
+ done
+ done
+ fi
+
+ if test "x$TCLLIBFN" = x; then
+ cat << 'EOF' >&2
+configure: WARNING:
+
+ Environment variable TCLLIB was set, but incorrectly.
+ Please set both TCLLIB and TCLINC correctly if you wish to use them.
+
+ configure will now attempt to autodetect both the Tcl library and header.
+
+EOF
+ TCLLIB=""
+ TCLLIBFN=""
+ TCLINC=""
+ TCLINCFN=""
+ fi
+ fi
+
+
+ # Look for Tcl header: if $TCLINC is set, check there first
+ if test "x$TCLINCFN" = x && test "x$TCLINC" != x; then
+ if test -d "$TCLINC"; then
+ for tclheaderfn in $tclheadernames; do
+ if test -r "${TCLINC}/${tclheaderfn}"; then
+ TCLINCFN="$tclheaderfn"
+ break
+ fi
+ done
+ fi
+
+ if test "x$TCLINCFN" = x; then
+ cat << 'EOF' >&2
+configure: WARNING:
+
+ Environment variable TCLINC was set, but incorrectly.
+ Please set both TCLLIB and TCLINC correctly if you wish to use them.
+
+ configure will now attempt to autodetect both the Tcl library and header.
+
+EOF
+ TCLLIB=""
+ TCLLIBFN=""
+ TCLINC=""
+ TCLINCFN=""
+ fi
+ fi
+
+
+ if test "$enable_script_tcl" = "yes"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Tcl library" >&5
+$as_echo_n "checking for Tcl library... " >&6; }
+
+ # Attempt autodetect for $TCLLIBFN if it's not set
+ if test "x$TCLLIBFN" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: using ${TCLLIB}/lib${TCLLIBFN}" >&5
+$as_echo "using ${TCLLIB}/lib${TCLLIBFN}" >&6; }
+ else
+ for tcllibfns in $tcllibnames; do
+ for tcllibext in $tcllibextensions; do
+ for tcllibpath in $tcllibpaths; do
+ if test -r "${tcllibpath}/lib${tcllibfns}${tcllibext}"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: found ${tcllibpath}/lib${tcllibfns}${tcllibext}" >&5
+$as_echo "found ${tcllibpath}/lib${tcllibfns}${tcllibext}" >&6; }
+ TCLLIB="$tcllibpath"
+ TCLLIBFN="${tcllibfns}${tcllibext}"
+ TCLLIBEXT="$tcllibext"
+ TCLLIBFNS="$tcllibfns"
+ break 3
+ fi
+ done
+ done
+ done
+ fi
+
+ # Show if $TCLLIBFN wasn't found
+ if test "x$TCLLIBFN" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+ fi
+ fi
+
+
+
+
+
+ if test "$enable_script_tcl" = "yes"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Tcl header" >&5
+$as_echo_n "checking for Tcl header... " >&6; }
+
+ # Attempt autodetect for $TCLINCFN if it's not set
+ if test "x$TCLINCFN" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: using ${TCLINC}/${TCLINCFN}" >&5
+$as_echo "using ${TCLINC}/${TCLINCFN}" >&6; }
+ else
+ for tclheaderpath in $tclheaderpaths; do
+ for tclheaderfn in $tclheadernames; do
+ if test -r "${tclheaderpath}/${tclheaderfn}"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: found ${tclheaderpath}/${tclheaderfn}" >&5
+$as_echo "found ${tclheaderpath}/${tclheaderfn}" >&6; }
+ TCLINC="$tclheaderpath"
+ TCLINCFN="$tclheaderfn"
+ break 2
+ fi
+ done
+ done
+
+ # FreeBSD hack ...
+ if test "x$TCLINCFN" = x; then
+ for tcllibfns in $tcllibnames; do
+ for tclheaderpath in $tclheaderpaths; do
+ for tclheaderfn in $tclheadernames; do
+ if test -r "${tclheaderpath}/${tcllibfns}/${tclheaderfn}"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: found ${tclheaderpath}/${tcllibfns}/${tclheaderfn}" >&5
+$as_echo "found ${tclheaderpath}/${tcllibfns}/${tclheaderfn}" >&6; }
+ TCLINC="${tclheaderpath}/${tcllibfns}"
+ TCLINCFN="$tclheaderfn"
+ break 3
+ fi
+ done
+ done
+ done
+ fi
+ fi
+
+ TCL_INCLUDES=""
+ if ! test "x$TCLINC" = x; then
+ TCL_INCLUDES="-I$TCLINC"
+ fi
+
+ if test "x$TCLINCFN" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+ fi
+ fi
+
+
+
+
+
+ if test "$enable_script_tcl" = "yes"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the Tcl system has changed" >&5
+$as_echo_n "checking whether the Tcl system has changed... " >&6; }
+ egg_tcl_changed="yes"
+ egg_tcl_id="${TCLLIB}:${TCLLIBFN}:${TCLINC}:${TCLINCFN}"
+ if test "$egg_tcl_id" != ":::"; then
+ egg_tcl_cached="yes"
+ if ${egg_cv_var_tcl_id+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+
+ egg_cv_var_tcl_id="$egg_tcl_id"
+ egg_tcl_cached="no"
+
+fi
+
+ if test "$egg_tcl_cached" = yes; then
+ if test "x$egg_cv_var_tcl_id" = "x$egg_tcl_id"; then
+ egg_tcl_changed="no"
+ else
+ egg_cv_var_tcl_id="$egg_tcl_id"
+ fi
+ fi
+ fi
+
+ if test "$egg_tcl_changed" = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ fi
+ fi
+
+
+ if test "$enable_script_tcl" = "yes"; then
+ # Both TCLLIBFN & TCLINCFN must be set, or we bail
+ TCL_FOUND=0
+ if test "x$TCLLIBFN" != x && test "x$TCLINCFN" != x; then
+ TCL_FOUND=1
+
+ # Check Tcl's version
+ if test "$egg_tcl_changed" = yes; then
+ unset egg_cv_var_tcl_version
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Tcl version" >&5
+$as_echo_n "checking for Tcl version... " >&6; }
+ if ${egg_cv_var_tcl_version+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+
+ egg_cv_var_tcl_version=`grep TCL_VERSION $TCLINC/$TCLINCFN | $HEAD_1 | $AWK '{gsub(/\"/, "", $3); print $3}'`
+
+fi
+
+
+ if test "x$egg_cv_var_tcl_version" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $egg_cv_var_tcl_version" >&5
+$as_echo "$egg_cv_var_tcl_version" >&6; }
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+ TCL_FOUND=0
+ fi
+
+ # Check Tcl's patch level (if available)
+ if test "$egg_tcl_changed" = yes; then
+ unset egg_cv_var_tcl_patch_level
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Tcl patch level" >&5
+$as_echo_n "checking for Tcl patch level... " >&6; }
+ if ${egg_cv_var_tcl_patch_level+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+
+ eval "egg_cv_var_tcl_patch_level=`grep TCL_PATCH_LEVEL $TCLINC/$TCLINCFN | $HEAD_1 | $AWK '{gsub(/\"/, "", $3); print $3}'`"
+
+fi
+
+
+ if test "x$egg_cv_var_tcl_patch_level" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $egg_cv_var_tcl_patch_level" >&5
+$as_echo "$egg_cv_var_tcl_patch_level" >&6; }
+ else
+ egg_cv_var_tcl_patch_level="unknown"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown" >&5
+$as_echo "unknown" >&6; }
+ fi
+ fi
+
+ # Check if we found Tcl's version
+ if test "$TCL_FOUND" = 0; then
+ cat << 'EOF' >&2
+configure: error:
+
+ Tcl cannot be found on this system.
+
+ Tcl is not required. Wraith will be compiled without TCL support. If you
+ already have Tcl installed on this system, please specify the path by
+ rerunning ./configure using the --with-tcllib='/path/to/libtcl.so' and
+ --with-tclinc='/path/to/tcl.h' options.
+
+EOF
+ enable_script_tcl="no"
+ else
+
+$as_echo "#define HAVE_LIBTCL 1" >>build/confdefs.h
+
+ fi
+ fi
+
+
+ if test "$enable_script_tcl" = "yes"; then
+ # Is this version of Tcl too old for us to use ?
+ TCL_VER_PRE70=`echo $egg_cv_var_tcl_version | $AWK '{split($1, i, "."); if (i[1] < 7) print "yes"; else print "no"}'`
+ if test "$TCL_VER_PRE70" = yes; then
+ cat << EOF >&2
+configure: error:
+
+ Your Tcl version is much too old for Wraith to use. You should
+ download and compile a more recent version. The most reliable
+ current version is $tclrecommendver and can be downloaded from
+ ${tclrecommendsite}.
+
+ See doc/COMPILE-GUIDE's 'Tcl Detection and Installation' section
+ for more information.
+
+EOF
+ exit 1
+ fi
+ fi
+
+
+ # Set variables for Tcl library tests
+ TCL_TEST_LIB="$TCLLIBFNS"
+ TCL_TEST_OTHERLIBS="-L$TCLLIB $EGG_MATH_LIB"
+ if test "x$ac_cv_lib_pthread" != x; then
+ TCL_TEST_OTHERLIBS="$TCL_TEST_OTHERLIBS $ac_cv_lib_pthread"
+ fi
+
+
+ if test "$enable_script_tcl" = "yes"; then
+ if test "$egg_tcl_changed" = yes; then
+ unset egg_cv_var_tcl_free
+ fi
+
+ # Check for Tcl_Free()
+ as_ac_Lib=`$as_echo "ac_cv_lib_$TCL_TEST_LIB''_Tcl_Free" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Tcl_Free in -l$TCL_TEST_LIB" >&5
+$as_echo_n "checking for Tcl_Free in -l$TCL_TEST_LIB... " >&6; }
+if eval \${$as_ac_Lib+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-l$TCL_TEST_LIB $TCL_TEST_OTHERLIBS $LIBS"
+cat build/confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end build/confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char Tcl_Free ();
+int
+main ()
+{
+return Tcl_Free ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+ eval "$as_ac_Lib=yes"
+else
+ eval "$as_ac_Lib=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+eval ac_res=\$$as_ac_Lib
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
+ egg_cv_var_tcl_free="yes"
+else
+ egg_cv_var_tcl_free="no"
+fi
+
+
+ if test "$egg_cv_var_tcl_free" = yes; then
+
+$as_echo "#define HAVE_TCL_FREE 1" >>build/confdefs.h
+
+ fi
+ fi
+
+#EGG_TCL_CHECK_GETCURRENTTHREAD
+#EGG_TCL_CHECK_GETTHREADDATA
+
+ if test "$enable_script_tcl" = "yes"; then
+ if test "$egg_tcl_changed" = yes; then
+ unset egg_cv_var_tcl_setnotifier
+ fi
+
+ # Check for Tcl_SetNotifier()
+ as_ac_Lib=`$as_echo "ac_cv_lib_$TCL_TEST_LIB''_Tcl_SetNotifier" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Tcl_SetNotifier in -l$TCL_TEST_LIB" >&5
+$as_echo_n "checking for Tcl_SetNotifier in -l$TCL_TEST_LIB... " >&6; }
+if eval \${$as_ac_Lib+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-l$TCL_TEST_LIB $TCL_TEST_OTHERLIBS $LIBS"
+cat build/confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end build/confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char Tcl_SetNotifier ();
+int
+main ()
+{
+return Tcl_SetNotifier ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+ eval "$as_ac_Lib=yes"
+else
+ eval "$as_ac_Lib=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+eval ac_res=\$$as_ac_Lib
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
+ egg_cv_var_tcl_setnotifier="yes"
+else
+ egg_cv_var_tcl_setnotifier="no"
+fi
+
+ if test "$egg_cv_var_tcl_setnotifier" = yes; then
+
+$as_echo "#define HAVE_TCL_SETNOTIFIER 1" >>build/confdefs.h
+
+ fi
+ fi
+
+
+ if test "$enable_script_tcl" = "yes"; then
+ if test "$EGG_CYGWIN" = yes; then
+ TCL_REQS="${TCLLIB}/lib${TCLLIBFN}"
+ TCL_LIBS="-L$TCLLIB -l$TCLLIBFNS $EGG_MATH_LIB"
+ else
+ if test "$TCLLIBEXT" != ".a"; then
+ TCL_REQS="${TCLLIB}/lib${TCLLIBFN}"
+ TCL_LIBS="-L$TCLLIB -l$TCLLIBFNS $EGG_MATH_LIB"
+ else
+ # Set default make as static for unshared Tcl library
+ if test "$DEFAULT_MAKE" != static; then
+ cat << 'EOF' >&2
+configure: WARNING:
+
+ Your Tcl library is not a shared lib.
+ configure will now set default make type to static.
+
+EOF
+ DEFAULT_MAKE="static"
+
+ fi
+
+ # Are we using a pre 7.4 Tcl version ?
+ TCL_VER_PRE74=`echo $egg_cv_var_tcl_version | $AWK '{split($1, i, "."); if (((i[1] == 7) && (i[2] < 4)) || (i[1] < 7)) print "yes"; else print "no"}'`
+ if test "$TCL_VER_PRE74" = no; then
+
+ # Was the --with-tcllib option given ?
+ if test "x$tcllibname" != x; then
+ TCL_REQS="${TCLLIB}/lib${TCLLIBFN}"
+ TCL_LIBS="${TCLLIB}/lib${TCLLIBFN} $EGG_MATH_LIB"
+ else
+ TCL_REQS="${TCLLIB}/lib${TCLLIBFN}"
+ TCL_LIBS="-L$TCLLIB -l$TCLLIBFNS $EGG_MATH_LIB"
+ fi
+ else
+ cat << EOF >&2
+configure: WARNING:
+
+ Your Tcl version ($egg_cv_var_tcl_version) is older than 7.4.
+ There are known problems, but we will attempt to work around them.
+
+EOF
+ TCL_REQS="libtcle.a"
+ TCL_LIBS="-L`pwd` -ltcle $EGG_MATH_LIB"
+ fi
+ fi
+ fi
+ fi
+
+
+
+
+
+cat >confcache <<\_ACEOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs, see configure's option --config-cache.
+# It is not useful on other systems. If it contains results you don't
+# want to keep, you may remove or edit it.
+#
+# build/config.status only pays attention to the cache file if you give it
+# the --recheck option to rerun configure.
+#
+# `ac_cv_env_foo' variables (set or unset) will be overridden when
+# loading this file, other *unset* `ac_cv_foo' will be assigned the
+# following values.
+
+_ACEOF
+
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, we kill variables containing newlines.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+(
+ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
+ eval ac_val=\$$ac_var
+ case $ac_val in #(
+ *${as_nl}*)
+ case $ac_var in #(
+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+ esac
+ case $ac_var in #(
+ _ | IFS | as_nl) ;; #(
+ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+ *) { eval $ac_var=; unset $ac_var;} ;;
+ esac ;;
+ esac
+ done
+
+ (set) 2>&1 |
+ case $as_nl`(ac_space=' '; set) 2>&1` in #(
+ *${as_nl}ac_space=\ *)
+ # `set' does not quote correctly, so add quotes: double-quote
+ # substitution turns \\\\ into \\, and sed turns \\ into \.
+ sed -n \
+"s/'/'\\\\''/g;
+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+ ;; #(
+ *)
+ # `set' quotes correctly as required by POSIX, so do not add quotes.
+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+ ;;
+ esac |
+ sort
+) |
+ sed '
+ /^ac_cv_env_/b end
+ t clear
+ :clear
+ s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+ t end
+ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+ :end' >>confcache
+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
+ if test -w "$cache_file"; then
+ if test "x$cache_file" != "x/dev/null"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
+ if test ! -f "$cache_file" || test -h "$cache_file"; then
+cat confcache >"$cache_file"
+ else
+ case $cache_file in #(
+ */* | ?:*)
+ mv -f confcache "$cache_file"$$ &&
+ mv -f "$cache_file"$$ "$cache_file" ;; #(
+ *)
+ mv -f confcache "$cache_file" ;;
+esac
+ fi
+ fi
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+ fi
+fi
+rm -f confcache
+
+#AC_SUBST(ZLIB)dnl
+
+# Checks for typedefs, structures, and compiler characteristics
+ac_fn_cxx_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default"
+if test "x$ac_cv_type_pid_t" = xyes; then :
+
+else
+
+cat >>build/confdefs.h <<_ACEOF
+#define pid_t int
+_ACEOF
+
+fi
+
+ac_fn_cxx_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
+if test "x$ac_cv_type_size_t" = xyes; then :
+
+else
+
+cat >>build/confdefs.h <<_ACEOF
+#define size_t unsigned int
+_ACEOF
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5
+$as_echo_n "checking for uid_t in sys/types.h... " >&6; }
+if ${ac_cv_type_uid_t+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat build/confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end build/confdefs.h. */
+#include <sys/types.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "uid_t" >/dev/null 2>&1; then :
+ ac_cv_type_uid_t=yes
+else
+ ac_cv_type_uid_t=no
+fi
+rm -f conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_uid_t" >&5
+$as_echo "$ac_cv_type_uid_t" >&6; }
+if test $ac_cv_type_uid_t = no; then
+
+$as_echo "#define uid_t int" >>build/confdefs.h
+
+
+$as_echo "#define gid_t int" >>build/confdefs.h
+
+fi
+
+
+
+#AC_C_CONST
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working volatile" >&5
+$as_echo_n "checking for working volatile... " >&6; }
+if ${ac_cv_c_volatile+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat build/confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end build/confdefs.h. */
+
+int
+main ()
+{
+
+volatile int x;
+int * volatile y = (int *) 0;
+return !x && !y;
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+ ac_cv_c_volatile=yes
+else
+ ac_cv_c_volatile=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_volatile" >&5
+$as_echo "$ac_cv_c_volatile" >&6; }
+if test $ac_cv_c_volatile = no; then
+
+$as_echo "#define volatile /**/" >>build/confdefs.h
+
+fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
+$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
+if ${ac_cv_c_bigendian+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_c_bigendian=unknown
+ # See if we're dealing with a universal compiler.
+ cat build/confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end build/confdefs.h. */
+#ifndef __APPLE_CC__
+ not a universal capable compiler
+ #endif
+ typedef int dummy;
+
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+
+# Check for potential -arch flags. It is not universal unless
+# there are at least two -arch flags with different values.
+ac_arch=
+ac_prev=
+for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
+ if test -n "$ac_prev"; then
+ case $ac_word in
+ i?86 | x86_64 | ppc | ppc64)
+ if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
+ ac_arch=$ac_word
+ else
+ ac_cv_c_bigendian=universal
+ break
+ fi
+ ;;
+ esac
+ ac_prev=
+ elif test "x$ac_word" = "x-arch"; then
+ ac_prev=arch
+ fi
+ done
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ if test $ac_cv_c_bigendian = unknown; then
+ # See if sys/param.h defines the BYTE_ORDER macro.
+ cat build/confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end build/confdefs.h. */
#include <sys/types.h>
#include <sys/param.h>
< at >< at > -5598,8 +6378,8 < at >< at > main ()
_ACEOF
if ac_fn_cxx_try_compile "$LINENO"; then :
# It does; now see whether it defined to BIG_ENDIAN or not.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+ cat build/confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end build/confdefs.h. */
#include <sys/types.h>
#include <sys/param.h>
< at >< at > -5625,8 +6405,8 < at >< at > rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
if test $ac_cv_c_bigendian = unknown; then
# See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+ cat build/confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end build/confdefs.h. */
#include <limits.h>
int
< at >< at > -5642,8 +6422,8 < at >< at > main ()
_ACEOF
if ac_fn_cxx_try_compile "$LINENO"; then :
# It does; now see whether it defined to _BIG_ENDIAN or not.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+ cat build/confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end build/confdefs.h. */
#include <limits.h>
int
< at >< at > -5670,8 +6450,8 < at >< at > rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
# Compile a test program.
if test "$cross_compiling" = yes; then :
# Try to guess by grepping values from an object file.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+ cat build/confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end build/confdefs.h. */
short int ascii_mm[] =
{ 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
short int ascii_ii[] =
< at >< at > -5711,8 +6491,8 < at >< at > if ac_fn_cxx_try_compile "$LINENO"; then :
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+ cat build/confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end build/confdefs.h. */
$ac_includes_default
int
main ()
< at >< at > -5747,15 +6527,15 < at >< at > $as_echo "$ac_cv_c_bigendian" >&6; }
case $ac_cv_c_bigendian in #(
yes)
-$as_echo "#define B_ENDIAN 1" >>confdefs.h
+$as_echo "#define B_ENDIAN 1" >>build/confdefs.h
;; #(
no)
-$as_echo "#define L_ENDIAN 1" >>confdefs.h
+$as_echo "#define L_ENDIAN 1" >>build/confdefs.h
;; #(
universal)
-$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
+$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>build/confdefs.h
;; #(
*)
< at >< at > -5769,8 +6549,8 < at >< at > $as_echo_n "checking whether char is unsigned... " >&6; }
if ${ac_cv_c_char_unsigned+:} false; then :
$as_echo_n "(cached) " >&6
else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+ cat build/confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end build/confdefs.h. */
$ac_includes_default
int
main ()
< at >< at > -5792,7 +6572,7 < at >< at > fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_char_unsigned" >&5
$as_echo "$ac_cv_c_char_unsigned" >&6; }
if test $ac_cv_c_char_unsigned = yes && test "$GCC" != yes; then
- $as_echo "#define __CHAR_UNSIGNED__ 1" >>confdefs.h
+ $as_echo "#define __CHAR_UNSIGNED__ 1" >>build/confdefs.h
fi
< at >< at > -5807,7 +6587,7 < at >< at > cat >confcache <<\_ACEOF
# It is not useful on other systems. If it contains results you don't
# want to keep, you may remove or edit it.
#
-# config.status only pays attention to the cache file if you give it
+# build/config.status only pays attention to the cache file if you give it
# the --recheck option to rerun configure.
#
# `ac_cv_env_foo' variables (set or unset) will be overridden when
< at >< at > -5886,236 +6666,247 < at >< at > $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
fi
rm -f confcache
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of short" >&5
-$as_echo_n "checking size of short... " >&6; }
-if ${ac_cv_sizeof_short+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if ac_fn_cxx_compute_int "$LINENO" "(long int) (sizeof (short))" "ac_cv_sizeof_short" "$ac_includes_default"; then :
+# Checks for typedefs, structures, and compiler characteristics
+ac_fn_cxx_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default"
+if test "x$ac_cv_type_pid_t" = xyes; then :
else
- if test "$ac_cv_type_short" = yes; then
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (short)
-See \`config.log' for more details" "$LINENO" 5; }
- else
- ac_cv_sizeof_short=0
- fi
-fi
+
+cat >>build/confdefs.h <<_ACEOF
+#define pid_t int
+_ACEOF
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_short" >&5
-$as_echo "$ac_cv_sizeof_short" >&6; }
+ac_fn_cxx_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
+if test "x$ac_cv_type_size_t" = xyes; then :
+else
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_SHORT $ac_cv_sizeof_short
+cat >>build/confdefs.h <<_ACEOF
+#define size_t unsigned int
_ACEOF
+fi
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5
-$as_echo_n "checking size of int... " >&6; }
-if ${ac_cv_sizeof_int+:} false; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5
+$as_echo_n "checking for uid_t in sys/types.h... " >&6; }
+if ${ac_cv_type_uid_t+:} false; then :
$as_echo_n "(cached) " >&6
else
- if ac_fn_cxx_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int" "$ac_includes_default"; then :
+ cat build/confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end build/confdefs.h. */
+#include <sys/types.h>
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "uid_t" >/dev/null 2>&1; then :
+ ac_cv_type_uid_t=yes
else
- if test "$ac_cv_type_int" = yes; then
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (int)
-See \`config.log' for more details" "$LINENO" 5; }
- else
- ac_cv_sizeof_int=0
- fi
+ ac_cv_type_uid_t=no
fi
+rm -f conftest*
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5
-$as_echo "$ac_cv_sizeof_int" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_uid_t" >&5
+$as_echo "$ac_cv_type_uid_t" >&6; }
+if test $ac_cv_type_uid_t = no; then
+$as_echo "#define uid_t int" >>build/confdefs.h
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_INT $ac_cv_sizeof_int
-_ACEOF
+$as_echo "#define gid_t int" >>build/confdefs.h
+
+fi
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
-$as_echo_n "checking size of long... " >&6; }
-if ${ac_cv_sizeof_long+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for long long int" >&5
+$as_echo_n "checking for long long int... " >&6; }
+if ${ac_cv_type_long_long_int+:} false; then :
$as_echo_n "(cached) " >&6
else
- if ac_fn_cxx_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long" "$ac_includes_default"; then :
+ cat build/confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end build/confdefs.h. */
+
+ /* For now, do not test the preprocessor; as of 2007 there are too many
+ implementations with broken preprocessors. Perhaps this can
+ be revisited in 2012. In the meantime, code should not expect
+ #if to work with literals wider than 32 bits. */
+ /* Test literals. */
+ long long int ll = 9223372036854775807ll;
+ long long int nll = -9223372036854775807LL;
+ unsigned long long int ull = 18446744073709551615ULL;
+ /* Test constant expressions. */
+ typedef int a[((-9223372036854775807LL < 0 && 0 < 9223372036854775807ll)
+ ? 1 : -1)];
+ typedef int b[(18446744073709551615ULL <= (unsigned long long int) -1
+ ? 1 : -1)];
+ int i = 63;
+int
+main ()
+{
+/* Test availability of runtime routines for shift and division. */
+ long long int llmax = 9223372036854775807ll;
+ unsigned long long int ullmax = 18446744073709551615ull;
+ return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i)
+ | (llmax / ll) | (llmax % ll)
+ | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i)
+ | (ullmax / ull) | (ullmax % ull));
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+ if test "$cross_compiling" = yes; then :
+ ac_cv_type_long_long_int=yes
else
- if test "$ac_cv_type_long" = yes; then
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (long)
-See \`config.log' for more details" "$LINENO" 5; }
+ cat build/confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end build/confdefs.h. */
+#include <limits.h>
+ #ifndef LLONG_MAX
+ # define HALF \
+ (1LL << (sizeof (long long int) * CHAR_BIT - 2))
+ # define LLONG_MAX (HALF - 1 + HALF)
+ #endif
+int
+main ()
+{
+long long int n = 1;
+ int i;
+ for (i = 0; ; i++)
+ {
+ long long int m = n << i;
+ if (m >> i != n)
+ return 1;
+ if (LLONG_MAX / 2 < m)
+ break;
+ }
+ return 0;
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_run "$LINENO"; then :
+ ac_cv_type_long_long_int=yes
else
- ac_cv_sizeof_long=0
- fi
+ ac_cv_type_long_long_int=no
fi
-
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
-$as_echo "$ac_cv_sizeof_long" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_LONG $ac_cv_sizeof_long
-_ACEOF
-
-
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5
-$as_echo_n "checking size of long long... " >&6; }
-if ${ac_cv_sizeof_long_long+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if ac_fn_cxx_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long" "$ac_includes_default"; then :
else
- if test "$ac_cv_type_long_long" = yes; then
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (long long)
-See \`config.log' for more details" "$LINENO" 5; }
- else
- ac_cv_sizeof_long_long=0
+ ac_cv_type_long_long_int=no
fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_long_long_int" >&5
+$as_echo "$ac_cv_type_long_long_int" >&6; }
+ if test $ac_cv_type_long_long_int = yes; then
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_long" >&5
-$as_echo "$ac_cv_sizeof_long_long" >&6; }
+$as_echo "#define HAVE_LONG_LONG_INT 1" >>build/confdefs.h
+ fi
+ac_fn_c_find_intX_t "$LINENO" "8" "ac_cv_c_int8_t"
+case $ac_cv_c_int8_t in #(
+ no|yes) ;; #(
+ *)
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
+cat >>build/confdefs.h <<_ACEOF
+#define int8_t $ac_cv_c_int8_t
_ACEOF
+;;
+esac
+ac_fn_c_find_uintX_t "$LINENO" "8" "ac_cv_c_uint8_t"
+case $ac_cv_c_uint8_t in #(
+ no|yes) ;; #(
+ *)
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of size_t" >&5
-$as_echo_n "checking size of size_t... " >&6; }
-if ${ac_cv_sizeof_size_t+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if ac_fn_cxx_compute_int "$LINENO" "(long int) (sizeof (size_t))" "ac_cv_sizeof_size_t" "$ac_includes_default"; then :
-
-else
- if test "$ac_cv_type_size_t" = yes; then
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (size_t)
-See \`config.log' for more details" "$LINENO" 5; }
- else
- ac_cv_sizeof_size_t=0
- fi
-fi
+$as_echo "#define _UINT8_T 1" >>build/confdefs.h
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_size_t" >&5
-$as_echo "$ac_cv_sizeof_size_t" >&6; }
+cat >>build/confdefs.h <<_ACEOF
+#define uint8_t $ac_cv_c_uint8_t
+_ACEOF
+;;
+ esac
+ac_fn_c_find_intX_t "$LINENO" "16" "ac_cv_c_int16_t"
+case $ac_cv_c_int16_t in #(
+ no|yes) ;; #(
+ *)
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_SIZE_T $ac_cv_sizeof_size_t
+cat >>build/confdefs.h <<_ACEOF
+#define int16_t $ac_cv_c_int16_t
_ACEOF
+;;
+esac
+ac_fn_c_find_uintX_t "$LINENO" "16" "ac_cv_c_uint16_t"
+case $ac_cv_c_uint16_t in #(
+ no|yes) ;; #(
+ *)
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of ptrdiff_t" >&5
-$as_echo_n "checking size of ptrdiff_t... " >&6; }
-if ${ac_cv_sizeof_ptrdiff_t+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if ac_fn_cxx_compute_int "$LINENO" "(long int) (sizeof (ptrdiff_t))" "ac_cv_sizeof_ptrdiff_t" "$ac_includes_default"; then :
-else
- if test "$ac_cv_type_ptrdiff_t" = yes; then
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (ptrdiff_t)
-See \`config.log' for more details" "$LINENO" 5; }
- else
- ac_cv_sizeof_ptrdiff_t=0
- fi
-fi
+cat >>build/confdefs.h <<_ACEOF
+#define uint16_t $ac_cv_c_uint16_t
+_ACEOF
+;;
+ esac
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_ptrdiff_t" >&5
-$as_echo "$ac_cv_sizeof_ptrdiff_t" >&6; }
+ac_fn_c_find_intX_t "$LINENO" "32" "ac_cv_c_int32_t"
+case $ac_cv_c_int32_t in #(
+ no|yes) ;; #(
+ *)
+cat >>build/confdefs.h <<_ACEOF
+#define int32_t $ac_cv_c_int32_t
+_ACEOF
+;;
+esac
+ac_fn_c_find_uintX_t "$LINENO" "32" "ac_cv_c_uint32_t"
+case $ac_cv_c_uint32_t in #(
+ no|yes) ;; #(
+ *)
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_PTRDIFF_T $ac_cv_sizeof_ptrdiff_t
-_ACEOF
+$as_echo "#define _UINT32_T 1" >>build/confdefs.h
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of time_t" >&5
-$as_echo_n "checking size of time_t... " >&6; }
-if ${ac_cv_sizeof_time_t+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if ac_fn_cxx_compute_int "$LINENO" "(long int) (sizeof (time_t))" "ac_cv_sizeof_time_t" "$ac_includes_default"; then :
+cat >>build/confdefs.h <<_ACEOF
+#define uint32_t $ac_cv_c_uint32_t
+_ACEOF
+;;
+ esac
-else
- if test "$ac_cv_type_time_t" = yes; then
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (time_t)
-See \`config.log' for more details" "$LINENO" 5; }
- else
- ac_cv_sizeof_time_t=0
- fi
-fi
+ac_fn_c_find_intX_t "$LINENO" "64" "ac_cv_c_int64_t"
+case $ac_cv_c_int64_t in #(
+ no|yes) ;; #(
+ *)
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_time_t" >&5
-$as_echo "$ac_cv_sizeof_time_t" >&6; }
+cat >>build/confdefs.h <<_ACEOF
+#define int64_t $ac_cv_c_int64_t
+_ACEOF
+;;
+esac
+
+ac_fn_c_find_uintX_t "$LINENO" "64" "ac_cv_c_uint64_t"
+case $ac_cv_c_uint64_t in #(
+ no|yes) ;; #(
+ *)
+$as_echo "#define _UINT64_T 1" >>build/confdefs.h
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_TIME_T $ac_cv_sizeof_time_t
+cat >>build/confdefs.h <<_ACEOF
+#define uint64_t $ac_cv_c_uint64_t
_ACEOF
-
+;;
+ esac
< at >< at > -6124,8 +6915,8 < at >< at > $as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; }
if ${ac_cv_struct_tm+:} false; then :
$as_echo_n "(cached) " >&6
else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+ cat build/confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end build/confdefs.h. */
#include <sys/types.h>
#include <time.h>
< at >< at > -6150,7 +6941,7 < at >< at > fi
$as_echo "$ac_cv_struct_tm" >&6; }
if test $ac_cv_struct_tm = sys/time.h; then
-$as_echo "#define TM_IN_SYS_TIME 1" >>confdefs.h
+$as_echo "#define TM_IN_SYS_TIME 1" >>build/confdefs.h
fi
< at >< at > -6160,7 +6951,7 < at >< at > ac_fn_cxx_check_member "$LINENO" "struct tm" "tm_zone" "ac_cv_member_struct_tm_t
"
if test "x$ac_cv_member_struct_tm_tm_zone" = xyes; then :
-cat >>confdefs.h <<_ACEOF
+cat >>build/confdefs.h <<_ACEOF
#define HAVE_STRUCT_TM_TM_ZONE 1
_ACEOF
< at >< at > -6169,7 +6960,7 < at >< at > fi
if test "$ac_cv_member_struct_tm_tm_zone" = yes; then
-$as_echo "#define HAVE_TM_ZONE 1" >>confdefs.h
+$as_echo "#define HAVE_TM_ZONE 1" >>build/confdefs.h
else
ac_fn_cxx_check_decl "$LINENO" "tzname" "ac_cv_have_decl_tzname" "#include <time.h>
< at >< at > -6180,7 +6971,7 < at >< at > else
ac_have_decl=0
fi
-cat >>confdefs.h <<_ACEOF
+cat >>build/confdefs.h <<_ACEOF
#define HAVE_DECL_TZNAME $ac_have_decl
_ACEOF
< at >< at > -6189,8 +6980,8 < at >< at > $as_echo_n "checking for tzname... " >&6; }
if ${ac_cv_var_tzname+:} false; then :
$as_echo_n "(cached) " >&6
else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+ cat build/confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end build/confdefs.h. */
#include <time.h>
#if !HAVE_DECL_TZNAME
extern char *tzname[];
< at >< at > -6216,7 +7007,7 < at >< at > fi
$as_echo "$ac_cv_var_tzname" >&6; }
if test $ac_cv_var_tzname = yes; then
-$as_echo "#define HAVE_TZNAME 1" >>confdefs.h
+$as_echo "#define HAVE_TZNAME 1" >>build/confdefs.h
fi
fi
< at >< at > -6226,8 +7017,8 < at >< at > $as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; }
if ${ac_cv_struct_tm+:} false; then :
$as_echo_n "(cached) " >&6
else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+ cat build/confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end build/confdefs.h. */
#include <sys/types.h>
#include <time.h>
< at >< at > -6252,7 +7043,7 < at >< at > fi
$as_echo "$ac_cv_struct_tm" >&6; }
if test $ac_cv_struct_tm = sys/time.h; then
-$as_echo "#define TM_IN_SYS_TIME 1" >>confdefs.h
+$as_echo "#define TM_IN_SYS_TIME 1" >>build/confdefs.h
fi
< at >< at > -6262,7 +7053,7 < at >< at > for ac_header in vfork.h
do :
ac_fn_cxx_check_header_mongrel "$LINENO" "vfork.h" "ac_cv_header_vfork_h" "$ac_includes_default"
if test "x$ac_cv_header_vfork_h" = xyes; then :
- cat >>confdefs.h <<_ACEOF
+ cat >>build/confdefs.h <<_ACEOF
#define HAVE_VFORK_H 1
_ACEOF
< at >< at > -6275,7 +7066,7 < at >< at > do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_cxx_check_func "$LINENO" "$ac_func" "$as_ac_var"
if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
- cat >>confdefs.h <<_ACEOF
+ cat >>build/confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
< at >< at > -6291,8 +7082,8 < at >< at > else
if test "$cross_compiling" = yes; then :
ac_cv_func_fork_works=cross
else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+ cat build/confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end build/confdefs.h. */
$ac_includes_default
int
main ()
< at >< at > -6344,8 +7135,8 < at >< at > else
if test "$cross_compiling" = yes; then :
ac_cv_func_vfork_works=cross
else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+ cat build/confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end build/confdefs.h. */
/* Thanks to Paul Eggert for this test. */
$ac_includes_default
#include <sys/wait.h>
< at >< at > -6458,16 +7249,16 < at >< at > fi
if test "x$ac_cv_func_vfork_works" = xyes; then
-$as_echo "#define HAVE_WORKING_VFORK 1" >>confdefs.h
+$as_echo "#define HAVE_WORKING_VFORK 1" >>build/confdefs.h
else
-$as_echo "#define vfork fork" >>confdefs.h
+$as_echo "#define vfork fork" >>build/confdefs.h
fi
if test "x$ac_cv_func_fork_works" = xyes; then
-$as_echo "#define HAVE_WORKING_FORK 1" >>confdefs.h
+$as_echo "#define HAVE_WORKING_FORK 1" >>build/confdefs.h
fi
< at >< at > -6482,8 +7273,8 < at >< at > if test "$as_ln_s" = "ln -s" && ln -s conftest.file conftest.sym; then
if test "$cross_compiling" = yes; then :
ac_cv_func_lstat_dereferences_slashed_symlink=no
else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+ cat build/confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end build/confdefs.h. */
$ac_includes_default
int
main ()
< at >< at > -6519,7 +7310,7 < at >< at > $as_echo "$ac_cv_func_lstat_dereferences_slashed_symlink" >&6; }
test $ac_cv_func_lstat_dereferences_slashed_symlink = yes &&
-cat >>confdefs.h <<_ACEOF
+cat >>build/confdefs.h <<_ACEOF
#define LSTAT_FOLLOWS_SLASHED_SYMLINK 1
_ACEOF
< at >< at > -6541,8 +7332,8 < at >< at > else
if test "$cross_compiling" = yes; then :
ac_cv_func_lstat_empty_string_bug=yes
else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+ cat build/confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end build/confdefs.h. */
$ac_includes_default
int
main ()
< at >< at > -6573,7 +7364,7 < at >< at > if test $ac_cv_func_lstat_empty_string_bug = yes; then
esac
-cat >>confdefs.h <<_ACEOF
+cat >>build/confdefs.h <<_ACEOF
#define HAVE_LSTAT_EMPTY_STRING_BUG 1
_ACEOF
< at >< at > -6590,8 +7381,8 < at >< at > if test "$as_ln_s" = "ln -s" && ln -s conftest.file conftest.sym; then
if test "$cross_compiling" = yes; then :
ac_cv_func_lstat_dereferences_slashed_symlink=no
else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+ cat build/confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end build/confdefs.h. */
$ac_includes_default
int
main ()
< at >< at > -6627,7 +7418,7 < at >< at > $as_echo "$ac_cv_func_lstat_dereferences_slashed_symlink" >&6; }
test $ac_cv_func_lstat_dereferences_slashed_symlink = yes &&
-cat >>confdefs.h <<_ACEOF
+cat >>build/confdefs.h <<_ACEOF
#define LSTAT_FOLLOWS_SLASHED_SYMLINK 1
_ACEOF
< at >< at > -6645,7 +7436,7 < at >< at > for ac_header in stdlib.h
do :
ac_fn_cxx_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
if test "x$ac_cv_header_stdlib_h" = xyes; then :
- cat >>confdefs.h <<_ACEOF
+ cat >>build/confdefs.h <<_ACEOF
#define HAVE_STDLIB_H 1
_ACEOF
< at >< at > -6661,8 +7452,8 < at >< at > else
if test "$cross_compiling" = yes; then :
ac_cv_func_malloc_0_nonnull=no
else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+ cat build/confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end build/confdefs.h. */
#if defined STDC_HEADERS || defined HAVE_STDLIB_H
# include <stdlib.h>
#else
< at >< at > -6691,10 +7482,10 < at >< at > fi
$as_echo "$ac_cv_func_malloc_0_nonnull" >&6; }
if test $ac_cv_func_malloc_0_nonnull = yes; then :
-$as_echo "#define HAVE_MALLOC 1" >>confdefs.h
+$as_echo "#define HAVE_MALLOC 1" >>build/confdefs.h
else
- $as_echo "#define HAVE_MALLOC 0" >>confdefs.h
+ $as_echo "#define HAVE_MALLOC 0" >>build/confdefs.h
case " $LIBOBJS " in
*" malloc.$ac_objext "* ) ;;
< at >< at > -6703,7 +7494,7 < at >< at > else
esac
-$as_echo "#define malloc rpl_malloc" >>confdefs.h
+$as_echo "#define malloc rpl_malloc" >>build/confdefs.h
fi
< at >< at > -6717,7 +7508,7 < at >< at > do :
ac_fn_cxx_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
"
if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
- cat >>confdefs.h <<_ACEOF
+ cat >>build/confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
< at >< at > -6737,7 +7528,7 < at >< at > do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_cxx_check_func "$LINENO" "$ac_func" "$as_ac_var"
if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
- cat >>confdefs.h <<_ACEOF
+ cat >>build/confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
< at >< at > -6756,8 +7547,8 < at >< at > else
if test "$cross_compiling" = yes; then :
ac_cv_func_working_mktime=no
else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+ cat build/confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end build/confdefs.h. */
/* Test program from Paul Eggert and Tony Leneis. */
#ifdef TIME_WITH_SYS_TIME
# include <sys/time.h>
< at >< at > -6980,7 +7771,7 < at >< at > for ac_func in getpagesize
do :
ac_fn_cxx_check_func "$LINENO" "getpagesize" "ac_cv_func_getpagesize"
if test "x$ac_cv_func_getpagesize" = xyes; then :
- cat >>confdefs.h <<_ACEOF
+ cat >>build/confdefs.h <<_ACEOF
#define HAVE_GETPAGESIZE 1
_ACEOF
< at >< at > -6995,8 +7786,8 < at >< at > else
if test "$cross_compiling" = yes; then :
ac_cv_func_mmap_fixed_mapped=no
else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+ cat build/confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end build/confdefs.h. */
$ac_includes_default
/* malloc might have been renamed as rpl_malloc. */
#undef malloc
< at >< at > -7148,7 +7939,7 < at >< at > fi
$as_echo "$ac_cv_func_mmap_fixed_mapped" >&6; }
if test $ac_cv_func_mmap_fixed_mapped = yes; then
-$as_echo "#define HAVE_MMAP 1" >>confdefs.h
+$as_echo "#define HAVE_MMAP 1" >>build/confdefs.h
fi
rm -f conftest.mmap conftest.txt
< at >< at > -7157,7 +7948,7 < at >< at > for ac_header in stdlib.h
do :
ac_fn_cxx_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
if test "x$ac_cv_header_stdlib_h" = xyes; then :
- cat >>confdefs.h <<_ACEOF
+ cat >>build/confdefs.h <<_ACEOF
#define HAVE_STDLIB_H 1
_ACEOF
< at >< at > -7173,8 +7964,8 < at >< at > else
if test "$cross_compiling" = yes; then :
ac_cv_func_realloc_0_nonnull=no
else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+ cat build/confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end build/confdefs.h. */
#if defined STDC_HEADERS || defined HAVE_STDLIB_H
# include <stdlib.h>
#else
< at >< at > -7203,10 +7994,10 < at >< at > fi
$as_echo "$ac_cv_func_realloc_0_nonnull" >&6; }
if test $ac_cv_func_realloc_0_nonnull = yes; then :
-$as_echo "#define HAVE_REALLOC 1" >>confdefs.h
+$as_echo "#define HAVE_REALLOC 1" >>build/confdefs.h
else
- $as_echo "#define HAVE_REALLOC 0" >>confdefs.h
+ $as_echo "#define HAVE_REALLOC 0" >>build/confdefs.h
case " $LIBOBJS " in
*" realloc.$ac_objext "* ) ;;
< at >< at > -7215,7 +8006,7 < at >< at > else
esac
-$as_echo "#define realloc rpl_realloc" >>confdefs.h
+$as_echo "#define realloc rpl_realloc" >>build/confdefs.h
fi
< at >< at > -7228,8 +8019,8 < at >< at > else
if test "$cross_compiling" = yes; then :
ac_cv_func_stat_empty_string_bug=yes
else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+ cat build/confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end build/confdefs.h. */
$ac_includes_default
int
main ()
< at >< at > -7260,7 +8051,7 < at >< at > if test $ac_cv_func_stat_empty_string_bug = yes; then
esac
-cat >>confdefs.h <<_ACEOF
+cat >>build/confdefs.h <<_ACEOF
#define HAVE_STAT_EMPTY_STRING_BUG 1
_ACEOF
< at >< at > -7272,7 +8063,7 < at >< at > ac_fn_cxx_check_type "$LINENO" "struct timespec" "ac_cv_type_struct_timespec" "#
#include <time.h>
"
if test "x$ac_cv_type_struct_timespec" = xyes; then :
- $as_echo "#define HAVE_TIMESPEC 1" >>confdefs.h
+ $as_echo "#define HAVE_TIMESPEC 1" >>build/confdefs.h
fi
< at >< at > -7280,12 +8071,12 < at >< at > fi
if test X"$ac_cv_type_struct_timespec" != X"no"; then
ac_fn_cxx_check_member "$LINENO" "struct stat" "st_mtim" "ac_cv_member_struct_stat_st_mtim" "$ac_includes_default"
if test "x$ac_cv_member_struct_stat_st_mtim" = xyes; then :
- $as_echo "#define HAVE_ST_MTIM 1" >>confdefs.h
+ $as_echo "#define HAVE_ST_MTIM 1" >>build/confdefs.h
else
ac_fn_cxx_check_member "$LINENO" "struct stat" "st_mtimespec" "ac_cv_member_struct_stat_st_mtimespec" "$ac_includes_default"
if test "x$ac_cv_member_struct_stat_st_mtimespec" = xyes; then :
- $as_echo "#define HAVE_ST_MTIMESPEC 1" >>confdefs.h
+ $as_echo "#define HAVE_ST_MTIMESPEC 1" >>build/confdefs.h
fi
< at >< at > -7293,8 +8084,8 < at >< at > fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for two-parameter timespecsub" >&5
$as_echo_n "checking for two-parameter timespecsub... " >&6; }
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+ cat build/confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end build/confdefs.h. */
#include <sys/types.h>
#include <sys/time.h>
int
< at >< at > -7311,7 +8102,7 < at >< at > timespecsub(&ts1, &ts2);
}
_ACEOF
if ac_fn_cxx_try_compile "$LINENO"; then :
- $as_echo "#define HAVE_TIMESPECSUB2 1" >>confdefs.h
+ $as_echo "#define HAVE_TIMESPECSUB2 1" >>build/confdefs.h
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
< at >< at > -7326,7 +8117,7 < at >< at > for ac_func in strftime
do :
ac_fn_cxx_check_func "$LINENO" "strftime" "ac_cv_func_strftime"
if test "x$ac_cv_func_strftime" = xyes; then :
- cat >>confdefs.h <<_ACEOF
+ cat >>build/confdefs.h <<_ACEOF
#define HAVE_STRFTIME 1
_ACEOF
< at >< at > -7339,8 +8130,8 < at >< at > if ${ac_cv_lib_intl_strftime+:} false; then :
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lintl $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+cat build/confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end build/confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
< at >< at > -7369,7 +8160,7 < at >< at > fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_strftime" >&5
$as_echo "$ac_cv_lib_intl_strftime" >&6; }
if test "x$ac_cv_lib_intl_strftime" = xyes; then :
- $as_echo "#define HAVE_STRFTIME 1" >>confdefs.h
+ $as_echo "#define HAVE_STRFTIME 1" >>build/confdefs.h
LIBS="-lintl $LIBS"
fi
< at >< at > -7386,7 +8177,7 < at >< at > cat >confcache <<\_ACEOF
# It is not useful on other systems. If it contains results you don't
# want to keep, you may remove or edit it.
#
-# config.status only pays attention to the cache file if you give it
+# build/config.status only pays attention to the cache file if you give it
# the --recheck option to rerun configure.
#
# `ac_cv_env_foo' variables (set or unset) will be overridden when
< at >< at > -7469,7 +8260,7 < at >< at > do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_cxx_check_func "$LINENO" "$ac_func" "$as_ac_var"
if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
- cat >>confdefs.h <<_ACEOF
+ cat >>build/confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
< at >< at > -7481,7 +8272,7 < at >< at > do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_cxx_check_func "$LINENO" "$ac_func" "$as_ac_var"
if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
- cat >>confdefs.h <<_ACEOF
+ cat >>build/confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
< at >< at > -7496,7 +8287,7 < at >< at > cat >confcache <<\_ACEOF
# It is not useful on other systems. If it contains results you don't
# want to keep, you may remove or edit it.
#
-# config.status only pays attention to the cache file if you give it
+# build/config.status only pays attention to the cache file if you give it
# the --recheck option to rerun configure.
#
# `ac_cv_env_foo' variables (set or unset) will be overridden when
< at >< at > -7579,7 +8370,7 < at >< at > do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_cxx_check_func "$LINENO" "$ac_func" "$as_ac_var"
if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
- cat >>confdefs.h <<_ACEOF
+ cat >>build/confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
< at >< at > -7597,7 +8388,7 < at >< at > for ac_func in vsprintf
do :
ac_fn_cxx_check_func "$LINENO" "vsprintf" "ac_cv_func_vsprintf"
if test "x$ac_cv_func_vsprintf" = xyes; then :
- cat >>confdefs.h <<_ACEOF
+ cat >>build/confdefs.h <<_ACEOF
#define HAVE_VSPRINTF 1
_ACEOF
< at >< at > -7621,7 +8412,7 < at >< at > for ac_func in uname
do :
ac_fn_cxx_check_func "$LINENO" "uname" "ac_cv_func_uname"
if test "x$ac_cv_func_uname" = xyes; then :
- cat >>confdefs.h <<_ACEOF
+ cat >>build/confdefs.h <<_ACEOF
#define HAVE_UNAME 1
_ACEOF
< at >< at > -7664,7 +8455,7 < at >< at > cat >confcache <<\_ACEOF
# It is not useful on other systems. If it contains results you don't
# want to keep, you may remove or edit it.
#
-# config.status only pays attention to the cache file if you give it
+# build/config.status only pays attention to the cache file if you give it
# the --recheck option to rerun configure.
#
# `ac_cv_env_foo' variables (set or unset) will be overridden when
< at >< at > -7747,7 +8538,7 < at >< at > rm -f confcache
VERSION=`grep "char" $srcdir/src/main.c | $AWK '/egg_version/ {print $5}' | sed -e 's/\"//g' | sed -e 's/\;//g'`
version_num=`echo $VERSION | $AWK 'BEGIN {FS = "."} {printf("%d%02d%02d", $1, $2, $3)}'`
-cat >>confdefs.h <<_ACEOF
+cat >>build/confdefs.h <<_ACEOF
#define EGG_VERSION $version_num
_ACEOF
< at >< at > -7817,12 +8608,11 < at >< at > $as_echo X"$mf" |
fi
fi
echo "include .deps/$base.Po" >> "$dirpart/.deps/includes"
- echo "_$base.c:" >> "$dirpart/.deps/includes"
done
done
-ac_config_files="$ac_config_files Makefile lib/Makefile src/Makefile src/compat/Makefile src/crypto/Makefile src/mod/Makefile src/buildinfo.h"
+ac_config_files="$ac_config_files Makefile lib/Makefile src/Makefile src/compat/Makefile src/crypto/Makefile src/mod/Makefile src/buildinfo.h src/mod/mod.mk"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
< at >< at > -7831,7 +8621,7 < at >< at > cat >confcache <<\_ACEOF
# It is not useful on other systems. If it contains results you don't
# want to keep, you may remove or edit it.
#
-# config.status only pays attention to the cache file if you give it
+# build/config.status only pays attention to the cache file if you give it
# the --recheck option to rerun configure.
#
# `ac_cv_env_foo' variables (set or unset) will be overridden when
< at >< at > -7935,7 +8725,7 < at >< at > LTLIBOBJS=$ac_ltlibobjs
-: "${CONFIG_STATUS=./config.status}"
+: "${CONFIG_STATUS=./build/config.status}"
ac_write_fail=0
ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
< at >< at > -7947,7 +8737,7 < at >< at > cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
# Generated by $as_me.
# Run this file to recreate the current configuration.
# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
+# configure, is in build/config.log if it exists.
debug=false
ac_cs_recheck=false
< at >< at > -8367,7 +9157,7 < at >< at > esac
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-# Files that config.status was made for.
+# Files that build/config.status was made for.
config_files="$ac_config_files"
config_headers="$ac_config_headers"
< at >< at > -8405,12 +9195,12 < at >< at > _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-config.status
+build/config.status
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
Copyright (C) 2010 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
+This build/config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
ac_pwd='$ac_pwd'
< at >< at > -8508,7 +9298,7 < at >< at > fi
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-exec 5>>config.log
+exec 5>>build/config.log
{
echo
sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
< at >< at > -8527,7 +9317,7 < at >< at > cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
for ac_config_target in $ac_config_targets
do
case $ac_config_target in
- "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
+ "src/config.h") CONFIG_HEADERS="$CONFIG_HEADERS src/config.h" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
"src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
< at >< at > -8535,6 +9325,7 < at >< at > do
"src/crypto/Makefile") CONFIG_FILES="$CONFIG_FILES src/crypto/Makefile" ;;
"src/mod/Makefile") CONFIG_FILES="$CONFIG_FILES src/mod/Makefile" ;;
"src/buildinfo.h") CONFIG_FILES="$CONFIG_FILES src/buildinfo.h" ;;
+ "src/mod/mod.mk") CONFIG_FILES="$CONFIG_FILES src/mod/mod.mk" ;;
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac
< at >< at > -8579,7 +9370,7 < at >< at > ac_tmp=$tmp
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
-# This happens for instance with `./config.status config.h'.
+# This happens for instance with `./build/config.status config.h'.
if test -n "$CONFIG_FILES"; then
< at >< at > -8737,21 +9528,21 < at >< at > fi # test -n "$CONFIG_FILES"
# Set up the scripts for CONFIG_HEADERS section.
# No need to generate them if there are no CONFIG_HEADERS.
-# This happens for instance with `./config.status Makefile'.
+# This happens for instance with `./build/config.status Makefile'.
if test -n "$CONFIG_HEADERS"; then
cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
BEGIN {
_ACEOF
-# Transform confdefs.h into an awk script `defines.awk', embedded as
-# here-document in config.status, that substitutes the proper values into
+# Transform build/confdefs.h into an awk script `defines.awk', embedded as
+# here-document in build/config.status, that substitutes the proper values into
# config.h.in to produce config.h.
-# Create a delimiter string that does not exist in confdefs.h, to ease
+# Create a delimiter string that does not exist in build/confdefs.h, to ease
# handling of long lines.
ac_delim='%!_!# '
for ac_last_try in false false :; do
- ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
+ ac_tt=`sed -n "/$ac_delim/p" build/confdefs.h`
if test -z "$ac_tt"; then
break
elif $ac_last_try; then
< at >< at > -8801,7 +9592,7 < at >< at > d
:bsnlc
s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
b cont
-' <confdefs.h | sed '
+' <build/confdefs.h | sed '
s/'"$ac_delim"'/"\\\
"/g' >>$CONFIG_STATUS || ac_write_fail=1
< at >< at > -8889,7 +9680,7 < at >< at > do
# Let's still pretend it is `configure' which instantiates (i.e., don't
# use $as_me), people would be surprised to read:
- # /* config.h. Generated by config.status. */
+ # /* config.h. Generated by build/config.status. */
configure_input='Generated from '`
$as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
`' by configure.'
< at >< at > -9091,13 +9882,13 < at >< at > test $ac_write_fail = 0 ||
as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
-# configure is writing to config.log, and then calls config.status.
-# config.status does its own redirection, appending to config.log.
-# Unfortunately, on DOS this fails, as config.log is still kept open
-# by configure, so config.status won't be able to write to it; its
+# configure is writing to build/config.log, and then calls build/config.status.
+# build/config.status does its own redirection, appending to build/config.log.
+# Unfortunately, on DOS this fails, as build/config.log is still kept open
+# by configure, so build/config.status won't be able to write to it; its
# output is simply discarded. So we exec the FD to /dev/null,
-# effectively closing config.log, so it can be properly (re)opened and
-# appended to by config.status. When coming back to configure, we
+# effectively closing build/config.log, so it can be properly (re)opened and
+# appended to by build/config.status. When coming back to configure, we
# need to make the FD available again.
if test "$no_create" != yes; then
ac_cs_success=:
< at >< at > -9106,7 +9897,7 < at >< at > if test "$no_create" != yes; then
ac_config_status_args="$ac_config_status_args --quiet"
exec 5>/dev/null
$SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
- exec 5>>config.log
+ exec 5>>build/config.log
# Use ||, not &&, to avoid exiting from the if with $? = 1, which
# would make configure fail if this is the last instruction.
$ac_cs_success || as_fn_exit 1
< at >< at > -9139,13 +9930,21 < at >< at > if [ "$GIT_REQUIRED" = "1" ]; then
fi
-echo ""
-echo ""
-echo "------------ Configuring BDLIB ------------"
if test -d .git; then
git submodule init
git submodule update
fi
-test -f lib/bdlib/configure && cd lib/bdlib && MAKEJOBS="$MAKEJOBS" ./configure
+
+CXX="$CXX" TCL_INCLUDES="$TCL_INCLUDES" SSL_INCLUDES="$SSL_INCLUDES" SED="$SED" src/generate_defs.sh
+
+if [ $? -ne 0 ]; then
+ exit 1
+fi
+
+
+echo ""
+echo ""
+echo "------------ Configuring BDLIB ------------"
+test -f lib/bdlib/configure && cd lib/bdlib && CXX="$CXX" MAKEJOBS="$MAKEJOBS" ./configure
diff --git a/doc/UPDATES b/doc/UPDATES
index 9fb1ff5..2177230 100755
--- a/doc/UPDATES
+++ b/doc/UPDATES
< at >< at > -1,3 +1,58 < at >< at >
+1.4.0 - http://wraith.botpack.net/milestone/1.4.0
+ * Updated server list, 'set -yes servers -' and 'set -yes servers6 -' to get new list.
+ * Change +bitch reaction to use normal queue for deopping opper/opped clients
+ * Fix +take clearing -fastop (fixes #371)
+ * Added botbitch to mmode (fixes #139)
+ * Added SSL support
+ This includes new set options: 'servers-ssl', 'servers6-ssl', 'server-port-ssl', 'server-use-ssl'
+ * libcrypto (openssl) is now loaded at startup and is required.
+ * Added TCL support. This is *only* a .tcl command currently, no scripts are loadable yet.
+ * Fix blowfish not working correctly on 64bit
+ * Suicide will now remove all bots related to the binary being removed (fixes #435)
+ * FiSH message support added.
+ * FiSH support for DH1080 key-exchange. 'keyx' command added to start from bot, and responds to key-exchanges.
+ * Auto FiSH key-exchange when accepting users via callerid (controllable with set 'fish-auto-keyx')
+ * Automatic re-key exchange after every message to avoid replay attacks (controllable with set 'fish-paranoid')
+ * Set FiSH key via cmd_setkey and 'chanset fish-key'
+ * Bot expires key exchange if there's no response in 7 seconds.
+ * Bot expires key-exchanged keys after 60 minutes.
+ * When 'mdop' protection is on, re-op all previously opped clients automatically.
+ * When 'mop' protection is on, deop all previously regular clients automatically.
+ * Add './wraith -V' which will display the packconfig that the bot is using.
+ * Add cmd_newhub for adding a new hub. All bots will add this to their config.
+ * Hubs can now be overridden inside the botconfig (-C)
+ * Optimize userfile writing by doing it asynchronously
+ * Groups support added. See: http://wraith.botpack.net/wiki/Groups
+ * Add [bot]set var 'groups' to configure what groups bots are in
+ * Add chanset 'groups' to take a list of groups that should join. 'chanset #chan groups { main backup }'
+ * Added group support to 'botcmd': 'botcmd [*|&|?] %group cmd'
+ * 'botjoin' and 'botpart' have been removed. Just use .+chan, .chanset, .botset to control groups.
+ * Add command 'groups' to list all groups and which bots are in them.
+ * Command 'channels' now accepts a '%group' param to show which channels a group are in.
+ * Add '%group' support to 'bots' command.
+ * Improve output of 'bots' command by displaying and sorting nodename
+ * Minus chrec if .chattr set no flags
+ * Added 'chanset +floodban' to ban clients that violate 'flood-chan' and 'flood-ctcp'
+ * Bots now auto-reop other bots that get deopped
+ * Bots now ask for ops quicker if another bot is opped
+ * Bots now request/join +ilk channels much quicker
+ * Add 'chanset revenge' which will react/kick/ban/remove users who kick/ban/deop bots.
+ * Fix flood kicking not properly tracking multiple clients at once (#43)
+ * Add chanset 'flood-bytes' to count how many bytes:second a user sends before getting kicked for flood. (#42)
+ * Bot will now lockdown channel (+im) if banlist becomes full (#37)
+ * Bot will now lockdown channel (+im) if a drone flood is detected (#37)
+ * Add chansets 'flood-mchan', 'flood-mbytes', 'flood-mctcp' to control reactions to mass floods (#37)
+ * Remove unneeded chanset 'nomassjoin'
+ * Add chanset 'caps-limit' to handle % of message that can be in caps before kick (#8)
+ * Add chanset 'color-limit' to handle how many color codes are allowed in a message before kick (#8)
+ * Add chanset 'closed-exempt' which will allow exempting non-users (who are opped or voice) from being kicked. (fixes #171)
+ * Tweak limit range checking such that bot will set limit less often
+ * Bots now again respect devoices made by other bots and will not revoice those users.
+ * Add chanset 'voice-moderate' which will auto set +m in '+voice' channel and devoice flooding clients instead of kick. (#48)
+ * Bots now will enforce devoices made by ops (user +o) and allow any op (user +o) to revoice to disable that enforcement.
+ This used to use +m to enforce/allowed revoicing.
+ * Bots will now remember a client's flood/devoice settings if they cycle (#49)
+
1.3.4 - http://wraith.botpack.net/milestone/1.3.4
* Fix various compile warnings with newer GCC
* Fix bot getting confused when changing to long nicks
diff --git a/doc/help.txt b/doc/help.txt
index 304bdfc..efb82b2 100644
--- a/doc/help.txt
+++ b/doc/help.txt
< at >< at > -56,7 +56,7 < at >< at > See also: invites, -invite, stick, unstick
have no flags, an optional hostmask, and a random pass/secpass.
List as many hosts as needed.
-See also: -user, +host, -host, clearhosts%{+ni}, newleaf%{-}
+See also: -user, +host, -host, clearhosts%{+ni}, newleaf%{-}%{+a}, newhub%{-}
::-ban
### $b-ban$b <banmask or number> [channel]
Removes the specified ban from the list of bans stored on the bot. You may
< at >< at > -68,7 +68,7 < at >< at > See also: bans, +ban, stick, unstick
This is exactly the same as $b'%d-user'$b (it removes a user record). It is
included for convenience.
-See also: +user, -user%{+n}, newleaf%{-}
+See also: +user, -user%{+ni}, newleaf%{-}%{+a}, newhub%{-}
::-chan
### $b-chan$b <channel>
This removes ALL information about a channel from the bot.
< at >< at > -121,7 +121,7 < at >< at > See also: invites, +invite, stick, unstick
### $b-user$b <handle> [anotherhandle] ...
Removes the specified handles user records.
-See also: +user%{+ai}, -bot%{-}%{+nai}, newleaf%{-}
+See also: +user%{+ai}, -bot%{-}%{+ni}, newleaf%{-}%{+a}, newhub%{-}
::about:
### $babout$b
If you feel you are missing from the list feel free to contact bryan.
< at >< at > -235,7 +235,7 < at >< at > See also: -ban, +ban, console%{+m|m}, chanset, chaninfo%{-}, stick, unstick
one. You can also specify a bot, and attempt to boot someone from another
bot on the botnet. You cannot boot a bot owner.
:hub:botcmd:
-### $bbotcmd$b <bot> <cmd> [params]
+### $bbotcmd$b <bot|*|?|&> [%%group] <cmd> [params]
The specified cmd and optional parameters are executed on the specified bot,
all results are displayed back on DCC. For example:
[19:29] #bryan# botcmd wtest whom ...
< at >< at > -253,6 +253,7 < at >< at > See also: -ban, +ban, console%{+m|m}, chanset, chaninfo%{-}, stick, unstick
Just using '?' for 'bot' will choose a random leaf bot.
Just using '&' for 'bot' will do the cmd on all localhub bots. (first bot in config).
+ Use '%%group' to match a specific group. (see also: '%dhelp set')
This cmd cannot be chained over the botnet, ie, no: '%dbotcmd [bot] botcmd [bot2] ...'
< at >< at > -261,15 +262,6 < at >< at > See also: -ban, +ban, console%{+m|m}, chanset, chaninfo%{-}, stick, unstick
bl -> botcmd ?
See also: cmdpass
-::botjoin
-### $bbotjoin$b <bot> <channel> [options]
- Adds a channel to the bot's channel list. If options are specified, the
- channel will be configured with the options.
-
- $bTHIS CMD IS CURRENTLY EXPERIMENTAL AND WILL NOT ACTUALLY SAVE STATE$b
- $bMEANING, ALL BOTS WILL JOIN EVENTUALLY AFTER DOING BOTJOIN$b
-
-See also: botpart, +chan, -chan, chanset, chaninfo
:hub:botjump:
### $bbotjump$b <bot> [server [port [pass]]]
Makes the bot jump to another server. If you don't specify a
< at >< at > -291,13 +283,8 < at >< at > See also: msg%{+n}
The specified bot will display its current nick over DCC.
See also: netnick, nick
-::botpart
-### $bbotpart$b <bot> <channel>
- Removes bot from the specified channel
-
-See also: botjoin, +chan, -chan, chanset, chaninfo
:hub:bots
-### $bbots$b [nodename]
+### $bbots$b [nodename|%group]
Shows the list of bots currently on the botnet.
Example:
Bots: cEvin, ruthie, Killa1
< at >< at > -305,9 +292,10 < at >< at > See also: botjoin, +chan, -chan, chanset, chaninfo
bot. %{+n}Use $b'%dwho'$b or $b'%dbottree'$b for that information.%{-}
Specifying a nodename will display all bots up/down on that nodename.
- Bots with a * preceding its name ares down.
+ Bots with a * preceding its name are down.
+ Specifying a %%group will only show bots in that group.
-See also: downbots%{+n}, bottree%{-}
+See also: groups, downbots%{+n}, bottree%{-}
:hub:botserver:
### $bbotserver$b <bot>
The bot will display its current server and lag over DCC.
< at >< at > -338,7 +326,7 < at >< at > See also: set
Red: localhubs (first bot in binary, see '%dhelp conf')
Other: normal leaf bots
-See also: bots, downbots
+See also: bots, downbots, groups
::botversion:
### $bbotversion$b <bot>
The bot will display its pack version and uname.
< at >< at > -354,13 +342,17 < at >< at > See also: version, netversion, about%{+m|m}, status%{-}
and update all bots instead.
%{-}
-See also: link
+See also: link%{+a}, newhub%{-}
::chaninfo
### $bchaninfo$b <channel>
This lists all the settings for the bot on the given channel.
It shows any of the following:
- $bchanmode$b These modes are enforced on the channel. Both + and -
- modes can be enforced.
+ $bchanmode$b These modes are enforced on the channel.
+ Both + and - modes can be enforced. Use {} to
+ add a key. '%dchanset #chan chanmode { +nt key }'
+ $bgroups$b List of groups that should join the channel.
+ Use {} to add multiple groups. See also '%dhelp set'
+ '%dchanset #chan groups { main alt }'
%{+m|m}
$bauto-delay$b Amount of seconds to wait before auto opping,
or auto voicing a client based on flags or
< at >< at > -377,6 +369,12 < at >< at > See also: link
enforce +p as well. The point is to notice the chan
and bots when an /invite is done. This is useful in
seeing when a shell is hijacked ;)
+ $bcaps-limit$b If this is set, any +f bots will kick a client for using
+ too many caps. This is a percentage (0-100) of how much of
+ their message can be caps before being kicked.
+ $bcolor-limit$b If this is set, any +f bot will kick the client for
+ excess color codes. The setting is how many color/bold
+ character codes the message may contain before being kicked.
$bban-time$b Set here how long temporary bans will last (in
minutes). If you set this setting to 0, the bot will
never remove them. (This also requires +dynamicbans)
< at >< at > -416,9 +414,17 < at >< at > See also: link
None/0 Stick to regular checking (+x)
Op/1 Ops are exempt from flood checks
Voice/2 Voices are exempt from flood checks
+ $bclosed-exempt$b Should clients be exempt from +closed kicks based
+ on their channel status?
+ Valid values are:
+ None/0 Stick to regular user checking (+o)
+ Op/1 Ops are exempt from +closed kicks
+ Voice/2 Voices are exempt from +closed kicks
$bflood-lock-time$b How long in seconds to keep the channel locked
during drone floods.
+ $bfish-key$b The key to use for FiSH encryption. Use '{ key }'
+ to set and '{}' to unset.
$binvite-time$b Set here how long temporary invites will last (in
minutes). If you set this setting to 0, the bot will
< at >< at > -431,18 +437,23 < at >< at > See also: link
channel is +protect.
$bvoice-non-ident$b If channel is +voice, clients without an ident will
be voiced. Set to 0 to not voice clients without ident.
+ $bvoice-moderate$b If channel is +voice, auto set +m and devoice flooders
+ instead of kicking them. Set to 0 to disable.
The following options choose how to respond to specific events.
Each can be set as any of the specified options.
ignore/0 Ignore
- deop/1 Deop (chattr +d)
- kick/2 Kick (chattr +k)
+ deop/1 Chattr user +d (deop)
+ kick/2 Chattr user +k (auto kickban)
delete/remove/3 Remove user
-
+ react/4 React and punish the client, but don't add or modify
+ their user flags.
+ These events trigger the bot to react with the above option.
$bbad-cookie$b Missing or invalid cookie in bot op line.
- $bmanop$b Users who op manually.
- $bmdop$b Users who mass deop.
- $bmop$b Users who mass op in a -mop chan.
+ $bmanop$b Manual op.
+ $bmdop$b Mass deop.
+ $bmop$b Mass op.
+ $brevenge$b Client kicking/banning/deopping another bot.
The following can be set + or - (e.g. '%dchanset #channel -enforcebans')
$bautoop$b Bots that are +y will auto-op all users with
< at >< at > -465,7 +476,8 < at >< at > See also: link
more secure and the chances of someone hijacking the bot
for ops in your channel are much less. This is
highly recommeneded to always be set.
-
+ $bfloodban$b If a channel flood (public, notice or ctcp) is detected, the
+ flooder will also be banned, in accordance with ban-type.
$binactive$b This prevents the bot from joining the channel (or
makes it leave the channel if it is already there). It
can be useful to make the bot leave a channel without
< at >< at > -476,9 +488,6 < at >< at > See also: link
the bot from fighting with services such as ChanServ, or
from kicking IRCops when setting channel modes without
having ops.
- $bnomassjoin$b If more than 6 clients join in 1 second, set +im
- for 2 minutes. (Could be triggered from net-split
- rejoin if clients hop servers and change nicks)
$bprivate$b This by far is probably the single most unique and
important feature of this pack. With this set, users with
global +o will not implicitly have access to the channel.
< at >< at > -499,11 +508,12 < at >< at > See also: link
$btake$b Once a bot is opped, it will mass op all other bots
in the channel. After that, they will all attempt to
mass deop in hopes 'taking' the channel. :)
- $bvoice$b This feature is somewhat experimental. With it set
- the +y bot will voice ALL people who join the channel
- unless they are +q globally or +q for the channel.
- If a botnet master devoices them, they will remain
- devoiced no matter who voices them.
+ $bvoice$b With this set, the +y bot will voice ALL clients
+ that join the channel, whether they are a user or not.
+ It will still keep +q|q users devoiced. Any client
+ devoiced by a user op (+o) will remain devoiced even
+ if they cycle. See also: 'voice-non-ident' and
+ 'voice-moderate'
$bvoicebitch$b Enforce voices in a +bitch style. Only +v users
will be allowed to be voiced. This does take +private
into mind as well.
< at >< at > -543,6 +553,9 < at >< at > See also: link
$bflood-chan$b Set here how many channel messages in how many seconds
from one host constitutes a flood. Setting this to 0 or 0:0
disables text flood protection for the channel.
+ $bflood-bytes$b Set here how many bytes in how many seconds from one
+ host constitutes a flood. Setting this to 0 or 0:0
+ disables text flood protection for the channel.
$bflood-ctcp$b Set here how many channel ctcps in how many seconds from
one host constitutes a flood. Setting this to 0 or 0:0
disables ctcp flood protection for the channel.
< at >< at > -558,8 +571,21 < at >< at > See also: link
$bflood-nick$b Set here how many nick changes in how many seconds from
one host constitutes a flood. Setting this to 0 or 0:0
disables nick flood protection for the channel.
+ The following settings will trigger a lockdown (chanmode +mi) for 'flood-lock-time'
+ seconds. Unlike the other flood-* settings, these will trigger on $bmultiple$b clients.
+ They are for catching mass floods.
$bflood-mjoin$b Set how many joins in how many seconds before triggering
- a lockdown for mass join. ($bnomassjoin$b must be set).
+ a lockdown for mass join. Setting this to 0 or 0:0 disables mass
+ join protection for the channel.
+ $bflood-mchan$b Set here how many channel messages in how many seconds
+ from any host constitutes a flood. Setting this to 0 or 0:0
+ disables text flood protection for the channel.
+ $bflood-mbytes$b Set here how many bytes in how many seconds from any
+ host constitutes a flood. Setting this to 0 or 0:0
+ disables text flood protection for the channel.
+ $bflood-mctcp$b Set here how many channel ctcps in how many seconds from
+ any host constitutes a flood. Setting this to 0 or 0:0
+ disables ctcp flood protection for the channel.
These can all be changed simultaneously with $bflood-*$b
See also: %{-}%{+n}+chan, -chan%{-}%{+m|m}, chanset%{-}
< at >< at > -592,13 +618,14 < at >< at > See also: %{-}%{+n}+chan, -chan%{-}%{+m|m}, chanset%{-}
See also: status, whois
::channels:
-### $bchannels$b %{+m}[user]%{-}
+### $bchannels$b %{+m}[user|%group]%{-}
Displays channels that you have access to, and any important
flags that are set on them.
%{+m}
Masters: You can specify other users to see what channels their
flags grant them access to.%{-}
-See also: whois%{+m}, chattr, chaninfo%{-}
+ Special %%group to see what channels a particular group is in.
+See also: whois%{+m}, chattr, chaninfo, groups%{-}
::chanset
### $bchanset$b [#&!+channel|*|default] <settings>
Allows you to change the channel settings (see $b'chaninfo'$b for the
< at >< at > -649,8 +676,8 < at >< at > See also: whois
:hub:checkchannels
### $bcheckchannels$b
This will make all leaf bots display which channels they are currently
- not in but *should* be in. This command will not show channels which
- the bot is not active in due to '$bbotpart$b'.
+ not in but *should* be in. This will only shows channels that contain
+ the groups the bot are in.
See also: botcmd, channels, channel, status
:hub:chhandle
< at >< at > -775,7 +802,7 < at >< at > See also: console, echo, login, page, strip
if you change any of the following:
$bhomedir$b, $bbinpath$b, $bbinname$b, $bportmin$b, $bportmax$b
-See also: newleaf
+See also: newleaf, newhub
::console:
### $bconsole$b [channel] [modes]
Changes your console level so that you will see only the types of console
< at >< at > -964,7 +991,7 < at >< at > See also: cycle
Example:
Down bots: cEvin, ruthie, Killa1
-See also: bots
+See also: bots, groups
:leaf:dump
### $bdump$b <text>
dumps the text to the server. keep in mind that this bot doesn't
< at >< at > -1061,6 +1088,13 < at >< at > See also: -exempt, +exempt, console%{+m|m}, chanset, chaninfo%{-}, stick, unstic
specified, your console channel is used.
See also: console, channels%{+m}, status%{-}
+:hub:groups
+### $bgroups$b [bot]
+ Shows the list of groups and which bots are in them.
+
+ Specify a bot to only show which groups it is in.
+
+See also: bots, downbots%{+n}, bottree%{-}
::handle
### $bhandle$b <new-handle>
Changes your handle on the bot. This is the handle (nickname) that the
< at >< at > -1191,6 +1225,11 < at >< at > See also: console, invite
Jumping servers ALWAYS makes the bot lose ops! be careful!
See also: botjump, servers, botserver
+:leaf:keyx
+### $bkeyx$b <nick>
+ Initiaite DH1080 key-exchange with nick for FiSH protocol.
+
+%{+m}See also: setkey%{-}
:leaf:kick
### $bkick$b [channel|*] <nickname> [reason]
Will kick a user off your current console channel (or specified
< at >< at > -1243,7 +1282,7 < at >< at > See also: netlag
Attempts to link to another hub. This command is deprecated and not
recommended for use.
-See also: unlink, newleaf%{+a}, -bot%{-}
+See also: unlink%{+ni}, newleaf%{-}%{+a}, newhub, -bot%{-}
::login
### $blogin$b <banner|bots|channels|whom> [on/off]
Sets various login options.
< at >< at > -1307,7 +1346,7 < at >< at > See also: randstring, sha1, sha256, hash, encrypt, encrypt_fish, decrypt, decryp
Performs an action on the party line. This appears as "* bryan is leaving",
etc.
:leaf:mmode:
-### $bmmode$b <(+|-)MODE> <#channel> <a|o|v|d|r> [bots=n] [alines=n] [slines=n] [overlap=n] [bitch] [simul] [local]
+### $bmmode$b <(+|-)MODE> <#channel> <a|o|v|d|r> [bots=n] [alines=n] [slines=n] [overlap=n] [bitch] [botbitch] [simul] [local]
For those of us who do not wish to be rocket scientists in the mass mode department,
a simple '%dmmode -o #channel o' will suffice.
< at >< at > -1325,6 +1364,7 < at >< at > See also: randstring, sha1, sha256, hash, encrypt, encrypt_fish, decrypt, decryp
$br$b = $bregulars (-ov).$b
$bbitch$b - set +bitch after finished with mmode.
+ $bbotbitch$b - set +bitch after finished with mmode.
$bsimul$b - Simulates the mmode. IE: Gives you a practice run, will show who
does what in the dcc chat window.
$blocal$b - Modes will not be distributed: Ran on local bot only.
< at >< at > -1427,6 +1467,11 < at >< at > See also: botversion, version, about%{+m|m}, status%{-}
the results over DCC.
See also: w
+:hub:newhub:
+### $bnewhub$b <handle> <address> <port> [hublevel]
+ Add a new hub to the net.
+
+See also: chaddr, newleaf
:hub:newleaf:
### $bnewleaf$b <handle> [hostmask] [anotherhostmask] ...
Adds a new leaf to the botnet with the specified handle and hostname.
< at >< at > -1434,6 +1479,8 < at >< at > See also: w
The binary config botline will also be outputted, but should be
checked for correctness.
+
+%{+a}See also: newhub%{-}
::newpass
### $bnewpass$b <password|rand>
Changes your password on the bot. This is similar to the '/msg <bot> pass'
< at >< at > -1514,7 +1561,7 < at >< at > See also: restart
The local bot must, however, have a bot record for the bot you wish to
relay to. Typing '%dquit' or "*bye*" on a line by itself will end the relay.
-See also: bots%{+n}, newleaf%{-}%{+a}, -bot%{-}
+See also: bots%{+n}, newleaf%{-}%{+a}, newhub, -bot%{-}
:leaf:release
### $brelease$b
Releases the bot's nick if it is on the jupenick. It gives an estimated
< at >< at > -1616,6 +1663,10 < at >< at > See also: reload, backup
after the alias is expanded.
$bAliases may not reference other aliases.$b
[N] $bserver-port$b Default port to use for server connections.
+[N] $bserver-port-ssl$b Default port to use for SSL server connections.
+[B] $bserver-use-ssl$b Use SSL for IRC server connections?
+
+
[B] $bauth-chan$b If set, auth cmds will work in channels as well as in msg, otherwise
only in msg.
[S] $bauth-key$b The authkey used during authing. Give to users if they need to auth.
< at >< at > -1648,12 +1699,14 < at >< at > See also: reload, backup
[D] $bhijack$b How to handle when a commonly used hijack method attempt is detected.
[L] $bservers$b Comma-separated list of servers the bot will use.
+[L] $bservers-ssl$b Comma-separated list of SSL servers to use if server-use-ssl is true.
[L] $bservers6$b Comma-separated list of servers the bot will use (FOR IPv6).
+[L] $bservers6-ssl$b Comma-separated list of IPv6 SSL servers to use if server-use-ssl is true.
[N] $bmsgburst$b How many messages to burst at once to server. (Too high will excess flood)
[N] $bmsgrate$b How often (msecs) to dequeue msgs to the server. Only used on
non-ratbox servers. Too small a value can result in Excess Flood.
-
+[L] $bgroups$b List of groups that the affected bots are a part of.
[L] $brbl-servers$b Servers to use for RBL checking in channels that are +rbl.
[S] $brealname$b The bot's "real name" when connecting. (supports '$n' expansion)
< at >< at > -1665,6 +1718,11 < at >< at > See also: reload, backup
[B] $bcallerid$b Run bot in CALLERID mode. This is commonly known as +g on most
servers. +c bots will automatically accept messages from
known users. Note that this will break msg-ident.
+[B] $bfish-auto-keyx$b Whether to automatically do a DH1010 FiSH Key exchange when
+ accepting users. This is only supported if using callerid.
+
+[B] $bfish-paranoid$b Whether to automatically re-keyexchange after every message. This
+ mitigates replay attacks.
[S] $baltchars$b Define string of characters to cycle when generating alternative
nicks when nick is taken. Ie: _-`[].
< at >< at > -1716,6 +1774,14 < at >< at > See also: reload, backup
'%dbotset wraith nick -'
See also: botset
+:leaf:setkey
+### $bsetkey$b <nick> [key|rand]
+
+ Sets the FiSH key for the given target.
+ Use no key to clear the currently set key.
+ Use 'rand' to generate a random key.
+
+See also: keyx
::sha1
### $bsha1$b <string>
Returns the SHA1 hash of the specified string.
< at >< at > -1838,6 +1904,9 < at >< at > See also: die, conf, botcmd
-Users will not see channels that are +s or +p unless they have op access there
See also: find
+::tcl
+### $btcl$b script
+ Executes the given string and returns the result.
:leaf:topic
### $btopic$b <text>
Changes the channel's topic, assuming the bot is a chanop or the
< at >< at > -1874,7 +1943,7 < at >< at > See also: dump
to unlink them. If "*" is specified as the parameter, all bots will be
unlinked.
-See also: %{+n}link, %{-}bots, downbots%{+n}, newleaf, bottree%{-}
+See also: %{+n}link, %{-}bots, downbots%{+n}, newleaf, bottree%{-}%{+a}, newhub%{-}
::unstick
### $bunstick$b [ban/exempt/invite] <hostmask/number> [channel]
Makes a "sticky" ban, exempt, or invite normal again.
diff --git a/doc/responses.txt b/doc/responses.txt
index b6a6f3a..52b295e 100755
--- a/doc/responses.txt
+++ b/doc/responses.txt
< at >< at > -157,7 +157,7 < at >< at >
what's the rush?
next time you do that, i'll kick you again
and I thought you were a catcher
-:mean
+:revenge
hey! that wasn't very nice!
don't fuck with my pals
don't touch my buddies like that queer
diff --git a/doc/settings.txt b/doc/settings.txt
index ae00e32..12787fd 100644
--- a/doc/settings.txt
+++ b/doc/settings.txt
< at >< at > -1,6 +1,7 < at >< at >
:alias
bc botcmd
bl botcmd ?
+gc botcmd *
bm botmsg
bs botset
op botcmd ? op
< at >< at > -52,18 +53,25 < at >< at > irc.choopa.net
irc.efnet.nl
irc.inet.tele.dk
irc.ipv6.homelien.no
-irc.paraphysics.net
+irc.ipv6.paraphysics.net
irc.underworld.no
:servers_ssl
efnet.xs4all.nl
-irc.choopa.ca
-irc.choopa.net
-irc.eversible.com
+irc.choopa.ca:9999
+irc.choopa.net:9999
+irc.eversible.com:9999
irc.paraphysics.net
-irc.servercentral.net
-irc.shoutcast.com
-irc.umich.edu
+irc.servercentral.net:9999
+irc.shoutcast.com:8000
+irc.umich.edu:9999
+irc.underworld.no
+
+:servers6_ssl
+efnet.ipv6.xs4all.nl
+irc.choopa.ca:9999
+irc.choopa.net:9999
+irc.ipv6.paraphysics.net
irc.underworld.no
:rbl
diff --git a/lib/bdlib b/lib/bdlib
index 8b67eea..dfc80a8 160000
--- a/lib/bdlib
+++ b/lib/bdlib
< at >< at > -1 +1 < at >< at >
-Subproject commit 8b67eea164bf2869a393b1ec7aa78208c460799e
+Subproject commit dfc80a8a59cb7f903473a7008cc584ed6384befc
diff --git a/src/.gitignore b/src/.gitignore
index e7ec4c6..f93a970 100644
--- a/src/.gitignore
+++ b/src/.gitignore
< at >< at > -1,11 +1,13 < at >< at >
/Makefile
/buildinfo.h
+/*.c.real
/_*.c
/*~
/help.h
/response.h
/responses.h
/.deps
+/.defs
/stringfix
/makehelp
/sorthelp
diff --git a/src/Makefile.in b/src/Makefile.in
index c54508f..bdfc4f6 100755
--- a/src/Makefile.in
+++ b/src/Makefile.in
< at >< at > -4,13 +4,14 < at >< at > SHELL = < at >SHELL< at >
top_srcdir = < at >top_srcdir< at >
srcdir = < at >srcdir< at >
VPATH = < at >srcdir< at >
-depcomp = /bin/sh $(top_srcdir)/autotools/depcomp
< at >SET_MAKE< at >
-CXXFLAGS = < at >CXXFLAGS< at > -I.. -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/pack < at >DEFS< at > $(CFLGS) '-DCOMMIT="$(COMMIT)"' '-DBRANCH="$(BRANCH)"' -DBUILDTS=$(BUILDTS) '-DVERSION="$(VERSION)"'
+CXXFLAGS = < at >CXXFLAGS< at > -I. -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/pack < at >DEFS< at > $(INCLUDES) $(CFLGS) '-DCOMMIT="$(COMMIT)"' '-DBRANCH="$(BRANCH)"' -DBUILDTS=$(BUILDTS) '-DVERSION="$(VERSION)"'
CPPFLAGS = < at >CPPFLAGS< at >
+depcomp = /bin/sh $(top_srcdir)/build/autotools/depcomp
+
OBJCOPY = < at >OBJCOPY< at >
OBJS = auth.o \
< at >< at > -29,17 +30,22 < at >< at > OBJS = auth.o \
dcc.o \
dccutil.o \
debug.o \
+dl.o \
egg_timer.o \
enclink.o \
EncryptedStream.o \
flags.o \
garble.o \
+libcrypto.o \
+libssl.o \
+libtcl.o \
log.o \
main.o \
match.o \
misc.o \
misc_file.o \
net.o \
+openssl.o \
adns.o \
response.o \
rfc1459.o \
< at >< at > -70,25 +76,25 < at >< at > blah:
makeres: makeres.c ../lib/bdlib/src/libbdlib.a
< at >echo -e "Compiling: \033[1mmakeres\033[0m"
-< at >$(CXX) $(CXXFLAGS) -I$(top_srcdir) -I$(top_srcdir)/pack $(CPPFLAGS) makeres.c ../lib/bdlib/src/libbdlib.a -o makeres
+< at >$(CXX) $(CXXFLAGS) -I$(top_srcdir)/src -I$(top_srcdir)/pack $(CPPFLAGS) makeres.c ../lib/bdlib/src/libbdlib.a -o makeres
< at >$(STRIP) makeres< at >EXEEXT< at >
makeset: makeset.c ../lib/bdlib/src/libbdlib.a
< at >echo -e "Compiling: \033[1mmakeset\033[0m"
-< at >$(CXX) $(CXXFLAGS) -I$(top_srcdir) -I$(top_srcdir)/pack $(CPPFLAGS) makeset.c ../lib/bdlib/src/libbdlib.a -o makeset
+< at >$(CXX) $(CXXFLAGS) -I$(top_srcdir)/src -I$(top_srcdir)/pack $(CPPFLAGS) makeset.c ../lib/bdlib/src/libbdlib.a -o makeset
< at >$(STRIP) makeset< at >EXEEXT< at >
makehelp: makehelp.c ../lib/bdlib/src/libbdlib.a
< at >echo -e "Compiling: \033[1mmakehelp\033[0m"
-< at >$(CXX) $(CXXFLAGS) -I$(top_srcdir) -I$(top_srcdir)/pack $(CPPFLAGS) makehelp.c ../lib/bdlib/src/libbdlib.a -o makehelp
+< at >$(CXX) $(CXXFLAGS) -I$(top_srcdir)/src -I$(top_srcdir)/pack $(CPPFLAGS) makehelp.c ../lib/bdlib/src/libbdlib.a -o makehelp
< at >$(STRIP) makehelp< at >EXEEXT< at >
sorthelp: sorthelp.c ../lib/bdlib/src/libbdlib.a
< at >echo -e "Compiling: \033[1msorthelp\033[0m"
-< at >$(CXX) $(CXXFLAGS) -I$(top_srcdir) -I$(top_srcdir)/pack $(CPPFLAGS) sorthelp.c ../lib/bdlib/src/libbdlib.a -o sorthelp
+< at >$(CXX) $(CXXFLAGS) -I$(top_srcdir)/src -I$(top_srcdir)/pack $(CPPFLAGS) sorthelp.c ../lib/bdlib/src/libbdlib.a -o sorthelp
< at >$(STRIP) sorthelp< at >EXEEXT< at >
-stringfix: stringfix.c common.h ../config.h eggdrop.h
+stringfix: stringfix.c common.h config.h eggdrop.h
< at >echo -e "Compiling: \033[1mstringfix\033[0m"
< at >$(CXX) $(CXXFLAGS) -I$(top_srcdir) -I$(top_srcdir)/pack $(CPPFLAGS) stringfix.c -o stringfix
< at >$(STRIP) stringfix< at >EXEEXT< at >
< at >< at > -124,14 +130,15 < at >< at > mycrypto:
include ./.deps/includes
-.SUFFIXES:
-.SUFFIXES: .c .h .o
-
-.c.o: stringfix
-< at >echo -e "Compiling: \033[1m`basename $< .c`\033[0m"
-< at >./stringfix< at >EXEEXT< at > $< _$< || cp -f $< _$<
-source='$<' object='$< at >' depfile='.deps/$*.Po' tmpdepfile='.deps/$*.TPo' depmode=$(CCDEPMODE) $(depcomp) \
-$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c _$< -o `basename $< .c`.o
-
-#safety hash
-
+%.o: %.c stringfix< at >EXEEXT< at > $(top_srcdir)/build/cc1plus
+< at >echo -e "Compiling: \033[1m$*\033[0m"
+ifeq ($(CCDEPMODE),gcc3)
+if STRINGFIX='$(top_srcdir)/$(STRINGFIX)' $(CXX) -MT '$< at >' -MD -MP -MF '.deps/$*.TPo' -DSTRINGFIX=$(STRINGFIX) -B$(top_srcdir)/build $(CXXFLAGS) $(CPPFLAGS) -c $< -o $< at >; then \
+mv '.deps/$*.TPo' '.deps/$*.Po'; \
+else rm -f '.deps/$*.Tpo'; exit 1; \
+fi
+else
+# STRINGFIX included after CXX for ccache to recognize
+STRINGFIX="$(top_srcdir)/$(STRINGFIX)" libtool=no source='$<' object='$< at >' depfile='.deps/$*.Po' tmpdepfile='.deps/$*.TPo' depmode=$(CCDEPMODE) $(depcomp) \
+$(CXX) -DSTRINGFIX=$(STRINGFIX) -B$(top_srcdir)/build $(CXXFLAGS) $(CPPFLAGS) -c $< -o $< at >
+endif
diff --git a/src/binary.c b/src/binary.c
index 67b3bfb..8c5de68 100755
--- a/src/binary.c
+++ b/src/binary.c
< at >< at > -38,6 +38,8 < at >< at >
#include "botnet.h"
#include "net.h"
#include "userrec.h"
+#include <bdlib/src/Array.h>
+#include <bdlib/src/String.h>
#include <sys/wait.h>
#include <sys/types.h>
< at >< at > -50,9 +52,9 < at >< at >
settings_t settings = {
SETTINGS_HEADER,
/* -- STATIC -- */
- "", "", "", "", "", "", "", "", "",
+ "", "", "", "", "", "", "", "", "", "",
/* -- DYNAMIC -- */
- "", "", "", "", "", "", "", "", "",
+ "", "", "", "", "", "", "", "", "", "",
/* -- PADDING */
""
};
< at >< at > -431,6 +433,33 < at >< at > readcfg(const char *cfgfile, bool read_stdin)
return 1;
}
+void writecfg() {
+ const char salt1[] = SALT1;
+ const char salt2[] = SALT2;
+ bd::Array<bd::String> owners(bd::String(settings.owners).split(","));
+ bd::Array<bd::String> hubs(bd::String(settings.hubs).split(","));
+
+ printf("PACKNAME %s\n", settings.packname);
+ // Display the shellhash as salted-sha1 if it is not already
+ bd::String shellhash(settings.shellhash);
+ printf("BINARYPASS %s\n", (shellhash.length() == 40 || shellhash.length() == 47) ? shellhash.c_str() : salted_sha1(shellhash.c_str()));
+ printf("DCCPREFIX %s\n", settings.dcc_prefix);
+ for (size_t i = 0; i < owners.length(); ++i) {
+ bd::Array<bd::String> ownerInfo(static_cast<bd::String>(owners[i]).split(" "));
+ // Ensure the pass is salted-sha1
+ const size_t ownerPassLength = static_cast<bd::String>(ownerInfo[1]).length();
+ if (ownerPassLength != 40 && ownerPassLength != 47) {
+ ownerInfo[1] = bd::String(salted_sha1(static_cast<bd::String>(ownerInfo[1]).c_str()));
+ }
+ printf("OWNER %s\n", ownerInfo.join(" ").c_str());
+ }
+ for (size_t i = 0; i < hubs.length(); ++i) {
+ printf("HUB %s\n", static_cast<bd::String>(hubs[i]).c_str());
+ }
+ printf("SALT1 %s\n", salt1);
+ printf("SALT2 %s\n", salt2);
+}
+
static void edpack(settings_t *incfg, const char *in_hash, int what)
{
char *tmp = NULL, *hash = (char *) in_hash, nhash[51] = "";
< at >< at > -490,6 +519,7 < at >< at > static void edpack(settings_t *incfg, const char *in_hash, int what)
/* -- DYNAMIC -- */
dofield(incfg->dynamic_initialized);
+ dofield(incfg->conf_hubs);
dofield(incfg->bots);
dofield(incfg->uid);
dofield(incfg->autocron);
< at >< at > -523,6 +553,7 < at >< at > tellconfig(settings_t *incfg)
// dofield(incfg->salt2);
// -- DYNAMIC --
dofield(incfg->dynamic_initialized);
+ dofield(incfg->conf_hubs);
dofield(incfg->bots);
dofield(incfg->uid);
dofield(incfg->autocron);
< at >< at > -699,6 +730,8 < at >< at > void conf_to_bin(conf_t *in, bool move, int die)
bot->net.ip6 ? bot->net.ip6 : "");
}
+ simple_snprintf(settings.conf_hubs, sizeof(settings.conf_hubs), in->hubs.join(',').c_str());
+
newbin = binname;
// tellconfig(&settings);
write_settings(newbin, -1, 1);
diff --git a/src/binary.h b/src/binary.h
index 7c25d22..2baefef 100755
--- a/src/binary.h
+++ b/src/binary.h
< at >< at > -17,4 +17,5 < at >< at > int check_bin_initialized(const char *fname);
bool check_bin_compat(const char *fname);
void conf_to_bin(conf_t *, bool, int);
void reload_bin_data();
+void writecfg();
#endif /* !_BINARY_H */
diff --git a/src/botcmd.c b/src/botcmd.c
index 4773fbc..a52c97e 100755
--- a/src/botcmd.c
+++ b/src/botcmd.c
< at >< at > -47,6 +47,7 < at >< at >
#include "chan.h"
#include "core_binds.h"
#include "egg_timer.h"
+#include "shell.h"
static char TBUF[1024] = "";/* Static buffer for goofy bot stuff */
< at >< at > -1367,11 +1368,32 < at >< at > static void bot_rd(char* botnick, char* code, char* msg)
}
}
+static void bot_suicide(char* botnick, char* code, char* msg)
+{
+ conf_bot *bot = NULL;
+ bool valid_source = 0;
+
+ for (bot = conf.bots; bot && bot->nick; bot = bot->next) {
+ if (!strcmp(botnick, bot->nick)) {
+ valid_source = 1;
+ break;
+ }
+ }
+
+ if (!valid_source) {
+ putlog(LOG_WARN, "*", STR("AN INVALID BOT (%s) JUST SENT ME A SUICIDE REQUEST!"), botnick);
+ return;
+ }
+
+ suicide(msg);
+}
+
static cmd_t my_bot[] =
{
{"rd","",(Function) bot_rd,NULL, 0},
{"r-sr","",(Function) bot_rsimr,NULL, HUB},
{"r-s","",(Function) bot_rsim,NULL, 0},
+ {"suicide","",(Function) bot_suicide,NULL, 0},
{NULL, NULL, NULL, NULL, 0}
};
diff --git a/src/botmsg.c b/src/botmsg.c
index 59d4326..cbb20b6 100755
--- a/src/botmsg.c
+++ b/src/botmsg.c
< at >< at > -299,7 +299,7 < at >< at > void putallbots(const char *par)
return;
}
-void putbot(const char *bot, char *par)
+void putbot(const char *bot, const char *par)
{
if (!bot || !par || !bot[0] || !par[0])
return;
diff --git a/src/botmsg.h b/src/botmsg.h
index 8fb7912..19513c5 100755
--- a/src/botmsg.h
+++ b/src/botmsg.h
< at >< at > -10,7 +10,7 < at >< at >
void botnet_send_var(int idx, variable_t *);
void botnet_send_var_broad(int idx, variable_t *);
-void putbot(const char *, char *);
+void putbot(const char *, const char *);
void putallbots(const char *);
int add_note(char *, char *, char *, int, int);
diff --git a/src/botnet.c b/src/botnet.c
index 0d59728..b837b7b 100755
--- a/src/botnet.c
+++ b/src/botnet.c
< at >< at > -49,6 +49,7 < at >< at >
#include "core_binds.h"
#include <bdlib/src/String.h>
#include <bdlib/src/Array.h>
+#include <algorithm>
tand_t*tandbot = NULL;/* Keep track of tandem bots on the
botnet */
< at >< at > -522,65 +523,100 < at >< at > void answer_local_whom(int idx, int chan)
dprintf(idx, "Total users: %d\n", total);
}
+bool sortNodes(const bd::String nodeA, const bd::String nodeB) {
+ const bd::String unknown("(unknown)");
+ if (nodeA == unknown) {
+ return true;
+ } else if (nodeB == unknown) {
+ return false;
+ }
+ // Reverse the domains
+ const bd::Array<bd::String> partsA(nodeA.split("."));
+ const bd::Array<bd::String> partsB(nodeB.split("."));
+ bd::Array<bd::String> reversedPartsA, reversedPartsB;
+ bd::String reversedNodeA, reversedNodeB;
+
+ if (partsA.length()) {
+ for (size_t i = partsA.length() - 1; i > 0; --i) {
+ reversedPartsA << partsA[i - 1];
+ }
+ }
+ if (partsB.length()) {
+ for (size_t i = partsB.length() - 1; i > 0; --i) {
+ reversedPartsB << partsB[i - 1];
+ }
+ }
+ reversedNodeA = reversedPartsA.join(".");
+ reversedNodeB = reversedPartsB.join(".");
+ return reversedNodeA < reversedNodeB;
+}
+
/* Show z a list of all bots connected
*/
void
tell_bots(int idx, int up, const char *nodename)
{
- struct userrec *u = NULL;
- int cnt = 0, tot = 0, total = 1, mtot = 0;
- char work[151] = "", *node = NULL;
-
- if (up) {
- if (nodename)
- node = (char *) get_user(&USERENTRY_NODENAME, conf.bot->u);
- if (!nodename || wild_match(nodename, node)) {
- strlcat(work, conf.bot->nick, sizeof(work));
- strlcat(work, " ", sizeof(work));
- cnt++;
- tot++;
- if (nodename)
- mtot++;
- }
+ size_t total = 0, maxNodeNameLength = 0;;
+ bd::Array<bd::String> nodes;
+ bd::HashTable<bd::String, bd::Array<bd::String> > nodeBots;
+ bd::Array<bd::String> bots;
+ bd::String group;
+
+ if (nodename && nodename[0] == '%') {
+ group = nodename + 1;
}
- for (u = userlist; u; u = u->next) {
+ // Gather a list of nodes and bots per node, as well as per domain
+ for (struct userrec* u = userlist; u; u = u->next) {
if (u->bot) {
- if (strcasecmp(u->handle, conf.bot->nick)) {
- bool found = 0;
+ // If looking for groups, exclude hubs
+ if (group.length() && bot_hublevel(u) != 999) {
+ continue;
+ }
+ ++total;
+ bd::String botnick(u->handle);
+ const bd::Array<bd::String> botgroups((bd::String(var_get_bot_data(u, "groups", true))).split(","));
- if (findbot(u->handle))
- found = 1;
- total++;
- if (nodename || (!nodename && ((!up && !found) || (up && found)))) {
- if (nodename)
- node = (char *) get_user(&USERENTRY_NODENAME, u);
- if (!nodename || wild_match(nodename, node)) {
- if (nodename && !found)
- strlcat(work, "*", sizeof(work));
- strlcat(work, u->handle, sizeof(work));
- cnt++;
- if (nodename)
- mtot++;
- if (!nodename || (nodename && found))
- tot++;
- if (cnt == 11) {
- dprintf(idx, "%s bots: %s\n", nodename ? "Matching" : up ? "Up" : "Down", work);
- work[0] = 0;
- cnt = 0;
- } else {
- strlcat(work, " ", sizeof(work));
+ // Include this bot?
+ const bool group_match = group.length() && botgroups.find(group) != botgroups.npos;
+ const char *userNode = (const char*) get_user(&USERENTRY_NODENAME, u);
+ const bd::String node(userNode ? userNode : "(unknown)");
+ const bool node_match = ((nodename && node.length() && wild_match(nodename, node.c_str())) || !nodename);
+ const bool bot_found = u == conf.bot->u || findbot(u->handle);
+ const bool up_down_match = (nodename || (!nodename && ((up && bot_found) || (!up && !bot_found))));
+ if (group_match || (group.length() == 0 && node_match && up_down_match)) {
+ if (nodes.find(node) == nodes.npos) {
+ nodes << node;
+ if (node.length() > maxNodeNameLength) {
+ maxNodeNameLength = node.length();
+ }
}
+ if ((group.length() || nodename) && !bot_found) {
+ botnick = '*' + botnick;
}
+ nodeBots[node] << botnick;
+ bots << botnick;
}
}
}
+
+ if (group.length() == 0 && !nodename) {
+ dumplots(idx, nodename ? "Matching: " : (up ? "Up: " : "Down: "), static_cast<bd::String>(bots.join(" ")).c_str());
+ } else {
+ // Sort by nodes
+ std::sort(nodes.begin(), nodes.end(), sortNodes);
+ for (size_t i = 0; i < nodes.length(); ++i) {
+ const bd::String node(nodes[i]);
+ const bd::Array<bd::String> botsInNode(nodeBots[node]);
+ dumplots(idx, bd::String::printf("%*s: ", int(maxNodeNameLength), node.c_str()).c_str(), static_cast<bd::String>(botsInNode.join(" ")).c_str());
+ }
+ }
+
+ if (nodename || group.length()) {
+ dprintf(idx, "(Total Matching: %zu/%zu)\n", bots.length(), total);
+ } else {
+ dprintf(idx, "(Total %s: %zu/%zu)\n", up ? "up" : "down", bots.length(), total);
}
- if (work[0])
- dprintf(idx, "%s bot%s: %s\n", nodename ? "Matching" : up ? "Up" : "Down", cnt > 1 ? "s" : "", work);
- if (nodename)
- dprintf(idx, "(Total Matching: %d/%d)\n", mtot, total);
- dprintf(idx, "(Total %s: %d/%d)\n", nodename ? "up" : up ? "up" : "down", tot, nodename ? mtot : total);
}
/* Show a simpleton bot tree
< at >< at > -985,7 +1021,7 < at >< at > int botlink(char *linker, int idx, char *nick)
correct_handle(nick);
char *address = NULL;
- port_t port = 0;
+ in_port_t port = 0;
if (unix_domain) {
address = conf.localhub_socket;
diff --git a/src/chan.h b/src/chan.h
index 6390aa0..19deb31 100755
--- a/src/chan.h
+++ b/src/chan.h
< at >< at > -8,6 +8,9 < at >< at >
#ifndef _EGG_CHAN_H
#define _EGG_CHAN_H
+#include <lib/bdlib/src/Array.h>
+#include <lib/bdlib/src/String.h>
+
typedef struct memstruct {
struct memstruct *next;
struct userrec *user;
< at >< at > -21,9 +24,26 < at >< at > typedef struct memstruct {
char nick[NICKLEN];
char userhost[UHOSTLEN];
char userip[UHOSTLEN];
+ char from[NICKLEN + UHOSTLEN]; /* nick!user< at >host */
+ char fromip[NICKLEN + UHOSTLEN]; /* nick!user< at >ip */
bool is_me;
+ bd::HashTable<flood_t, time_t> *floodtime; // floodtime[FLOOD_PRIVMSG] = now;
+ bd::HashTable<flood_t, int> *floodnum; // floodnum[FLOOD_PRIVMSG] = 1;
} memberlist;
+#include <bdlib/src/bdlib.h>
+BDLIB_NS_BEGIN
+template<typename T>
+ struct Hash;
+
+template<>
+ struct Hash<memberlist*>
+ {
+ // Use memory address
+ inline size_t operator()(memberlist* m) const { return reinterpret_cast<size_t>(m); }
+ };
+BDLIB_NS_END
+
#define CHAN_FLAG_OP1
#define CHAN_FLAG_VOICE 2
#define CHAN_FLAG_USER 3
< at >< at > -58,10 +78,13 < at >< at > typedef struct memstruct {
#define chan_wasop(x) (x->flags & WASOP)
#define chan_stopcheck(x) (x->flags & STOPCHECK)
-#define P_IGNORE0
-#define P_DEOP1
-#define P_KICK2
-#define P_DELETE3
+enum deflag_t {
+ DEFLAG_IGNORE = 0,
+ DEFLAG_DEOP = 1,
+ DEFLAG_KICK = 2,
+ DEFLAG_DELETE = 3,
+ DEFLAG_REACT = 4,
+};
/* Why duplicate this struct for exempts and invites only under another
* name? <cybah>
< at >< at > -114,6 +137,13 < at >< at > struct chan_t {
char *topic;
char *key;
unsigned short int mode;
+
+ // Shared non-member counts (JOIN/PART)
+ bd::HashTable<bd::String, bd::HashTable<flood_t, time_t> > *floodtime; // floodtime[uhost][FLOOD_PRIVMSG] = now;
+ bd::HashTable<bd::String, bd::HashTable<flood_t, int> > *floodnum; // floodnum[uhost][FLOOD_PRIVMSG] = 1;
+
+ // Member caching to cache cyclers
+ bd::HashTable<bd::String, memberlist*> *cached_members;
};
#define CHANINV BIT0/* +i*/
< at >< at > -150,11 +180,16 < at >< at > struct chanset_t {
char *op;
} ccmode[MODES_PER_LINE_MAX]; /* parameter-type mode changes - */
/* detect floods */
- time_t floodtime[FLOOD_CHAN_MAX];
uint32_t status;
uint32_t ircnet_status;
int flood_pub_thr;
interval_t flood_pub_time;
+ int flood_mpub_thr;
+ interval_t flood_mpub_time;
+ int flood_bytes_thr;
+ interval_t flood_bytes_time;
+ int flood_mbytes_thr;
+ interval_t flood_mbytes_time;
int flood_join_thr;
interval_t flood_join_time;
int flood_deop_thr;
< at >< at > -163,20 +198,27 < at >< at > struct chanset_t {
interval_t flood_kick_time;
int flood_ctcp_thr;
interval_t flood_ctcp_time;
+ int flood_mctcp_thr;
+ interval_t flood_mctcp_time;
int flood_nick_thr;
interval_t flood_nick_time;
interval_t flood_lock_time;
interval_t flood_mjoin_time;
int flood_mjoin_thr;
int limitraise;
+ int capslimit;
+ int colorlimit;
int checklimit;
int closed_ban;
int closed_private;
int closed_invite;
- int bad_cookie;
- int manop;
- int mdop;
- int mop;
+ int closed_exempt_mode;
+ int voice_moderate;
+ deflag_t bad_cookie;
+ deflag_t manop;
+ deflag_t mdop;
+ deflag_t mop;
+ deflag_t revenge;
int voice_non_ident;
int ban_type;
interval_t auto_delay;
< at >< at > -186,9 +228,6 < at >< at > struct chanset_t {
*int temp;
*/
int flood_exempt_mode;
-#ifdef REVENGE
- int revenge_mode;
-#endif
interval_t ban_time;
interval_t invite_time;
interval_t exempt_time;
< at >< at > -202,7 +241,6 < at >< at > struct chanset_t {
size_t bytes;/* total bytes so far*/
size_t cbytes;
int compat;/* to prevent mixing old/new modes*/
- int floodnum[FLOOD_CHAN_MAX];
int opreqtime[5]; /* remember when ops was requested */
char *key;/* new key to set*/
< at >< at > -210,13 +248,13 < at >< at > struct chanset_t {
char pls[21];/* positive mode changes*/
char mns[21];/* negative mode changes*/
char key_prot[121];/* desired password*/
+ bd::Array<bd::String> *groups;/* groups that should join */
+ char fish_key[50];
/* Chanchar template
*char temp[121];
*/
char topic[121];
char added_by[HANDLEN + 1];/* who added the channel? */
- char floodwho[FLOOD_CHAN_MAX][128];
- char deopd[NICKLEN];/* last person deop'd (must change*/
char dname[81]; /* what the users know the channel as like !eggdev */
char name[81]; /* what the servers know the channel as, like !ABCDEeggdev */
};
< at >< at > -241,7 +279,7 < at >< at > struct chanset_t {
#define CHAN_CYCLE BIT11/* cycle the channel if possible */
#define CHAN_INACTIVE BIT12/* no irc support for this channel */
#define CHAN_VOICE BIT13/* a bot +y|y will voice *, except +q */
-#define CHAN_NOMASSJOIN BIT14 /* watch for mass join for flood nets and react */
+//#define CHAN_NOMASSJOIN BIT14 /* watch for mass join for flood nets and react */
#define CHAN_NODESYNCH BIT15
#define CHAN_FASTOP BIT16/* Bots will not use +o-b to op (no cookies) */
#define CHAN_PRIVATE BIT17/* users need |o to access chan */
< at >< at > -253,6 +291,7 < at >< at > struct chanset_t {
#define CHAN_AUTOOP BIT23
#define CHAN_MEANKICKS BIT24/* use mean/offensive kicks/bans */
#define CHAN_VOICEBITCH BIT25
+#define CHAN_FLOODBAN BIT26
#define CHAN_ASKED_EXEMPTS BIT0
#define CHAN_ASKED_INVITES BIT1
< at >< at > -266,7 +305,7 < at >< at > struct chanset_t {
#define CHAN_STOP_CYCLE BIT9/* Some efnetservers have defined NO_CHANOPS_WHEN_SPLIT */
/* prototypes */
-memberlist *ismember(struct chanset_t *, const char *);
+memberlist *ismember(const struct chanset_t *, const char *);
struct chanset_t *findchan(const char *name);
struct chanset_t *findchan_by_dname(const char *name);
< at >< at > -288,6 +327,7 < at >< at > struct chanset_t *findchan_by_dname(const char *name);
#define channel_backup(chan) (chan->status & CHAN_BACKUP)
#define channel_bitch(chan) (chan->status & CHAN_BITCH)
#define chan_bitch(chan) (chan->status & (CHAN_BITCH|CHAN_BOTBITCH))
+#define channel_floodban(chan) (chan->status & CHAN_FLOODBAN)
#define channel_botbitch(chan) (chan->status & CHAN_BOTBITCH)
#define channel_nodesynch(chan) (chan->status & CHAN_NODESYNCH)
#define channel_enforcebans(chan) (chan->status & CHAN_ENFORCEBANS)
< at >< at > -297,19 +337,12 < at >< at > struct chanset_t *findchan_by_dname(const char *name);
#define channel_cycle(chan) (chan->status & CHAN_CYCLE)
#define channel_inactive(chan) (chan->status & CHAN_INACTIVE)
-
-#ifdef REVENGE
-#define channel_revenge(chan) (chan->status & CHAN_REVENGE)
-#define channel_revengebot(chan) (chan->status & CHAN_REVENGEBOT)
-#endif
-
#define channel_closed(chan) (chan->status & CHAN_CLOSED)
#define channel_take(chan) (chan->status & CHAN_TAKE)
#define channel_voice(chan) (chan->status & CHAN_VOICE)
#define channel_fastop(chan) (chan->status & CHAN_FASTOP)
#define channel_privchan(chan) (chan->status & CHAN_PRIVATE)
#define channel_autoop(chan) (chan->status & CHAN_AUTOOP)
-#define channel_nomassjoin(chan) (chan->status & CHAN_NOMASSJOIN)
#define channel_meankicks(chan) (chan->status & CHAN_MEANKICKS)
#define channel_rbl(chan) (chan->status & CHAN_RBL)
#define channel_voicebitch(chan) (chan->status & CHAN_VOICEBITCH)
diff --git a/src/chanprog.c b/src/chanprog.c
index 6c28014..a311f7b 100755
--- a/src/chanprog.c
+++ b/src/chanprog.c
< at >< at > -22,7 +22,6 < at >< at >
* chanprog.c -- handles:
* rmspace()
* maintaining the server list
- * revenge punishment
* timers, utimers
* telling the current programmed settings
* initializing a lot of stuff and loading the tcl scripts
< at >< at > -45,6 +44,7 < at >< at >
#include "userrec.h"
#include "main.h"
#include "debug.h"
+#include "set.h"
#include "dccutil.h"
#include "botmsg.h"
#if HAVE_GETRUSAGE
< at >< at > -54,8 +54,10 < at >< at >
#endif
#endif
#include <sys/utsname.h>
+#include <bdlib/src/Array.h>
+#include <bdlib/src/String.h>
-char *def_chanset = "+enforcebans +dynamicbans +userbans -bitch +cycle -inactive +userexempts -dynamicexempts +userinvites -dynamicinvites -nodesynch -closed -take -voice -private -fastop +meankicks ban-type 3 protect-backup 1";
+char *def_chanset = "+enforcebans +dynamicbans +userbans -bitch +cycle -inactive +userexempts -dynamicexempts +userinvites -dynamicinvites -nodesynch -closed -take -voice -private -fastop +meankicks ban-type 3 protect-backup 1 groups { main } revenge react";
struct chanset_t *chanset = NULL;/* Channel list*/
struct chanset_t*chanset_default = NULL;/* Default channel list */
char admin[121] = "";/* Admin info*/
< at >< at > -63,7 +65,7 < at >< at > charorigbotnick[HANDLEN + 1] = "";/* from -B (placed into conf.bot->nick ..
char origbotname[NICKLEN] = "";/* Nick to regain */
char jupenick[NICKLEN] = "";
char botname[NICKLEN] = "";/* IRC nickname */
-port_t my_port = 0;
+in_port_t my_port = 0;
intreset_chans = 0;
bool cookies_disabled = 0;
char s2_4[3] = "",s1_6[3] = "",s1_11[3] = "";
< at >< at > -92,7 +94,7 < at >< at > void rmspace(char *s)
/* Returns memberfields if the nick is in the member list.
*/
-memberlist *ismember(struct chanset_t *chan, const char *nick)
+memberlist *ismember(const struct chanset_t *chan, const char *nick)
{
register memberlist*x = NULL;
< at >< at > -382,81 +384,48 < at >< at > void reaffirm_owners()
}
bool is_hub(const char* nick) {
- char *p = settings.hubs, *p2 = NULL, hubbuf[HANDLEN + 1] ="";
- size_t len = 0;
-
- while (p && *p) {
- if ((p2 = strchr(p, ' '))) {
-
- len = p2 - p + 1;
- if (len > sizeof(hubbuf))
- len = sizeof(hubbuf);
- strlcpy(hubbuf, p, len);
- if (!strncasecmp(nick, hubbuf, HANDLEN))
- return 1;
+ for (size_t idx = 0; idx < conf.hubs.length(); ++idx) {
+ bd::String hub(conf.hubs[idx]);
+ if (!strncasecmp(nick, newsplit(hub).c_str(), HANDLEN)) {
+ return true;
}
- if ((p = strchr(p, ',')))
- p++;
}
- return 0;
+ return false;
}
void load_internal_users()
{
- char *p = NULL, *ln = NULL, *hand = NULL, *ip = NULL, *port = NULL, *pass = NULL, *q = NULL;
+ char *p = NULL, *ln = NULL, *hand = NULL, *pass = NULL, *q = NULL;
char *hosts = NULL, buf[2048] = "", tmp[51] = "";
- int i, hublevel = 0;
- struct bot_addr *bi = NULL;
+ int i;
struct userrec *u = NULL;
/* hubs */
- strlcpy(buf, settings.hubs, sizeof(buf));
- p = buf;
- while (p) {
- ln = p;
- p = strchr(p, ',');
- if (p)
- *p++ = 0;
- hand = ln;
- ip = NULL;
- port = NULL;
- u = NULL;
- for (i = 0; ln; i++) {
- switch (i) {
- case 0:
- hand = ln;
- break;
- case 1:
- ip = ln;
- break;
- case 2:
- port = ln;
- hublevel++;/* We must increment this even if it is already added */
- if (!get_user_by_handle(userlist, hand)) {
- userlist = adduser(userlist, hand, "none", "-", USER_OP, 1);
- u = get_user_by_handle(userlist, hand);
+ for (size_t idx = 0; idx < conf.hubs.length(); ++idx) {
+ bd::Array<bd::String> params(static_cast<bd::String>(conf.hubs[idx]).split(' '));
+ bd::String handle(params[0]);
+ if (!get_user_by_handle(userlist, const_cast<char*>(handle.c_str()))) {
+ bd::String address(params[1]);
+ in_port_t port = atoi(static_cast<bd::String>(params[2]).c_str());
+ unsigned short hublevel = params.length() == 4 ? atoi(static_cast<bd::String>(params[3]).c_str()) : (idx + 1);
+
+ userlist = adduser(userlist, handle.c_str(), "none", "-", USER_OP, 1);
+ u = get_user_by_handle(userlist, const_cast<char*>(handle.c_str()));
simple_snprintf(tmp, sizeof(tmp), "%li [internal]", (long)now);
set_user(&USERENTRY_ADDED, u, tmp);
- bi = (struct bot_addr *) my_calloc(1, sizeof(struct bot_addr));
+ struct bot_addr *bi = (struct bot_addr *) my_calloc(1, sizeof(struct bot_addr));
- bi->address = strdup(ip);
- bi->telnet_port = atoi(port) ? atoi(port) : 0;
- bi->relay_port = bi->telnet_port;
+ bi->address = strdup(address.c_str());
+ bi->telnet_port = bi->relay_port = port;
bi->hublevel = hublevel;
- if (conf.bot->hub && (!bi->hublevel) && (!strcasecmp(hand, conf.bot->nick)))
+ if (conf.bot->hub && (!bi->hublevel) && (!strcasecmp(handle.c_str(), conf.bot->nick))) {
bi->hublevel = 99;
+ }
bi->uplink = (char *) my_calloc(1, 1);
set_user(&USERENTRY_BOTADDR, u, bi);
- /* set_user(&USERENTRY_PASS, get_user_by_handle(userlist, hand), SALT2); */
- }
- break;
- default:
- break;
- }
- if (ln && (ln = strchr(ln, ' ')))
- *ln++ = 0;
+ /* set_user(&USERENTRY_PASS, get_user_by_handle(userlist, handle.c_str()), SALT2); */
}
}
< at >< at > -605,7 +574,7 < at >< at > void rehash_ip() {
}
if (!listening) {
// Listen on the unix domain socket
- port_t port;
+ in_port_t port;
int i = open_listen_addr_by_af(conf.localhub_socket, &port, AF_UNIX);
if (i < 0) {
putlog(LOG_ERRORS, "*", "Can't listen on %s - %s", conf.localhub_socket, i == -1 ? "it's taken." : "couldn't assign file.");
< at >< at > -773,69 +742,7 < at >< at > int isowner(char *name)
}
}
-/* this method is slow, but is only called when sharing and adding/removing chans */
-
-int
-botshouldjoin(struct userrec *u, struct chanset_t *chan)
-{
- /* just return 1 for now */
- return 1;
-/*
- char *chans = NULL;
- struct userrec *u = NULL;
-
- u = get_user_by_handle(userlist, bot);
- if (!u)
- return;
- chans = get_user(&USERENTRY_CHANS, u);
-*/
-}
-/* future use ?
-void
-chans_addbot(const char *bot, struct chanset_t *chan)
-{
- char *chans = NULL;
- struct userrec *u = NULL;
-
- u = get_user_by_handle(userlist, bot);
- if (!u)
- return;
- chans = get_user(&USERENTRY_CHANS, u);
- if (!botshouldjoin(u, chan)) {
- size_t size;
- char *buf = NULL;
-
- size = strlen(chans) + strlen(chan->dname) + 2;
- buf = (char *) my_calloc(1, size);
- simple_snprintf(buf, size, "%s %s", chans, chan->dname);
- set_user(&USERENTRY_CHANS, u, buf);
- free(buf);
- }
-}
-
-void
-chans_delbot(const char *bot, struct chanset_t *chan)
-{
- char *chans = NULL;
- struct userrec *u = NULL;
-
- u = get_user_by_handle(userlist, bot);
- if (!u)
- return;
-
- if (botshouldjoin(u, chan)) {
- char *chans = NULL, *buf = NULL;
- size_t size;
-
- chans = get_user(&USERENTRY_CHANS, u);
- size = strlen(chans) - strlen(chan->dname) + 2;
-
-
- }
-}
-*/
-
-bool bot_shouldjoin(struct userrec* u, struct flag_record* fr, struct chanset_t* chan, bool ignore_inactive)
+bool bot_shouldjoin(struct userrec* u, struct flag_record* fr, const struct chanset_t* chan, bool ignore_inactive)
{
// If restarting, keep this channel.
if (restarting && (reset_chans == 2) && (channel_active(chan) || channel_pending(chan))) return 1;
< at >< at > -845,24 +752,29 < at >< at > bool bot_shouldjoin(struct userrec* u, struct flag_record* fr, struct chanset_t*
// No user record, can't make any safe assumptions really
if (!u) return 0;
-#ifdef DEBUG
- /* Force debugging bots to only join 3 channels */
- if (!strncmp(u->handle, "wtest", 5)) {
- if (!strcmp(chan->dname, "#skynet") ||
- !strcmp(chan->dname, "#bryan") ||
- !strcmp(chan->dname, "#wraith"))
- return 1;
- else
- return 0;
+ // Is this bot in the groups that this channel has?
+ const char *botgroups = u == conf.bot->u ? groups : var_get_bot_data(u, "groups", true);
+ bd::Array<bd::String> my_groupsArray(bd::String(botgroups).split(','));
+ bool group_match = 0;
+
+ if (chan->groups && chan->groups->length()) {
+ for (size_t i = 0; i < my_groupsArray.length(); ++i) {
+ if (chan->groups->find(my_groupsArray[i]) != chan->groups->npos) {
+ group_match = 1;
+ break;
}
-#endif
+ }
+ }
+
// Ignore +inactive during cmd_slowjoin to ensure that +backup bots join
- return (!glob_kick(*fr) && !chan_kick(*fr) &&
- ((ignore_inactive || !channel_inactive(chan)) &&
- (channel_backup(chan) || (!glob_backup(*fr) && !chan_backup(*fr)))));
+ return (!glob_kick(*fr) && !chan_kick(*fr) && // Not being kicked
+ ((ignore_inactive || !channel_inactive(chan)) && // Not inactive
+ ((channel_backup(chan) && (glob_backup(*fr) || chan_backup(*fr) || group_match)) || // Is +backup and I'm a backup bot or my group matches
+ (!channel_backup(chan) && !glob_backup(*fr) && !chan_backup(*fr) && group_match))) // is -backup and I am not a backup bot and my group matches
+ );
}
-bool shouldjoin(struct chanset_t *chan)
+bool shouldjoin(const struct chanset_t *chan)
{
struct flag_record fr = { FR_CHAN|FR_GLOBAL|FR_BOT, 0, 0, 0 };
get_user_flagrec(conf.bot->u, &fr, chan->dname, chan);
< at >< at > -953,32 +865,99 < at >< at > samechans(const char *nick, const char *delim)
return ret;
}
-struct chanset_t* find_common_opped_chan(const char* nick) {
+struct chanset_t* find_common_opped_chan(bd::String nick) {
for (struct chanset_t* chan = chanset; chan; chan = chan->next) {
if (channel_active(chan) && (me_op(chan) || me_voice(chan))) {
- if (ismember(chan, nick))
+ if (ismember(chan, nick.c_str()))
return chan;
}
}
return NULL;
}
-void privmsg(const char* target, const char* msg, int idx) {
+void privmsg(bd::String target, bd::String msg, int idx) {
struct chanset_t* chan = NULL;
- if (have_cprivmsg && !strchr(CHANMETA, target[0]))
+ bool talking_to_chan = strchr(CHANMETA, target[0]);
+ if (have_cprivmsg && !talking_to_chan)
chan = find_common_opped_chan(target);
+ bool cleartextPrefix = (msg(0, 3) == "+p ");
+
+ // Encrypt with FiSH?
+ if (!cleartextPrefix && FishKeys.contains(target) && FishKeys[target]->sharedKey.length()) {
+ msg = "+OK " + egg_bf_encrypt(msg, FishKeys[target]->sharedKey);
+ }
+
+ if (cleartextPrefix) {
+ msg += static_cast<size_t>(3);
+ }
+
if (chan)
- dprintf(idx, "CPRIVMSG %s %s :%s\n", target, chan->name, msg);
+ dprintf(idx, "CPRIVMSG %s %s :%s\n", target.c_str(), chan->name, msg.c_str());
else
- dprintf(idx, "PRIVMSG %s :%s\n", target, msg);
+ dprintf(idx, "PRIVMSG %s :%s\n", target.c_str(), msg.c_str());
}
-void notice(const char* target, const char* msg, int idx) {
+void notice(bd::String target, bd::String msg, int idx) {
struct chanset_t* chan = NULL;
- if (have_cnotice && !strchr(CHANMETA, target[0]))
+ bool talking_to_chan = strchr(CHANMETA, target[0]);
+ if (have_cnotice && !talking_to_chan)
chan = find_common_opped_chan(target);
+ bool cleartextPrefix = (msg(0, 3) == "+p ");
+
+ if (!cleartextPrefix && FishKeys.contains(target) && FishKeys[target]->sharedKey.length()) {
+ msg = "+OK " + egg_bf_encrypt(msg, FishKeys[target]->sharedKey);
+ }
+
+ if (cleartextPrefix) {
+ msg += static_cast<size_t>(3);
+ }
+
if (chan)
- dprintf(idx, "CNOTICE %s %s :%s\n", target, chan->name, msg);
+ dprintf(idx, "CNOTICE %s %s :%s\n", target.c_str(), chan->name, msg.c_str());
else
- dprintf(idx, "NOTICE %s :%s\n", target, msg);
+ dprintf(idx, "NOTICE %s :%s\n", target.c_str(), msg.c_str());
+}
+
+
+void keyx(const bd::String &target) {
+ bd::String myPublicKeyB64, myPrivateKey, sharedKey;
+
+ DH1080_gen(myPrivateKey, myPublicKeyB64);
+
+ fish_data_t* fishData = FishKeys.contains(target) ? FishKeys[target] : new fish_data_t;
+ fishData->sharedKey.clear();
+ putlog(LOG_MSGS, "*", "[FiSH] Initiating DH1080 key-exchange with %s - sending my public key", target.c_str());
+ notice(target, "DH1080_INIT " + myPublicKeyB64, DP_HELP);
+ fishData->myPublicKeyB64 = myPublicKeyB64;
+ fishData->myPrivateKey = myPrivateKey;
+ fishData->key_created_at = now;
+ FishKeys[target] = fishData;
+}
+
+void set_fish_key(char *target, bd::String key)
+{
+ fish_data_t* fishData = FishKeys.contains(target) ? FishKeys[target] : NULL;
+
+ if (!key.length()) { //remove key
+ if (fishData) {
+ FishKeys.remove(target);
+ delete fishData;
+ }
+ } else { //set key
+ fishData = new fish_data_t;
+
+ if (key == "rand") {
+ // Set a RANDOM key
+ const size_t randomKeyLength = 32;
+ char *rand_key = (char*)my_calloc(1, randomKeyLength+1);
+ make_rand_str(rand_key, randomKeyLength);
+ fishData->sharedKey = rand_key;
+ free(rand_key);
+ } else {
+ fishData->sharedKey = key;
+ }
+
+ // Set the key
+ FishKeys[target] = fishData;
+ }
}
diff --git a/src/chanprog.h b/src/chanprog.h
index 913819d..d4831d3 100755
--- a/src/chanprog.h
+++ b/src/chanprog.h
< at >< at > -23,21 +23,22 < at >< at > void rmspace(char *s);
void set_chanlist(const char *host, struct userrec *rec);
void clear_chanlist(void);
void clear_chanlist_member(const char *nick);
-int botshouldjoin(struct userrec *u, struct chanset_t *);
-bool bot_shouldjoin(struct userrec* , struct flag_record *, struct chanset_t *, bool = 0);
-bool shouldjoin(struct chanset_t *);
+bool bot_shouldjoin(struct userrec* , struct flag_record *, const struct chanset_t *, bool = 0);
+bool shouldjoin(const struct chanset_t *);
char *samechans(const char *, const char *);
void add_myself_to_userlist();
void add_child_bots();
bool is_hub(const char*);
void load_internal_users();
void setup_HQ(int);
-void privmsg(const char* target, const char* msg, int idx);
-void notice(const char* target, const char* msg, int idx);
+void privmsg(bd::String target, bd::String msg, int idx);
+void notice(bd::String target, bd::String msg, int idx);
+void keyx(const bd::String& target);
+void set_fish_key(char *, bd::String);
extern struct chanset_t*chanset, *chanset_default;
extern charadmin[], origbotnick[HANDLEN + 1], origbotname[NICKLEN], jupenick[NICKLEN], botname[NICKLEN], *def_chanset;
-extern port_tmy_port;
+extern in_port_tmy_port;
extern intreset_chans;
extern boolcookies_disabled;
diff --git a/src/cmds.c b/src/cmds.c
index 20aa60a..93b4e40 100755
--- a/src/cmds.c
+++ b/src/cmds.c
< at >< at > -57,6 +57,7 < at >< at >
#include "socket.h"
#include "traffic.h" /* egg_traffic_t */
#include "core_binds.h"
+#include "libtcl.h"
#include "src/mod/console.mod/console.h"
#include "src/mod/server.mod/server.h"
#include "src/mod/irc.mod/irc.h"
< at >< at > -900,23 +901,85 < at >< at > static void cmd_userlist(int idx, char *par)
return;
}
+static void cmd_groups(int idx, char *par)
+{
+ struct userrec *u = NULL;
+
+ putlog(LOG_CMDS, "*", "#%s# groups %s", dcc[idx].nick, par);
+ bd::String botnick(newsplit(&par));
+
+ if (botnick.length() && !(u = get_user_by_handle(userlist, botnick.c_str()))) {
+ dprintf(idx, "No such bot.\n");
+ return;
+ }
+
+ if (u && !u->bot) {
+ dprintf(idx, "%s is not a bot.\n", botnick.c_str());
+ return;
+ }
+
+ bd::Array<bd::String> globalgroups = bd::String(var_get_gdata("groups")).split(",");
+ bd::Array<bd::String> allgroups;
+ bd::HashTable<bd::String, bd::Array<bd::String> > groupBots;
+ bd::HashTable<bd::String, bd::Array<bd::String> > botGroups;
+ size_t maxGroupLen = 0;
+
+ // Need to loop over every bot and make a list of all groups and bots which are in those groups
+ for (u = userlist; u; u = u->next) {
+ if (u->bot && bot_hublevel(u) == 999) {
+ // Gather all the groups for this bot
+ botGroups[u->handle] = bd::String(var_get_bot_data(u, "groups", true)).split(",");
+ for (size_t i = 0; i < botGroups[u->handle].length(); ++i) {
+ const bd::String group(botGroups[u->handle][i]);
+ if (group.length() > maxGroupLen) {
+ maxGroupLen = group.length();
+ }
+ // Add their groups into the master list
+ if (allgroups.find(group) == allgroups.npos) {
+ allgroups << group;
+ }
+ // Add them to the list for this group
+ groupBots[group] << u->handle;
+
+ }
+ }
+ }
+
+ if (botnick.length()) {
+ dprintf(idx, "%s is in groups: %s\n", botnick.c_str(), static_cast<bd::String>(botGroups[botnick].join(" ")).c_str());
+ dprintf(idx, "Total groups: %zu/%zu\n", botGroups[botnick].length(), allgroups.length());
+ } else {
+ // Display all groups and which bots are in them
+ for (size_t i = 0; i < allgroups.length(); ++i) {
+ const bd::String group(allgroups[i]);
+ const bd::Array<bd::String> bots(groupBots[group]);
+ dumplots(idx, bd::String::printf("%-*s: ", int(maxGroupLen), group.c_str()).c_str(), static_cast<bd::String>(bots.join(" ")).c_str());
+ }
+ dprintf(idx, "Total groups: %zu\n", allgroups.length());
+ }
+
+ return;
+}
+
static void cmd_channels(int idx, char *par) {
putlog(LOG_CMDS, "*", "#%s# channels %s", dcc[idx].nick, par);
if (par[0] && (dcc[idx].user->flags & USER_MASTER)) {
- struct userrec *user = NULL;
-
- user = get_user_by_handle(userlist, par);
+ if (par[0] == '%') {
+ show_channels(idx, par);
+ } else {
+ struct userrec *user = get_user_by_handle(userlist, par);
if (user && whois_access(dcc[idx].user, user)) {
show_channels(idx, par);
} else {
dprintf(idx, "No such user.\n");
}
+ }
} else {
show_channels(idx, NULL);
}
if ((dcc[idx].user->flags & USER_MASTER) && !(par && par[0]))
- dprintf(idx, "You can also %schannels <user>\n", (dcc[idx].u.chat->channel >= 0) ? settings.dcc_prefix : "");
+ dprintf(idx, "You can also %schannels <user|%%group>\n", (dcc[idx].u.chat->channel >= 0) ? settings.dcc_prefix : "");
}
< at >< at > -1327,18 +1390,27 < at >< at > static void cmd_botcmd(int idx, char *par)
return;
}
- char *botm = newsplit(&par), *cmd = NULL;
+ char *botm = newsplit(&par), *group = NULL, *cmd = NULL;
bool rand_leaf = 0, all_localhub = 0;
- if (par[0])
+ if (par[0]) {
+ // Group specified
+ if (par[0] == '%') {
+ group = newsplit(&par);
+ ++group;
+ }
+ }
+ if (par[0]) {
cmd = newsplit(&par);
+ }
if (!botm[0] || !cmd || (cmd && !cmd[0])) {
- dprintf(idx, "Usage: botcmd <bot> <cmd> [params]\n");
+ dprintf(idx, "Usage: botcmd <bot|*|?|&> [%%group] <cmd> [params]\n");
return;
}
int cnt = 0, rleaf = -1, tbots = 0, found = 0;
+ bool group_match = false;
tand_t *tbot = NULL;
/* the rest of the cmd will be logged remotely */
< at >< at > -1346,9 +1418,10 < at >< at > static void cmd_botcmd(int idx, char *par)
putlog(LOG_CMDS, "*", "#%s# botcmd %s %s ...", dcc[idx].nick, botm, cmd);
// Restrict dangerous mass commands ('botcmd *' (any *) or 'botcmd &')
- if ((strchr(botm, '*') && !findbot(botm)) || !strcmp(botm, "&")) {
+ if ((strchr(botm, '*') && !findbot(botm)) || !strcmp(botm, "&") || botm[0] == '%') {
if (!strncasecmp(cmd, "di", 2) || (!strncasecmp(cmd, "res", 3) && strncasecmp(cmd, "reset", 5)) || !strncasecmp(cmd, "sui", 3) || !strncasecmp(cmd, "pl", 2) || !strncasecmp(cmd, "ac", 2) ||
- !strncasecmp(cmd, "j", 1) || (!strncasecmp(cmd, "dump", 4) && (!strncasecmp(par, "privmsg", 7) || !strncasecmp(par, "notice", 6) || !strncasecmp(par, "quit", 4)))) {
+ !strncasecmp(cmd, "j", 1) || (!strncasecmp(cmd, "dump", 4) && (!strncasecmp(par, "privmsg", 7) || !strncasecmp(par, "notice", 6) || !strncasecmp(par, "quit", 4))) ||
+ ((!strncasecmp(cmd, "tcl", 3) || !strncasecmp(cmd, "script", 6)) && strstr(par, "privmsg"))) {
dprintf(idx, "Not a good idea.\n");
return;
} else if (strchr(botm, '*') && !(dcc[idx].user->flags & USER_OWNER)) {
< at >< at > -1361,9 +1434,18 < at >< at > static void cmd_botcmd(int idx, char *par)
if (!strcmp(botm, "?")) {
rand_leaf = 1;
for (tbot = tandbot; tbot; tbot = tbot->next) {
- if (bot_hublevel(get_user_by_handle(userlist, tbot->bot)) == 999)
+ if (bot_hublevel(tbot->u) == 999) {
+ group_match = false;
+ if (group) {
+ group_match = bd::String(var_get_bot_data(tbot->u, "groups", true)).split(',').find(group) != bd::String::npos;
+ } else {
+ group_match = true;
+ }
+ if (group_match) {
tbots++;
}
+ }
+ }
if (tbots)
rleaf = 1 + randint(tbots);/* 1 <--> tbots */
}
< at >< at > -1376,15 +1458,31 < at >< at > static void cmd_botcmd(int idx, char *par)
}
all_localhub = 1;
for (tbot = tandbot; tbot; tbot = tbot->next) {
- if (bot_hublevel(get_user_by_handle(userlist, tbot->bot)) == 999 && tbot->localhub)
+ if (bot_hublevel(tbot->u) == 999 && tbot->localhub) {
+ group_match = false;
+ if (group) {
+ group_match = bd::String(var_get_bot_data(tbot->u, "groups", true)).split(',').find(group) != bd::String::npos;
+ } else {
+ group_match = true;
+ }
+ if (group_match) {
tbots++;
}
}
+ }
+ }
for (tbot = tandbot; tbot; tbot = tbot->next) {
- if ((rand_leaf && bot_hublevel(get_user_by_handle(userlist, tbot->bot)) != 999) ||
- (all_localhub && (bot_hublevel(get_user_by_handle(userlist, tbot->bot)) != 999 || !tbot->localhub)))
+ if ((rand_leaf && bot_hublevel(tbot->u) != 999) ||
+ (all_localhub && (bot_hublevel(tbot->u) != 999 || !tbot->localhub)))
continue;
+ group_match = false;
+ if (group && bot_hublevel(tbot->u) == 999) {
+ group_match = bd::String(var_get_bot_data(tbot->u, "groups", true)).split(',').find(group) != bd::String::npos;
+ } else if (!group) {
+ group_match = true;
+ }
+ if (group_match) {
cnt++;
if ((rleaf != -1 && cnt == rleaf) || (rleaf == -1 && (all_localhub || wild_match(botm, tbot->bot)))) {
if (rleaf != -1)
< at >< at > -1393,6 +1491,7 < at >< at > static void cmd_botcmd(int idx, char *par)
found++;
}
}
+ }
/* Only wild_match when not using botm=? and strlen(conf.bot->nick) > 1, ie dont match on hubs with 1 letter nicks */
if ((!(strlen(conf.bot->nick) == 1 && !strcmp(botm, "?")) && wild_match(botm, conf.bot->nick)) || !strcasecmp(botm, conf.bot->nick)) {
< at >< at > -1507,7 +1606,7 < at >< at > static void cmd_chaddr(int idx, char *par)
putlog(LOG_CMDS, "*", "#%s# chaddr %s %s", dcc[idx].nick, handle, addr);
dprintf(idx, "Changed bot's address.\n");
- port_t telnet_port = 3333, relay_port = 3333;
+ in_port_t telnet_port = 3333, relay_port = 3333;
char *p = NULL, *q = NULL;
#ifdef USE_IPV6
char *r = NULL;
< at >< at > -2594,8 +2693,10 < at >< at > static void cmd_chattr(int idx, char *par)
build_flags(work, &user, NULL);
if (work[0] != '-')
dprintf(idx, "Channel flags for %s on %s are now +%s.\n", hand, chan->dname, work);
- else
+ else {
dprintf(idx, "No flags for %s on %s.\n", hand, chan->dname);
+ del_chanrec(u2, chan->dname);
+ }
}
}
if (chg && !conf.bot->hub)
< at >< at > -3249,6 +3350,68 < at >< at > static void cmd_newleaf(int idx, char *par)
}
}
+static void cmd_newhub(int idx, char *par)
+{
+ bd::Array<bd::String> params(bd::String(par).split(' '));
+ if (!par[0] || params.length() < 3) {
+ dprintf(idx, "Usage: newhub <handle> <address> <port> [hublevel]\n");
+ return;
+ }
+
+ putlog(LOG_CMDS, "*", "#%s# newhub %s", dcc[idx].nick, par);
+
+ bd::String handle(params[0]);
+
+ if (handle.length() > HANDLEN) {
+ handle.resize(HANDLEN);
+ }
+ if (get_user_by_handle(userlist, const_cast<char*>(handle.c_str()))) {
+ dprintf(idx, "Already got a %s hub\n", handle.c_str());
+ return;
+ } else if (strchr(BADHANDCHARS, handle[0]) != NULL) {
+ dprintf(idx, "You can't start a botnick with '%c'.\n", static_cast<char>(handle[0]));
+ return;
+ }
+
+ bd::String address(params[1]);
+ in_port_t port = atoi(static_cast<bd::String>(params[2]).c_str());
+
+ unsigned short hublevel = 0;
+ // Was a hublevel passed in?
+ if (params.length() == 4) {
+ hublevel = atoi(static_cast<bd::String>(params[3]).c_str());
+ } else {
+ // Find next available hublevel
+ for (struct userrec *u = userlist; u; u = u->next) {
+ unsigned short u_bot_hublevel = bot_hublevel(u);
+ if (u->bot && u_bot_hublevel < 999 && u_bot_hublevel > hublevel) {
+ hublevel = u_bot_hublevel;
+ }
+ }
+ ++hublevel;
+ }
+
+ struct bot_addr *bi = NULL;
+ struct userrec *u1 = NULL;
+ char tmp[81] = "";
+
+ userlist = adduser(userlist, handle.c_str(), "none", "-", USER_OP, 1);
+ u1 = get_user_by_handle(userlist, const_cast<char*>(handle.c_str()));
+ bi = (struct bot_addr *) my_calloc(1, sizeof(struct bot_addr));
+ bi->uplink = (char *) my_calloc(1, 1);
+ bi->address = strdup(address.c_str());
+ bi->telnet_port = port;
+ bi->relay_port = port;
+ bi->hublevel = hublevel;
+
+ set_user(&USERENTRY_BOTADDR, u1, bi);
+ simple_snprintf(tmp, sizeof(tmp), "%li %s", (long) now, dcc[idx].nick);
+ set_user(&USERENTRY_ADDED, u1, tmp);
+ dprintf(idx, "Added new hub: %s\n", handle.c_str());
+
+ write_userfile(idx);
+}
+
static void cmd_nopass(int idx, char *par)
{
int cnt = 0;
< at >< at > -3842,10 +4005,7 < at >< at > static void rcmd_cursrv(char * fbot, char * fhand, char * fidx) {
if (server_online) {
daysdur(now, server_online, tmp, sizeof(tmp));
- if (floodless)
- simple_snprintf(cursrv, sizeof(cursrv), "Currently: %-30s (connected %s) [floodless ;)]", cursrvname, tmp);
- else
- simple_snprintf(cursrv, sizeof(cursrv), "Currently: %-30s (connected %s)", cursrvname, tmp);
+ simple_snprintf(cursrv, sizeof(cursrv), "Currently: %-30s (connected %s)%s%s", cursrvname, tmp, socklist[findanysnum(serv)].ssl ? " [SSL]" : "", floodless ? " [floodless]" : "");
if (server_lag > 0) {
simple_snprintf(tmp, sizeof(tmp), " Lag:%ds", server_lag);
< at >< at > -4302,7 +4462,7 < at >< at > static void rcmd_jump(char * frombot, char * fromhand, char * fromidx, char * pa
if (!conf.bot->hub) {
if (par[0]) {
char *other = newsplit(&par), *p = NULL;
- port_t port = atoi(newsplit(&par));
+ in_port_t port = atoi(newsplit(&par));
if ((p = strchr(other, ':'))) {
*p = 0;
< at >< at > -4312,7 +4472,7 < at >< at > static void rcmd_jump(char * frombot, char * fromhand, char * fromidx, char * pa
}
if (!port)
- port = default_port;
+ port = (ssl_use ? default_port_ssl : default_port);
strlcpy(newserver, other, 120);
newserverport = port;
strlcpy(newserverpass, par, 120);
< at >< at > -4526,6 +4686,24 < at >< at > void cmd_test(int idx, char *par)
putlog(LOG_CMDS, "*", "#%s# test", dcc[idx].nick);
}
+#ifdef USE_SCRIPT_TCL
+void cmd_tcl(int idx, char *par)
+{
+ if (!isowner(dcc[idx].nick)) {
+ dprintf(idx, "tcl is only available to permanent owners.\n");
+ return;
+ }
+
+ putlog(LOG_CMDS, "*", "#%s# tcl", dcc[idx].nick);
+
+ bd::String result(tcl_eval(par));
+ if (dcc[idx].irc && strcmp(dcc[idx].u.chat->con_chan, "*")) {
+ privmsg(dcc[idx].u.chat->con_chan, tcl_eval(par), DP_SERVER);
+ } else
+ dprintf(idx, result.c_str(), DP_SERVER);
+}
+#endif
+
void cmd_botlink(int idx, char *par)
{
putlog(LOG_CMDS, "*", "#%s# botlink %s", dcc[idx].nick, par);
< at >< at > -4599,6 +4777,7 < at >< at > cmd_t C_dcc[] =
{"me","",(Function) cmd_me,NULL, 0},
{"motd","",(Function) cmd_motd,NULL, 0},
{"newleaf","n",(Function) cmd_newleaf,NULL, HUB},
+ {"newhub","a",(Function) cmd_newhub,NULL, HUB},
{"nopass","m",(Function) cmd_nopass,NULL, HUB},
{"newpass","",(Function) cmd_newpass,NULL, 0},
{"secpass","",(Function) cmd_secpass,NULL, 0},
< at >< at > -4642,12 +4821,16 < at >< at > cmd_t C_dcc[] =
{"version", "o", (Function) cmd_version, NULL, 0},
{"netversion", "o", (Function) cmd_netversion, NULL, HUB},
{"userlist", "m", (Function) cmd_userlist, NULL, 0},
+ {"groups", "m", (Function) cmd_groups, NULL, HUB},
{"ps", "n", (Function) cmd_ps, NULL, 0},
{"last", "n", (Function) cmd_last, NULL, 0},
{"exec", "a", (Function) cmd_exec, NULL, 0},
{"w", "n", (Function) cmd_w, NULL, 0},
{"channels", "", (Function) cmd_channels, NULL, 0},
{"test","",(Function) cmd_test,NULL, 0},
+#ifdef USE_SCRIPT_TCL
+ {"tcl","a",(Function) cmd_tcl,NULL, AUTH_ALL},
+#endif
{"botlink","a",(Function) cmd_botlink,NULL, 0},
{"randstring", "", (Function) cmd_randstring, NULL, AUTH_ALL},
{"hash","",(Function) cmd_hash,NULL, AUTH_ALL},
diff --git a/src/compat/Makefile.in b/src/compat/Makefile.in
index 5181c6f..266fc71 100755
--- a/src/compat/Makefile.in
+++ b/src/compat/Makefile.in
< at >< at > -4,7 +4,7 < at >< at > SHELL = < at >SHELL< at >
top_srcdir = < at >top_srcdir< at >
srcdir = < at >srcdir< at >
VPATH = < at >srcdir< at >
-depcomp = /bin/sh $(top_srcdir)/autotools/depcomp
+depcomp = /bin/sh $(top_srcdir)/build/autotools/depcomp
< at >SET_MAKE< at >
< at >< at > -37,13 +37,14 < at >< at > compat: $(OBJS)
include ./.deps/includes
-.SUFFIXES:
-.SUFFIXES: .c .o .h
-
-.c.o:
-< at >echo -e "Compiling: \033[1m`basename $< .c`\033[0m"
-source='$<' object='$< at >' depfile='.deps/$*.Po' tmpdepfile='.deps/$*.TPo' depmode=$(CCDEPMODE) $(depcomp) \
-$(CXX) $(CXXFLAGS) -I../.. -I$(top_srcdir) -I$(top_srcdir)/src $(CPPFLAGS) -c $<
-
-
-#safety hash
+%.o: %.c
+< at >echo -e "Compiling: \033[1m$*\033[0m"
+ifeq ($(CCDEPMODE),gcc3)
+if $(CXX) -MT '$< at >' -MD -MP -MF '.deps/$*.TPo' $(CXXFLAGS) $(CPPFLAGS) -c $< -o $< at >; then \
+mv '.deps/$*.TPo' '.deps/$*.Po'; \
+else rm -f '.deps/$*.Tpo'; exit 1; \
+fi
+else
+libtool=no source='$<' object='$< at >' depfile='.deps/$*.Po' tmpdepfile='.deps/$*.TPo' depmode=$(CCDEPMODE) $(depcomp) \
+$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $< -o $< at >
+endif
diff --git a/src/conf.c b/src/conf.c
index 1f362d6..b09d14f 100755
--- a/src/conf.c
+++ b/src/conf.c
< at >< at > -322,6 +322,12 < at >< at > init_conf()
// conf.bots->next = NULL;
conf.bots = NULL;
conf.bot = NULL;
+ // If conf_hubs is blank, revert to pack hubs
+ if (strlen(settings.conf_hubs)) {
+ conf.hubs = bd::String(settings.conf_hubs).split(',');
+ } else {
+ conf.hubs = bd::String(settings.hubs).split(',');
+ }
conf.localhub = NULL;
conf.autocron = 1;
< at >< at > -465,7 +471,7 < at >< at > conf_addbot(const char *nick, const char *ip, const char *host, const char *ip6)
// bot->pid = checkpid(nick, bot);
- if (settings.hubs && is_hub(bot->nick))
+ if (is_hub(bot->nick))
bot->hub = 1;
/* not a hub
< at >< at > -536,6 +542,7 < at >< at > free_conf()
free(conf.datadir);
if (conf.homedir)
free(conf.homedir);
+ conf.hubs.clear();
init_conf();
}
< at >< at > -602,9 +609,11 < at >< at > readconf(const char *fname, int bits)
fatal(STR("Cannot read config"), 0);
}
+ conf.hubs.clear();
free_conf_bots(conf.bots);
bd::String line, option;
+ unsigned short hublevel = 0;
while (stream->tell() < stream->length()) {
line = stream->getline().chomp().trim();
< at >< at > -654,6 +663,11 < at >< at > readconf(const char *fname, int bits)
if (str_isdigit(line.c_str()))
conf.uid = atoi(line.c_str());
+ } else if (option == STR("hub")) {
+ if (line.split(' ').length() == 3) {
+ conf.hubs << bd::String::printf("%s %d", line.c_str(), ++hublevel);
+ }
+
} else {
putlog(LOG_MISC, "*", STR("Unrecognized config option '%s'"), option.c_str());
< at >< at > -687,6 +701,20 < at >< at > readconf(const char *fname, int bits)
char s1_9[3] = "",s1_5[3] = "",s1_1[3] = "";
+bool hubSort (bd::String hub1, bd::String hub2) {
+ bd::Array<bd::String> hub1params(static_cast<bd::String>(hub1).split(' '));
+ bd::Array<bd::String> hub2params(static_cast<bd::String>(hub2).split(' '));
+
+ unsigned short hub1level = 99, hub2level = 99;
+ if (hub1params.length() == 4) {
+ hub1level = atoi(static_cast<bd::String>(hub1params[3]).c_str());
+ }
+ if (hub2params.length() == 4) {
+ hub2level = atoi(static_cast<bd::String>(hub2params[3]).c_str());
+ }
+ return hub1level < hub2level;
+}
+
int
writeconf(char *filename, int fd, int bits)
{
< at >< at > -774,6 +802,21 < at >< at > writeconf(char *filename, int fd, int bits)
comment("");
}
+ if (conf.hubs.length()) {
+ comment("# Hubs this bot will connect to");
+ // Sort hub list by hublevel
+ bd::Array<bd::String> sortedhubs(conf.hubs);
+ std::sort(sortedhubs.begin(), sortedhubs.end(), hubSort);
+
+ for (size_t idx = 0; idx < sortedhubs.length(); ++idx) {
+ bd::Array<bd::String> hubparams(static_cast<bd::String>(sortedhubs[idx]).split(' '));
+ bd::String hubnick(hubparams[0]), address(hubparams[1]);
+ in_port_t port = atoi(static_cast<bd::String>(hubparams[2]).c_str());
+ *stream << bd::String::printf(STR("! hub %s %s %d\n"), hubnick.c_str(), address.c_str(), port);
+ }
+ comment("");
+ }
+
comment("# '|' means OR, [] means the enclosed is optional");
comment("# A '+' in front of HOST means the HOST is ipv6");
comment("# A '/' in front of BOT will disable that bot.");
< at >< at > -980,6 +1023,45 < at >< at > bin_to_conf(bool error)
tellconf();
}
+void conf_update_hubs(struct userrec* list) {
+ if (!conf.bot->hub && !conf.bot->localhub) {
+ return;
+ }
+
+ bd::Array<bd::String> hubUsers, oldhubs(conf.hubs);
+
+ // Count how many hubs there are
+ for (struct userrec *u = list; u; u = u->next) {
+ if (bot_hublevel(u) < 999) {
+ hubUsers << u->handle;
+ }
+ }
+
+ conf.hubs.clear();
+ conf.hubs.Reserve(hubUsers.length());
+ for (size_t idx = 0; idx < hubUsers.length(); ++idx) {
+ struct userrec *u = get_user_by_handle(list, const_cast<char*>(static_cast<bd::String>(hubUsers[idx]).c_str()));
+ struct bot_addr *bi = (struct bot_addr *) get_user(&USERENTRY_BOTADDR, u);
+ conf.hubs << bd::String::printf("%s %s %d %d", u->handle, bi->address, bi->telnet_port, bi->hublevel);
+ }
+
+ // Only rewrite binary / notify bots if the hubs changed
+ if (conf.hubs == oldhubs) {
+ return;
+ }
+
+ if (conf.bot->hub || conf.bot->localhub) {
+ /* rewrite our binary */
+ conf_to_bin(&conf, 0, -1);
+
+ /* Now signal all of the old bots with SIGUSR1
+ * They will auto die and determine new localhub, etc..
+ */
+ conf_checkpids(conf.bots);
+ conf_killbot(conf.bots, conf.bot->nick, NULL, SIGUSR1, 1); /* Don't kill me. */
+ }
+}
+
void conf_add_userlist_bots()
{
conf_bot *bot = NULL;
diff --git a/src/conf.h b/src/conf.h
index 1cbcaa4..ac4f040 100755
--- a/src/conf.h
+++ b/src/conf.h
< at >< at > -6,6 +6,7 < at >< at >
#include "types.h"
#include "eggdrop.h"
#include "settings.h"
+#include <bdlib/src/Array.h>
typedef struct conf_net_b {
char *host;
< at >< at > -28,6 +29,7 < at >< at > typedef struct conf_bot_b {
} conf_bot;
typedef struct conf_b {
+ bd::Array<bd::String> hubs;
conf_bot *bots; /* the list of bots */
conf_bot *bot; /* single bot (me) */
int features;/* Pack features (take, mdop, beta... etc..) */
< at >< at > -38,8 +40,8 < at >< at > typedef struct conf_b {
char *datadir;
char *username; /* shell username */
char *homedir; /* homedir */
- port_t portmin; /* for hubs, the reserved port range for incoming connections */
- port_t portmax; /* for hubs, the reserved port range for incoming connections */
+ in_port_t portmin; /* for hubs, the reserved port range for incoming connections */
+ in_port_t portmax; /* for hubs, the reserved port range for incoming connections */
} conf_t;
extern conf_tconf;
< at >< at > -73,5 +75,6 < at >< at > void deluser_removed_bots(conf_bot *, conf_bot *);
conf_bot *conf_getlocalhub(conf_bot *);
void conf_setmypid(pid_t);
void conf_bot_dup(conf_bot *dest, conf_bot *src);
+void conf_update_hubs(struct userrec* list);
#endif /* !_CONF_H */
diff --git a/config.h.in b/src/config.h.in
similarity index 79%
rename from config.h.in
rename to src/config.h.in
index b808554..3cf112f 100644
--- a/config.h.in
+++ b/src/config.h.in
< at >< at > -1,4 +1,4 < at >< at >
-/* config.h.in. Generated from configure.ac by autoheader. */
+/* src/config.h.in. Generated from configure.ac by autoheader. */
/* Define if building universal (internal helper macro) */
#undef AC_APPLE_UNIVERSAL_BUILD
< at >< at > -13,6 +13,9 < at >< at >
/* big endian */
#undef B_ENDIAN
+/* Defines whether or not SSL is supported */
+#undef EGG_SSL_EXT
+
/* Defines the current pack version */
#undef EGG_VERSION
< at >< at > -69,12 +72,18 < at >< at >
/* Define to 1 if you have the `socket' library (-lsocket). */
#undef HAVE_LIBSOCKET
+/* Define if you have support for libtcl */
+#undef HAVE_LIBTCL
+
/* Define to 1 if you have the <limits.h> header file. */
#undef HAVE_LIMITS_H
/* Define to 1 if you have the <locale.h> header file. */
#undef HAVE_LOCALE_H
+/* Define to 1 if the system has the type `long long int'. */
+#undef HAVE_LONG_LONG_INT
+
/* Define to 1 if `lstat' has the bug that it succeeds when given the
zero-length file name argument. */
#undef HAVE_LSTAT_EMPTY_STRING_BUG
< at >< at > -183,6 +192,9 < at >< at >
/* Define to 1 if you have the <sys/param.h> header file. */
#undef HAVE_SYS_PARAM_H
+/* Define to 1 if you have the <sys/prctl.h> header file. */
+#undef HAVE_SYS_PRCTL_H
+
/* Define to 1 if you have the <sys/ptrace.h> header file. */
#undef HAVE_SYS_PTRACE_H
< at >< at > -201,6 +213,12 < at >< at >
/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
#undef HAVE_SYS_WAIT_H
+/* Define for Tcl that has Tcl_Free() (7.5p1 and later). */
+#undef HAVE_TCL_FREE
+
+/* Define for Tcl that has Tcl_SetNotifier() (8.2b1 and later). */
+#undef HAVE_TCL_SETNOTIFIER
+
/* Define to 1 if you have struct timespec in sys/time.h */
#undef HAVE_TIMESPEC
< at >< at > -277,27 +295,6 < at >< at >
/* Define limit of random() function. */
#undef RANDOM_MAX
-/* The size of `int', as computed by sizeof. */
-#undef SIZEOF_INT
-
-/* The size of `long', as computed by sizeof. */
-#undef SIZEOF_LONG
-
-/* The size of `long long', as computed by sizeof. */
-#undef SIZEOF_LONG_LONG
-
-/* The size of `ptrdiff_t', as computed by sizeof. */
-#undef SIZEOF_PTRDIFF_T
-
-/* The size of `short', as computed by sizeof. */
-#undef SIZEOF_SHORT
-
-/* The size of `size_t', as computed by sizeof. */
-#undef SIZEOF_SIZE_T
-
-/* The size of `time_t', as computed by sizeof. */
-#undef SIZEOF_TIME_T
-
/* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */
#undef STAT_MACROS_BROKEN
< at >< at > -313,9 +310,12 < at >< at >
/* Define to 1 if your <sys/time.h> declares `struct tm'. */
#undef TM_IN_SYS_TIME
-/* Define if you want ipv6 support */
+/* Define if you want IPv6 support */
#undef USE_IPV6
+/* Define if you want TCL Script support */
+#undef USE_SCRIPT_TCL
+
/* Enable extensions on AIX 3, Interix. */
#ifndef _ALL_SOURCE
# undef _ALL_SOURCE
< at >< at > -360,6 +360,21 < at >< at >
/* Define to 1 if you need to in order for `stat' and other things to work. */
#undef _POSIX_SOURCE
+/* Define for Solaris 2.5.1 so the uint32_t typedef from <sys/synch.h>,
+ <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
+ #define below would cause a syntax error. */
+#undef _UINT32_T
+
+/* Define for Solaris 2.5.1 so the uint64_t typedef from <sys/synch.h>,
+ <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
+ #define below would cause a syntax error. */
+#undef _UINT64_T
+
+/* Define for Solaris 2.5.1 so the uint8_t typedef from <sys/synch.h>,
+ <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
+ #define below would cause a syntax error. */
+#undef _UINT8_T
+
/* Define to 1 if type `char' is unsigned and you are not using gcc. */
#ifndef __CHAR_UNSIGNED__
# undef __CHAR_UNSIGNED__
< at >< at > -368,6 +383,22 < at >< at >
/* Define to `int' if <sys/types.h> doesn't define. */
#undef gid_t
+/* Define to the type of a signed integer type of width exactly 16 bits if
+ such a type exists and the standard includes do not define it. */
+#undef int16_t
+
+/* Define to the type of a signed integer type of width exactly 32 bits if
+ such a type exists and the standard includes do not define it. */
+#undef int32_t
+
+/* Define to the type of a signed integer type of width exactly 64 bits if
+ such a type exists and the standard includes do not define it. */
+#undef int64_t
+
+/* Define to the type of a signed integer type of width exactly 8 bits if such
+ a type exists and the standard includes do not define it. */
+#undef int8_t
+
/* Define to rpl_malloc if the replacement function should be used. */
#undef malloc
< at >< at > -383,6 +414,22 < at >< at >
/* Define to `int' if <sys/types.h> doesn't define. */
#undef uid_t
+/* Define to the type of an unsigned integer type of width exactly 16 bits if
+ such a type exists and the standard includes do not define it. */
+#undef uint16_t
+
+/* Define to the type of an unsigned integer type of width exactly 32 bits if
+ such a type exists and the standard includes do not define it. */
+#undef uint32_t
+
+/* Define to the type of an unsigned integer type of width exactly 64 bits if
+ such a type exists and the standard includes do not define it. */
+#undef uint64_t
+
+/* Define to the type of an unsigned integer type of width exactly 8 bits if
+ such a type exists and the standard includes do not define it. */
+#undef uint8_t
+
/* Define as `fork' if `vfork' does not work. */
#undef vfork
< at >< at > -424,3 +471,10 < at >< at >
# endif
#endif
+/* TCL sanity check */
+#ifdef USE_SCRIPT_TCL
+# ifndef HAVE_LIBTCL
+# undef USE_SCRIPT_TCL
+# endif
+#endif
+
diff --git a/src/crypt.c b/src/crypt.c
index cb2cf96..1ef3c01 100755
--- a/src/crypt.c
+++ b/src/crypt.c
< at >< at > -11,7 +11,7 < at >< at >
#include "settings.h"
#include "misc.h"
#include "base64.h"
-#include "src/crypto/crypto.h"
+#include "libcrypto.h"
#include <stdarg.h>
#include <bdlib/src/String.h>
#include <bdlib/src/Stream.h>
diff --git a/src/crypt.h b/src/crypt.h
index 0faf3b9..db4b82a 100755
--- a/src/crypt.h
+++ b/src/crypt.h
< at >< at > -8,7 +8,7 < at >< at >
#endif
#include <sys/types.h>
-#include "src/crypto/crypto.h"
+#include "libcrypto.h"
#include "users.h"
#define SHA_HASH_LENGTH (SHA_DIGEST_LENGTH << 1)
diff --git a/src/crypto/Makefile.in b/src/crypto/Makefile.in
index a015b51..37f9218 100755
--- a/src/crypto/Makefile.in
+++ b/src/crypto/Makefile.in
< at >< at > -8,13 +8,14 < at >< at > CPPFLAGS = < at >CPPFLAGS< at >
STRIP = < at >STRIP< at >
VPATH = < at >srcdir< at >
-depcomp = /bin/sh $(top_srcdir)/autotools/depcomp
+depcomp = /bin/sh $(top_srcdir)/build/autotools/depcomp
< at >SET_MAKE< at >
OBJS = \
aes_util.o \
- bf_util.o
+ bf_util.o \
+ dh_util.o
doofus:
< at >echo ""
< at >< at > -29,13 +30,14 < at >< at > crypto: $(OBJS)
include ./.deps/includes
-.SUFFIXES:
-.SUFFIXES: .c .o .h
-
-.c.o:
-< at >echo -e "Compiling: \033[1m`basename $< .c`\033[0m"
-source='$<' object='$< at >' depfile='.deps/$*.Po' tmpdepfile='.deps/$*.TPo' depmode=$(CCDEPMODE) $(depcomp) \
-$(CXX) $(CXXFLAGS) -I../.. -I$(top_srcdir) -I$(top_srcdir)/src $(CPPFLAGS) -c $<
-
-
-
+%.o: %.c
+< at >echo -e "Compiling: \033[1m$*\033[0m"
+ifeq ($(CCDEPMODE),gcc3)
+if $(CXX) -MT '$< at >' -MD -MP -MF '.deps/$*.TPo' $(CXXFLAGS) $(CPPFLAGS) -c $< -o $< at >; then \
+mv '.deps/$*.TPo' '.deps/$*.Po'; \
+else rm -f '.deps/$*.Tpo'; exit 1; \
+fi
+else
+libtool=no source='$<' object='$< at >' depfile='.deps/$*.Po' tmpdepfile='.deps/$*.TPo' depmode=$(CCDEPMODE) $(depcomp) \
+$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $< -o $< at >
+endif
diff --git a/src/crypto/aes_util.c b/src/crypto/aes_util.c
index 126e9f5..691859d 100644
--- a/src/crypto/aes_util.c
+++ b/src/crypto/aes_util.c
< at >< at > -2,7 +2,7 < at >< at >
*
*/
-#include "crypto.h"
+#include "src/libcrypto.h"
#include "src/compat/compat.h"
#include <bdlib/src/String.h>
diff --git a/src/crypto/bf_util.c b/src/crypto/bf_util.c
index a8f25b2..525057b 100644
--- a/src/crypto/bf_util.c
+++ b/src/crypto/bf_util.c
< at >< at > -2,7 +2,7 < at >< at >
*
*/
-#include "crypto.h"
+#include "src/libcrypto.h"
#include "src/compat/compat.h"
#include <bdlib/src/String.h>
< at >< at > -32,8 +32,8 < at >< at > static const char eggdrop_blowfish_base64_index[256] = {
union bf_data {
struct {
- unsigned long left;
- unsigned long right;
+ BF_LONG left;
+ BF_LONG right;
} lr;
BF_LONG bf_long;
};
< at >< at > -51,8 +51,8 < at >< at > bd::String egg_bf_encrypt(bd::String in, const bd::String& key)
/* No key, no encryption */
if (!key.length()) return in;
- bd::String out(size_t(in.length() * 1.5));
size_t datalen = in.length();
+ bd::String out(static_cast<size_t>(datalen * 1.5));
if (datalen % 8 != 0) {
datalen += 8 - (datalen % 8);
in.resize(datalen, 0);
< at >< at > -94,7 +94,7 < at >< at > bd::String egg_bf_decrypt(bd::String in, const bd::String& key)
// Skip over '+OK '
if (in(0, 4) == "+OK ")
in += static_cast<size_t>(4);
- bd::String out(size_t(in.length() * .9));
+ bd::String out(static_cast<size_t>(in.length() * .9));
// Too small to process
if (in.size() < 12) return out;
< at >< at > -122,8 +122,20 < at >< at > bd::String egg_bf_decrypt(bd::String in, const bd::String& key)
data.lr.left |= val << part * 6;
}
BF_decrypt(&data.bf_long, &bf_d_key);
- for (part = 0; part < 4; part++) out += char((data.lr.left & (0xff << ((3 - part) * 8))) >> ((3 - part) * 8));
- for (part = 0; part < 4; part++) out += char((data.lr.right & (0xff << ((3 - part) * 8))) >> ((3 - part) * 8));
+ for (part = 0; part < 4; part++) {
+ const char decrypted_char = char((data.lr.left & (0xff << ((3 - part) * 8))) >> ((3 - part) * 8));
+ // Don't write NULLs into the string
+ if (decrypted_char) {
+ out += decrypted_char;
+ }
+ }
+ for (part = 0; part < 4; part++) {
+ const char decrypted_char = char((data.lr.right & (0xff << ((3 - part) * 8))) >> ((3 - part) * 8));
+ // Don't write NULLs into the string
+ if (decrypted_char) {
+ out += decrypted_char;
+ }
+ }
}
return out;
diff --git a/src/crypto/crypto.h b/src/crypto/crypto.h
deleted file mode 100755
index 834a068..0000000
--- a/src/crypto/crypto.h
+++ /dev/null
< at >< at > -1,12 +0,0 < at >< at >
-#ifndef _CRYPTO_H
-#define _CRYPTO_H
-
-#include "aes_util.h"
-#include "bf_util.h"
-#include <openssl/crypto.h>
-#include <openssl/aes.h>
-#include <openssl/blowfish.h>
-#include <openssl/md5.h>
-#include <openssl/sha.h>
-
-#endif /* !_CRYPTO_H */
diff --git a/src/crypto/dh_util.c b/src/crypto/dh_util.c
new file mode 100644
index 0000000..650c7ce
--- /dev/null
+++ b/src/crypto/dh_util.c
< at >< at > -0,0 +1,154 < at >< at >
+/* dh_util.c
+ *
+ * Adapted from ZNC-fish
+ */
+
+#include "src/libcrypto.h"
+#include "src/compat/compat.h"
+#include <bdlib/src/String.h>
+#include <bdlib/src/base64.h>
+#include "dh_util.h"
+
+static BIGNUM* b_prime = NULL;
+static BIGNUM* b_generator = NULL;
+
+void DH1080_init() {
+ // ### new sophie-germain 1080bit prime number ###
+ //const char *prime1080 = "++ECLiPSE+is+proud+to+present+latest+FiSH+release+featuring+even+more+security+for+you+++shouts+go+out+to+TMG+for+helping+to+generate+this+cool+sophie+germain+prime+number++++/C32L";
+ // Base16: FBE1022E23D213E8ACFA9AE8B9DFADA3EA6B7AC7A7B7E95AB5EB2DF858921FEADE95E6AC7BE7DE6ADBAB8A783E7AF7A7FA6A2B7BEB1E72EAE2B72F9FA2BFB2A2EFBEFAC868BADB3E828FA8BADFADA3E4CC1BE7E8AFE85E9698A783EB68FA07A77AB6AD7BEB618ACF9CA2897EB28A6189EFA07AB99A8A7FA9AE299EFA7BA66DEAFEFBEFBF0B7D8B
+ // Base10: 12745216229761186769575009943944198619149164746831579719941140425076456621824834322853258804883232842877311723249782818608677050956745409379781245497526069657222703636504651898833151008222772087491045206203033063108075098874712912417029101508315117935752962862335062591404043092163187352352197487303798807791605274487594646923
+ const char *prime1080 = "FBE1022E23D213E8ACFA9AE8B9DFADA3EA6B7AC7A7B7E95AB5EB2DF858921FEADE95E6AC7BE7DE6ADBAB8A783E7AF7A7FA6A2B7BEB1E72EAE2B72F9FA2BFB2A2EFBEFAC868BADB3E828FA8BADFADA3E4CC1BE7E8AFE85E9698A783EB68FA07A77AB6AD7BEB618ACF9CA2897EB28A6189EFA07AB99A8A7FA9AE299EFA7BA66DEAFEFBEFBF0B7D8B";
+
+ if (!BN_hex2bn(&b_prime, prime1080)) {
+ sdprintf("BAD PRIME");
+ return;
+ }
+
+ if (!BN_dec2bn(&b_generator, "2")) {
+ sdprintf("BAD GENERATOR");
+ return;
+ }
+}
+
+void DH1080_uninit() {
+ BN_clear_free(b_prime);
+ BN_clear_free(b_generator);
+}
+
+/**
+ * < at >brief Encode a string using FiSH's base64 algorithm (from FiSH/mIRC)
+ * < at >note Any = padding is removed, and an 'A' is added if no padding was needed
+ * < at >param bd::String str The string to encode
+ * < at >returns Encoded string
+ * < at >note Adapated from FiSH code
+ */
+bd::String fishBase64Encode(const bd::String& str) {
+ bd::String result(bd::base64Encode(str));
+
+ // No padding, add an A on the end (base64-encoded NULL-terminator)
+ if (result.rfind('=') == result.npos) {
+ result += 'A';
+ } else {
+ // Remove padding
+ while (result.rfind('=') != result.npos) {
+ --result;
+ }
+ }
+ return result;
+}
+
+/**
+ * < at >brief Decode a string using FiSH's base64 algorithm (from FiSH/mIRC)
+ * < at >param bd::String str The string to decode
+ * < at >returns Decoded data
+ * < at >note Adapated from FiSH code
+ */
+bd::String fishBase64Decode(const bd::String& str) {
+ bd::String temp(str);
+
+ // Remove the 'A' NULL-terminator if present
+ if (temp.length() % 4 == 1 && temp(-1, 1) == 'A') {
+ --temp;
+ }
+
+ while (temp.length() % 4) {
+ temp += '=';
+ }
+
+ return bd::base64Decode(temp);
+}
+
+
+void DH1080_gen(bd::String& privateKey, bd::String& publicKeyB64) {
+ DH *dh = NULL;
+
+ dh = DH_new();
+ dh->p = BN_dup(b_prime);
+ dh->g = BN_dup(b_generator);
+
+ if (!DH_generate_key(dh)) {
+ DH_free(dh);
+ return;
+ }
+
+ // Get private key
+ privateKey.resize(BN_num_bytes(dh->priv_key), 0);
+ BN_bn2bin(dh->priv_key, reinterpret_cast<unsigned char*>(privateKey.mdata()));
+
+ // Get public key
+ bd::String publicKey;
+ // Resize as the mdata() modification won't update the internal length, but resize() will
+ publicKey.resize(static_cast<size_t>(BN_num_bytes(dh->pub_key)));
+ BN_bn2bin(dh->pub_key, reinterpret_cast<unsigned char*>(publicKey.mdata()));;
+
+ // base64 encode
+ publicKeyB64 = fishBase64Encode(publicKey);
+
+ DH_free(dh);
+}
+
+bool DH1080_comp(const bd::String privateKey, const bd::String theirPublicKeyB64, bd::String& sharedKey) {
+ BIGNUM *b_myPrivkey = NULL, *b_HisPubkey = NULL;
+ DH *dh = NULL;
+
+
+ dh = DH_new();
+ dh->p = BN_dup(b_prime);
+ dh->g = BN_dup(b_generator);
+
+ // Setup my private key
+ b_myPrivkey = BN_bin2bn(reinterpret_cast<const unsigned char*>(privateKey.data()), privateKey.length(), NULL);
+ dh->priv_key = b_myPrivkey;
+
+ // Prep their public key
+ bd::String theirPublicKey(fishBase64Decode(theirPublicKeyB64));
+ b_HisPubkey = BN_bin2bn(reinterpret_cast<const unsigned char*>(theirPublicKey.data()), theirPublicKey.length(), NULL);
+
+ // Compute the Shared key
+ char *key = (char *)my_calloc(1, DH_size(dh));
+ size_t len = DH_compute_key((unsigned char *)key, b_HisPubkey, dh);
+ DH_free(dh);
+ BN_clear_free(b_HisPubkey);
+ if (len == static_cast<size_t>(-1)) {
+ // Bad pub key
+ unsigned long err = ERR_get_error();
+ sdprintf("** DH Error: %s", ERR_error_string(err, NULL));
+ free(key);
+
+ sharedKey = ERR_error_string(err, NULL);
+ return false;
+ }
+
+ SHA256_CTX c;
+ bd::String SHA256Digest(static_cast<size_t>(SHA256_DIGEST_LENGTH));
+ SHA256Digest.resize(SHA256_DIGEST_LENGTH);
+
+ SHA256_Init(&c);
+ SHA256_Update(&c, key, len);
+ SHA256_Final(reinterpret_cast<unsigned char*>(SHA256Digest.mdata()), &c);
+ sharedKey = fishBase64Encode(SHA256Digest);
+
+ free(key);
+
+ return true;
+}
diff --git a/src/crypto/dh_util.h b/src/crypto/dh_util.h
new file mode 100644
index 0000000..0f9622e
--- /dev/null
+++ b/src/crypto/dh_util.h
< at >< at > -0,0 +1,22 < at >< at >
+/* dh_util.h
+ *
+ */
+
+#ifndef _DH_UTIL_H
+#define _DH_UTIL_H 1
+
+#include <sys/types.h>
+#include <openssl/dh.h>
+
+namespace bd {
+ class String;
+}
+
+// Adapated from znc-fish
+bd::String fishBase64Encode(const bd::String& str);
+bd::String fishBase64Decode(const bd::String& str);
+void DH1080_gen(bd::String& privateKey, bd::String& publicKeyB64);
+bool DH1080_comp(const bd::String privateKey, const bd::String theirPublicKeyB64, bd::String& sharedKey);
+void DH1080_init();
+void DH1080_uninit();
+#endif
diff --git a/src/dcc.c b/src/dcc.c
index a86a4ed..61e040c 100755
--- a/src/dcc.c
+++ b/src/dcc.c
< at >< at > -613,7 +613,7 < at >< at > static void
dcc_identd_connect(int idx, char *buf, int atr)
{
in_addr_t ip;
- port_t port;
+ in_port_t port;
int j, sock;
char s[UHOSTLEN + 1] = "";
< at >< at > -1022,6 +1022,8 < at >< at > dcc_chat_pass(int idx, char *buf, int atr)
return;
}
+ sdprintf(STR("Using '%s' (%d/%d) for link with %s"), enclink[i].name, enclink[i].type, i, dcc[idx].nick);
+
if (buf[0]) {
const char *expected_nick = newsplit(&buf);
< at >< at > -1373,7 +1375,7 < at >< at > static void
dcc_telnet(int idx, char *buf, int ii)
{
in_addr_t ip;
- port_t port;
+ in_port_t port;
char s[UHOSTLEN + 1] = "";
int i;
char x[1024] = "";
< at >< at > -1419,11 +1421,7 < at >< at > dcc_telnet(int idx, char *buf, int ii)
return;
}
-#if SIZEOF_SHORT == 2
- if (port < 1024) {
-#else
- if (port < 1024 || port > 65535) {
-#endif
+ if (port < 1024 || port > 65534) {
putlog(LOG_BOTS, "*", "Refused %s/%d (bad src port)", s, port);
killsock(sock);
return;
diff --git a/src/dcc.h b/src/dcc.h
index 34a8677..a9026b4 100755
--- a/src/dcc.h
+++ b/src/dcc.h
< at >< at > -61,7 +61,7 < at >< at > struct dcc_t {
// int auth;
bool whowas;
int dns_id;
- port_t port;
+ in_port_t port;
char simulbot[HANDLEN + 1]; /* used for hub->leaf cmd simulation, holds bot that results should be sent to */
char hash[MD5_HASH_LENGTH + 1]; /* used for dcc authing */
char shahash[SHA_HASH_LENGTH + 1];
< at >< at > -118,7 +118,7 < at >< at > struct xfer_info {
struct bot_info {
int numver;
int uff_flags; /* user file feature flags */
- port_t port; /* base port */
+ in_port_t port; /* base port */
char linker[NOTENAMELEN + 1]; /* who requested this link */
char sysname[121];
char version[121]; /* channel/version info */
< at >< at > -132,7 +132,7 < at >< at > struct relay_info {
#ifdef USE_IPV6
int af;
#endif /* USE_IPV6 */
- port_t port;
+ in_port_t port;
};
struct dupwait_info {
diff --git a/src/dccutil.c b/src/dccutil.c
index 25841be..c643d02 100755
--- a/src/dccutil.c
+++ b/src/dccutil.c
< at >< at > -210,52 +210,47 < at >< at > colorbuf(char *buf, size_t len, int idx, size_t bufsiz)
/* Dump a potentially super-long string of text.
*/
-void dumplots(int idx, const char *prefix, const char *data)
+void dumplots(int idx, const char *prefix, const bd::String data)
{
if (unlikely(!*data)) {
dprintf(idx, "%s\n", prefix);
return;
}
- char *p = (char*)data, *q = NULL, *n = NULL, c = 0;
const size_t max_data_len = 120 - strlen(prefix);
+ bd::Array<bd::String> lines = data.split('\n');
+ size_t i = 0;
- while ((strlen(p) - ansi_len(p)) > max_data_len) {
- q = p + max_data_len;
- /* Search for embedded linefeed first */
- n = strchr(p, '\n');
- if (n && n < q) {
- /* Great! dump that first line then start over */
- *n = 0;
- dprintf(idx, "%s%s\n", prefix, p);
- *n = '\n';
- p = n + 1;
- } else {
- /* Search backwards for the last space */
- while (*q != ' ' && q != p)
- q--;
- if (q == p)
- q = p + max_data_len;
- c = *q;
- *q = 0;
- dprintf(idx, "%s%s\n", prefix, p);
- *q = c;
- p = q;
- if (c == ' ')
- p++;
- }
- }
- /* Last trailing bit: split by linefeeds if possible */
- n = strchr(p, '\n');
- while (n) {
- *n = 0;
- dprintf(idx, "%s%s\n", prefix, p);
- *n = '\n';
- p = n + 1;
- n = strchr(p, '\n');
- }
- if (*p)
- dprintf(idx, "%s%s\n", prefix, p); /* Last trailing bit */
+ while (i < lines.length()) {
+ bd::String line(lines[i]);
+
+ if (line.length() > max_data_len) {
+ // Truncate at last space if possible
+ const size_t line_max = std::min(line.length() - 1, max_data_len);
+ size_t pos = line_max;
+
+ while (pos != bd::String::npos && !strchr(",:; ", line[pos]))
+ --pos;
+ if (pos == bd::String::npos)
+ pos = line_max;
+
+ if (strchr(",:;", line[pos]))
+ ++pos;
+
+ if (bd::String(line(pos)).find("\n") != bd::String::npos) // Newline in remaining: dump it
+ dprintf(idx, "%s%s\n", prefix, bd::String(line(pos)).c_str());
+ else {
+ const size_t tpos = line[pos] == ' ' ? pos + 1 : pos; // Trim out the space
+ if (lines.length() - (i + 1) > 0) // Wrapped text: prepend to next line if possible
+ lines[i + 1] = line(tpos) + lines[i + 1];
+ else // Wrapped text (last line): Add onto list of lines
+ lines << line(tpos);
+ }
+ line.resize(pos);
+ }
+ dprintf(idx, "%s%s\n", prefix, line.c_str());
+ ++i;
+ }
}
void
< at >< at > -635,12 +630,12 < at >< at > tell_dcc(int idx)
if (nicklen < 9)
nicklen = 9;
- simple_snprintf(format, sizeof format, "%%-4s %%-4s %%-8s %%-5s %%-%zus %%-40s %%s\n", nicklen);
- dprintf(idx, format, "SOCK", "IDX", "ADDR", "PORT", "NICK", "HOST", "TYPE");
- dprintf(idx, format, "----", "---", "--------", "-----", "---------",
+ simple_snprintf(format, sizeof format, "%%-4s %%-4s %%-4s %%-8s %%-5s %%-%zus %%-40s %%s\n", nicklen);
+ dprintf(idx, format, "SOCK", "IDX", "SSL", "ADDR", "PORT", "NICK", "HOST", "TYPE");
+ dprintf(idx, format, "----", "---", "---", "--------", "-----", "---------",
"----------------------------------------", "----");
- simple_snprintf(format, sizeof format, "%%-4d %%-4d %%08X %%5u %%-%zus %%-40s %%s\n", nicklen);
+ simple_snprintf(format, sizeof format, "%%-4d %%-4d %%-4s %%08X %%5u %%-%zus %%-40s %%s\n", nicklen);
dprintf(idx, "dccn: %d, dcc_total: %d\n", dccn, dcc_total);
dprintf(idx, "dns_idx: %d, servidx: %d\n", dns_idx, servidx);
< at >< at > -657,7 +652,8 < at >< at > tell_dcc(int idx)
simple_snprintf(other, sizeof(other), "?:%lX !! ERROR !!", (long) dcc[i].type);
break;
}
- dprintf(idx, format, dcc[i].sock, i, dcc[i].addr, dcc[i].port, dcc[i].nick, dcc[i].host + j, other);
+ int snum = findanysnum(dcc[i].sock);
+ dprintf(idx, format, dcc[i].sock, i, (snum != -1 && socklist[snum].ssl) ? "yes" : "no", dcc[i].addr, dcc[i].port, dcc[i].nick, dcc[i].host + j, other);
}
}
}
< at >< at > -878,10 +874,10 < at >< at > do_boot(int idx, const char *by, const char *reason)
}
int
-listen_all(port_t lport, bool off, bool should_v6)
+listen_all(in_port_t lport, bool off, bool should_v6)
{
int idx = -1;
- port_t port, realport;
+ in_port_t port, realport;
#ifdef USE_IPV6
int i6 = -1;
< at >< at > -1008,7 +1004,7 < at >< at > identd_open(const char *sourceIp, const char *destIp, int identd)
{
int idx;
int i = -1;
- port_t port = 113;
+ in_port_t port = 113;
for (idx = 0; idx < dcc_total; idx++)
if (dcc[idx].type == &DCC_IDENTD_CONNECT)
diff --git a/src/dccutil.h b/src/dccutil.h
index c8b824d..67ae0a5 100755
--- a/src/dccutil.h
+++ b/src/dccutil.h
< at >< at > -7,13 +7,14 < at >< at >
/* Public structure for the listening port map */
struct portmap {
- port_t realport;
- port_t mappedto;
+ in_port_t realport;
+ in_port_t mappedto;
struct portmap *next;
};
namespace bd {
class Stream;
+ class String;
}
#define dprintf dprintf_eggdrop
< at >< at > -37,7 +38,7 < at >< at > namespace bd {
void init_dcc(void);
-void dumplots(int, const char *, const char *);
+void dumplots(int, const char *, bd::String);
void rdprintf(const char*, int, const char *, ...) __attribute__((format(printf, 3, 4)));
void dprintf(int, const char *, ...) __attribute__((format(printf, 2, 3)));
void dprintf_real(int, char*, size_t, size_t, const char* = NULL);
< at >< at > -60,7 +61,7 < at >< at > void do_boot(int, const char *, const char *);
int detect_dcc_flood(time_t *, struct chat_info *, int);
void identd_open(const char * = NULL, const char * = NULL, int identd = 1);
void identd_close();
-int listen_all(port_t, bool, bool);
+int listen_all(in_port_t, bool, bool);
bool valid_idx(int);
int dcc_read(bd::Stream&);
void dcc_write(bd::Stream&, int);
diff --git a/src/debug.c b/src/debug.c
index 7333d6a..b9bce7c 100755
--- a/src/debug.c
+++ b/src/debug.c
< at >< at > -115,13 +115,48 < at >< at > void sdprintf (const char *format, ...)
#endif
}
-static void write_debug()
+static void write_debug(bool fatal = 1)
{
+ if (fatal) {
+ segfaulted = 1;
+ alarm(0);/* dont let anything jump out of this signal! */
+ }
+
putlog(LOG_MISC, "*", "** Paste to bryan:");
const size_t cur_buf = (current_get_buf == 0) ? GET_BUFS - 1 : current_get_buf - 1;
for (size_t i = 0; i < GET_BUFS; i++)
putlog(LOG_MISC, "*", "%c %02zu: %s", i == cur_buf ? '*' : '_', i, get_buf[i]);
putlog(LOG_MISC, "*", "** end");
+
+#ifdef DEBUG
+ if (fatal) {
+ /* Write GDB backtrace */
+ char gdb[1024] = "", btfile[256] = "", std_in[101] = "", *out = NULL;
+
+ simple_snprintf(btfile, sizeof(btfile), ".gdb-backtrace-%d", (int)getpid());
+
+ FILE *f = fopen(btfile, "w");
+
+ if (f) {
+ strlcpy(std_in, "bt 100\nbt 100 full\ndetach\nquit\n", sizeof(std_in));
+ //simple_snprintf(stdin, sizeof(stdin), "detach\n");
+ //simple_snprintf(stdin, sizeof(stdin), "q\n");
+
+ simple_snprintf(gdb, sizeof(gdb), "gdb --pid=%d %s", (int)getpid(), binname);
+ shell_exec(gdb, std_in, &out, NULL);
+ fprintf(f, "%s\n", out);
+ fclose(f);
+ free(out);
+ }
+
+ //enabling core dumps
+ struct rlimit limit;
+ if (!getrlimit(RLIMIT_CORE, &limit)) {
+ limit.rlim_cur = limit.rlim_max;
+ setrlimit(RLIMIT_CORE, &limit);
+ }
+ }
+#endif
}
#ifndef DEBUG
< at >< at > -146,57 +181,36 < at >< at > static void got_segv(int) __attribute__ ((noreturn));
static void got_segv(int z)
{
- segfaulted = 1;
- alarm(0);/* dont let anything jump out of this signal! */
signal(SIGSEGV, SIG_DFL);
write_debug();
fatal("SEGMENT VIOLATION -- CRASHING!", 1);
#ifdef DEBUG
- char gdb[1024] = "", btfile[256] = "", std_in[101] = "", *out = NULL;
-
- simple_snprintf(btfile, sizeof(btfile), ".gdb-backtrace-%d", getpid());
-
- FILE *f = fopen(btfile, "w");
-
- if (f) {
- strlcpy(std_in, "bt 100\nbt 100 full\ndetach\nquit\n", sizeof(stdin));
-// simple_snprintf(stdin, sizeof(stdin), "detach\n");
-// simple_snprintf(stdin, sizeof(stdin), "q\n");
-
- simple_snprintf(gdb, sizeof(gdb), "gdb %s %d", binname, getpid());
- shell_exec(gdb, std_in, &out, NULL);
- fprintf(f, "%s\n", out);
- fclose(f);
- free(out);
- }
-
- //enabling core dumps
- struct rlimit limit;
- if (!getrlimit(RLIMIT_CORE, &limit)) {
- limit.rlim_cur = limit.rlim_max;
- setrlimit(RLIMIT_CORE, &limit);
- }
-
raise(SIGSEGV);
#else
exit(1);
#endif /* DEBUG */
}
+#ifndef DEBUG
static void got_fpe(int) __attribute__ ((noreturn));
+#endif /* DEBUG */
static void got_fpe(int z)
{
+ signal(SIGFPE, SIG_DFL);
write_debug();
- fatal("FLOATING POINT ERROR -- CRASHING!", 0);
- exit(1);/* for GCC noreturn */
+ fatal("FLOATING POINT ERROR -- CRASHING!", 1);
+#ifdef DEBUG
+ raise(SIGFPE);
+#else
+ exit(1);
+#endif /* DEBUG */
}
static void got_term(int) __attribute__ ((noreturn));
static void got_term(int z)
{
- if (conf.bot->hub)
write_userfile(-1);
fatal("Received SIGTERM", 0);
exit(1);/* for GCC noreturn */
< at >< at > -212,7 +226,7 < at >< at > static void got_abort(int z)
write_debug();
fatal("GOT SIGABRT -- CRASHING!", 1);
#ifdef DEBUG
- raise(SIGSEGV);
+ raise(SIGABRT);
#else
exit(1);
#endif /* DEBUG */
< at >< at > -237,7 +251,7 < at >< at > static void got_alarm(int z)
*/
static void got_ill(int z)
{
- write_debug();
+ write_debug(0);
}
static void
diff --git a/src/dhparam.c b/src/dhparam.c
new file mode 100644
index 0000000..b46b1fa
--- /dev/null
+++ b/src/dhparam.c
< at >< at > -0,0 +1,108 < at >< at >
+DH *get_dh2048() {
+ static unsigned char dh2048_p[]={
+ 0xF1,0x9D,0x80,0xC5,0xC2,0x7F,0xE8,0xA5,0x37,0xDA,0x28,0x46,
+ 0x6C,0x95,0x0A,0xC5,0x6C,0xE3,0x7E,0x1D,0x1F,0x4A,0x2E,0xD7,
+ 0x6B,0xC1,0x80,0x4E,0xC9,0xC0,0x3F,0xB3,0x57,0x73,0x72,0xF2,
+ 0xDA,0x30,0x15,0xB1,0xD3,0xD6,0x25,0x90,0xAF,0x8B,0x3F,0x81,
+ 0x46,0x75,0xB1,0x1E,0x1B,0x85,0x5A,0x6C,0x13,0xA1,0x73,0x65,
+ 0xFC,0x90,0xF3,0xBC,0xB9,0x9C,0xA0,0x62,0x74,0x7C,0x24,0x24,
+ 0x27,0x80,0x12,0x3D,0x36,0xE9,0x62,0x78,0x31,0xE9,0x2F,0x96,
+ 0xF4,0xD4,0xF2,0x04,0xEF,0x24,0x2C,0x60,0x04,0x41,0xF0,0x3E,
+ 0xE9,0xF4,0xB4,0x5C,0x4F,0xFB,0xF3,0x64,0x91,0xB1,0x9F,0x5B,
+ 0xBF,0xE5,0xBE,0x6F,0xD7,0x5B,0xED,0x34,0x94,0x51,0x58,0xDF,
+ 0x00,0x5B,0x58,0xAE,0xBB,0x53,0x50,0xDE,0xFC,0x0A,0x91,0x6F,
+ 0x3B,0xC7,0x7A,0x5E,0x7C,0xEE,0x5F,0x5E,0x3E,0x41,0x00,0x82,
+ 0xD5,0x45,0x98,0xCC,0x01,0xFB,0x5C,0x64,0xBB,0xFB,0x06,0x55,
+ 0xE5,0x19,0x6A,0x38,0x77,0x40,0x01,0xC6,0xCE,0xB5,0x52,0x82,
+ 0xAA,0x7B,0x80,0xE6,0x37,0xB3,0x10,0x89,0x6E,0x42,0x63,0x33,
+ 0xF8,0xCC,0xB6,0xC8,0xC6,0x9D,0xE2,0x98,0x3B,0xFC,0xFE,0xE4,
+ 0xD2,0xB5,0xD3,0x19,0x6F,0xD7,0x62,0xBC,0xAA,0x16,0x92,0x14,
+ 0xA0,0xD0,0xC1,0x7B,0xA9,0xE8,0x16,0xFC,0x6A,0x66,0x6F,0x29,
+ 0xCA,0x18,0x28,0x4C,0x06,0xD8,0xAB,0x92,0x40,0xD5,0x83,0x9D,
+ 0xEB,0x23,0x17,0x9E,0x06,0x20,0xF7,0xE8,0x8C,0xB9,0x0D,0xE7,
+ 0x9D,0x40,0x50,0xA7,0xA1,0x74,0xD6,0xDF,0xF2,0x12,0x08,0xB3,
+ 0x6B,0x4F,0x4A,0xAB,
+ };
+ static unsigned char dh2048_g[]={
+ 0x02,
+ };
+ DH *dh;
+
+ if ((dh=DH_new()) == NULL) return(NULL);
+ dh->p=BN_bin2bn(dh2048_p,sizeof(dh2048_p),NULL);
+ dh->g=BN_bin2bn(dh2048_g,sizeof(dh2048_g),NULL);
+ if ((dh->p == NULL) || (dh->g == NULL))
+ { DH_free(dh); return(NULL); }
+ return(dh);
+}
+/*
+ -----BEGIN DH PARAMETERS-----
+ MIIBCAKCAQEA8Z2AxcJ/6KU32ihGbJUKxWzjfh0fSi7Xa8GATsnAP7NXc3Ly2jAV
+ sdPWJZCviz+BRnWxHhuFWmwToXNl/JDzvLmcoGJ0fCQkJ4ASPTbpYngx6S+W9NTy
+ BO8kLGAEQfA+6fS0XE/782SRsZ9bv+W+b9db7TSUUVjfAFtYrrtTUN78CpFvO8d6
+ XnzuX14+QQCC1UWYzAH7XGS7+wZV5RlqOHdAAcbOtVKCqnuA5jezEIluQmMz+My2
+ yMad4pg7/P7k0rXTGW/XYryqFpIUoNDBe6noFvxqZm8pyhgoTAbYq5JA1YOd6yMX
+ ngYg9+iMuQ3nnUBQp6F01t/yEgiza09KqwIBAg==
+ -----END DH PARAMETERS-----
+ */
+
+DH *get_dh1024() {
+ static unsigned char dh1024_p[]={
+ 0xDA,0xF0,0x76,0xC8,0x15,0xC8,0xD2,0x62,0xED,0xBB,0x58,0x50,
+ 0xB8,0x9A,0xF0,0x48,0xEF,0x09,0x6A,0x07,0xF5,0x42,0x34,0x92,
+ 0xBA,0xC2,0x5E,0xA9,0x2D,0xC9,0xED,0xE7,0xF8,0x93,0x67,0x46,
+ 0x47,0x42,0xD8,0xEB,0xA4,0x72,0xB4,0x51,0xF1,0xF2,0xCD,0xDC,
+ 0x55,0x7D,0xD9,0x69,0x2B,0x91,0x57,0xA5,0xC3,0xDB,0x35,0x0C,
+ 0xBE,0xAD,0x11,0xF2,0x26,0xB9,0x97,0x8E,0x71,0x80,0xEF,0x03,
+ 0x01,0xEC,0x1B,0xE4,0xB3,0x6C,0xEB,0x52,0xF4,0x0E,0x15,0x50,
+ 0xB5,0x5C,0x67,0xB8,0x57,0xAE,0xB9,0xC2,0xA9,0xD1,0x40,0x92,
+ 0x9E,0xFC,0xAE,0x8E,0xCA,0xC6,0xA3,0xD5,0x02,0x41,0x80,0xD0,
+ 0x06,0x16,0xB7,0xB4,0xD1,0xC5,0x10,0xA9,0x18,0xE6,0x13,0xD9,
+ 0x07,0x40,0x15,0xBC,0xFF,0x15,0xA3,0x5B,
+ };
+ static unsigned char dh1024_g[]={
+ 0x02,
+ };
+ DH *dh;
+
+ if ((dh=DH_new()) == NULL) return(NULL);
+ dh->p=BN_bin2bn(dh1024_p,sizeof(dh1024_p),NULL);
+ dh->g=BN_bin2bn(dh1024_g,sizeof(dh1024_g),NULL);
+ if ((dh->p == NULL) || (dh->g == NULL))
+ { DH_free(dh); return(NULL); }
+ return(dh);
+}
+/*
+ -----BEGIN DH PARAMETERS-----
+ MIGHAoGBANrwdsgVyNJi7btYULia8EjvCWoH9UI0krrCXqktye3n+JNnRkdC2Ouk
+ crRR8fLN3FV92WkrkVelw9s1DL6tEfImuZeOcYDvAwHsG+SzbOtS9A4VULVcZ7hX
+ rrnCqdFAkp78ro7KxqPVAkGA0AYWt7TRxRCpGOYT2QdAFbz/FaNbAgEC
+ -----END DH PARAMETERS-----
+ */
+DH *get_dh512() {
+ static unsigned char dh512_p[]={
+ 0xC1,0x6E,0x10,0x0D,0x46,0x47,0xDA,0x08,0x42,0x54,0x02,0x23,
+ 0x85,0xEE,0x07,0x3C,0x2E,0x7B,0xA9,0x3A,0xA8,0x88,0xDD,0x4E,
+ 0x3F,0x71,0x8E,0xD3,0x52,0x3A,0xCA,0xC9,0xC3,0xF4,0xCD,0x65,
+ 0x5E,0x05,0x25,0xA9,0xBA,0x10,0x8A,0x88,0x37,0xB3,0xCD,0x5D,
+ 0x02,0x03,0x06,0x35,0x47,0x3C,0xD9,0x44,0x99,0xBB,0x9B,0x4C,
+ 0x24,0xB2,0xC0,0x13,
+ };
+ static unsigned char dh512_g[]={
+ 0x02,
+ };
+ DH *dh;
+
+ if ((dh=DH_new()) == NULL) return(NULL);
+ dh->p=BN_bin2bn(dh512_p,sizeof(dh512_p),NULL);
+ dh->g=BN_bin2bn(dh512_g,sizeof(dh512_g),NULL);
+ if ((dh->p == NULL) || (dh->g == NULL))
+ { DH_free(dh); return(NULL); }
+ return(dh);
+}
+/*
+ -----BEGIN DH PARAMETERS-----
+ MEYCQQDBbhANRkfaCEJUAiOF7gc8LnupOqiI3U4/cY7TUjrKycP0zWVeBSWpuhCK
+ iDezzV0CAwY1RzzZRJm7m0wkssATAgEC
+ -----END DH PARAMETERS-----
+ */
diff --git a/src/dl.c b/src/dl.c
new file mode 100644
index 0000000..931ad1c
--- /dev/null
+++ b/src/dl.c
< at >< at > -0,0 +1,35 < at >< at >
+/*
+ * Copyright (C) 1997 Robey Pointer
+ * Copyright (C) 1999 - 2002 Eggheads Development Team
+ * Copyright (C) 2002 - 2010 Bryan Drewery
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+/*
+ * dl.c -- handles:
+ * dlopen/dlsym and symbol table handling
+ *
+ */
+
+
+#include "common.h"
+#include "main.h"
+#include "dl.h"
+#include <bdlib/src/String.h>
+#include <bdlib/src/Array.h>
+#include <bdlib/src/HashTable.h>
+
+bd::HashTable<bd::String, FunctionPtr> dl_symbol_table;
diff --git a/src/dl.h b/src/dl.h
new file mode 100644
index 0000000..ff79e79
--- /dev/null
+++ b/src/dl.h
< at >< at > -0,0 +1,35 < at >< at >
+#ifndef _DL_H
+#define _DL_H
+
+#include "common.h"
+#include <dlfcn.h>
+
+#include <bdlib/src/String.h>
+#include <bdlib/src/HashTable.h>
+
+#define DLSYM(_handle, x) \
+ dlerror(); \
+ x##_t x; \
+ *(void **) (&x) = dlsym(_handle, #x); \
+ dlsym_error = dlerror(); \
+ if (dlsym_error) { \
+ sdprintf("%s", dlsym_error); \
+ return(1); \
+ }
+
+#define DLSYM_GLOBAL(_handle, x) do { \
+ dlerror(); \
+ dl_symbol_table[#x] = (FunctionPtr) ((x##_t) dlsym(_handle, #x)); \
+ my_symbols << #x; \
+ dlsym_error = dlerror(); \
+ if (dlsym_error) { \
+ sdprintf("%s", dlsym_error); \
+ return(1); \
+ } \
+} while (0)
+
+#define DLSYM_VAR(x) ((x##_t)dl_symbol_table[#x])
+
+extern bd::HashTable<bd::String, FunctionPtr> dl_symbol_table;
+
+#endif /* !_DL_H_ */
diff --git a/src/eggdrop.h b/src/eggdrop.h
index 005d88f..72ca339 100755
--- a/src/eggdrop.h
+++ b/src/eggdrop.h
< at >< at > -127,16 +127,32 < at >< at > enum {/* TAKE A GUESS */
/* chan & global */
-#define FLOOD_PRIVMSG 0
-#define FLOOD_NOTICE 1
-#define FLOOD_CTCP 2
-#define FLOOD_NICK 3
-#define FLOOD_JOIN 4
-#define FLOOD_KICK 5
-#define FLOOD_DEOP 6
-#define FLOOD_PART 7
-
-#define FLOOD_CHAN_MAX 8
+enum flood_t {
+ FLOOD_PRIVMSG = 0,
+ FLOOD_NOTICE = 1,
+ FLOOD_CTCP = 2,
+ FLOOD_NICK = 3,
+ FLOOD_JOIN = 4,
+ FLOOD_KICK = 5,
+ FLOOD_DEOP = 6,
+ FLOOD_PART = 7,
+ FLOOD_BYTES = 8
+};
+
+
+#include <bdlib/src/bdlib.h>
+BDLIB_NS_BEGIN
+template<typename T>
+ struct Hash;
+
+template<>
+ struct Hash<flood_t>
+ {
+ inline size_t operator()(flood_t val) const { return static_cast<size_t>(val); }
+ };
+BDLIB_NS_END
+
+#define FLOOD_CHAN_MAX 9
#define FLOOD_GLOBAL_MAX 3
#define FEATURE_1BIT0
diff --git a/src/enclink.c b/src/enclink.c
index 7c868a0..3b90c19 100755
--- a/src/enclink.c
+++ b/src/enclink.c
< at >< at > -38,7 +38,7 < at >< at > static void ghost_link_case(int idx, direction_t direction)
if (likely(snum >= 0)) {
char initkey[33] = "", *tmp2 = NULL;
char *keyp = NULL, *nick1 = NULL, *nick2 = NULL;
- port_t port = 0;
+ in_port_t port = 0;
const char salt1[] = SALT1;
const char salt2[] = SALT2;
< at >< at > -124,10 +124,10 < at >< at > static void
rotate_key(char* key, int& seed)
{
if (seed) {
- *(dword *) & key[0] = prand(&seed, 0xFFFFFFFF);
- *(dword *) & key[4] = prand(&seed, 0xFFFFFFFF);
- *(dword *) & key[8] = prand(&seed, 0xFFFFFFFF);
- *(dword *) & key[12] = prand(&seed, 0xFFFFFFFF);
+ *(uint32_t *) & key[0] = prand(&seed, 0xFFFFFFFF);
+ *(uint32_t *) & key[4] = prand(&seed, 0xFFFFFFFF);
+ *(uint32_t *) & key[8] = prand(&seed, 0xFFFFFFFF);
+ *(uint32_t *) & key[12] = prand(&seed, 0xFFFFFFFF);
if (!seed)
seed++;
< at >< at > -291,7 +291,15 < at >< at > void link_challenge_to(int idx, char *buf) {
}
free(tmpp);
- sdprintf(STR("Choosing '%s' (%d/%d) for link"), enclink[i].name, enclink[i].type, i);
+ // No shared type!
+ if (i == -1) {
+ sdprintf(STR("No shared cipher with %s"), dcc[idx].nick);
+ killsock(dcc[idx].sock);
+ lostdcc(idx);
+ return;
+ }
+
+ sdprintf(STR("Choosing '%s' (%d/%d) for link to %s"), enclink[i].name, enclink[i].type, i, dcc[idx].nick);
link_hash(idx, rand);
dprintf(-dcc[idx].sock, STR("neg %s %d %s\n"), dcc[idx].shahash, enclink[i].type, dcc[idx].nick);
socklist[snum].enclink = i;
diff --git a/src/flags.c b/src/flags.c
index 12407d1..53580eb 100755
--- a/src/flags.c
+++ b/src/flags.c
< at >< at > -380,7 +380,7 < at >< at > set_user_flagrec(struct userrec *u, struct flag_record *fr, const char *chname)
/* Always pass the dname (display name) to this function for chname <cybah>
*/
void
-get_user_flagrec(struct userrec *u, struct flag_record *fr, const char *chname, struct chanset_t* chan)
+get_user_flagrec(const struct userrec *u, struct flag_record *fr, const char *chname, const struct chanset_t* chan)
{
fr->bot = 0;
if (!u) {
< at >< at > -427,7 +427,7 < at >< at > get_user_flagrec(struct userrec *u, struct flag_record *fr, const char *chname,
* restricted by +private for the channel
*/
int
-privchan(struct flag_record fr, struct chanset_t *chan, int type)
+privchan(const struct flag_record fr, const struct chanset_t *chan, int type)
{
if (!chan || !channel_privchan(chan) || glob_bot(fr) || glob_owner(fr))
return 0; /* user is implicitly not restricted by +private, they may however be lacking other flags */
< at >< at > -444,7 +444,7 < at >< at > privchan(struct flag_record fr, struct chanset_t *chan, int type)
}
int
-real_chk_op(struct flag_record fr, struct chanset_t *chan, bool botbitch)
+real_chk_op(const struct flag_record fr, const struct chanset_t *chan, bool botbitch)
{
if (!chan && glob_op(fr))
return 1;
< at >< at > -459,7 +459,7 < at >< at > real_chk_op(struct flag_record fr, struct chanset_t *chan, bool botbitch)
}
int
-chk_autoop(struct flag_record fr, struct chanset_t *chan)
+chk_autoop(const struct flag_record fr, const struct chanset_t *chan)
{
if (glob_bot(fr))
return 0;
< at >< at > -471,7 +471,7 < at >< at > chk_autoop(struct flag_record fr, struct chanset_t *chan)
}
int
-real_chk_deop(struct flag_record fr, struct chanset_t *chan, bool botbitch)
+real_chk_deop(const struct flag_record fr, const struct chanset_t *chan, bool botbitch)
{
if (chan && botbitch && channel_botbitch(chan) && !glob_bot(fr))
return 1;
< at >< at > -483,7 +483,7 < at >< at > real_chk_deop(struct flag_record fr, struct chanset_t *chan, bool botbitch)
}
int
-doresolv(struct chanset_t *chan)
+doresolv(const struct chanset_t *chan)
{
if (!chan)
return 0;
< at >< at > -497,7 +497,7 < at >< at > doresolv(struct chanset_t *chan)
}
int
-dovoice(struct chanset_t *chan)
+dovoice(const struct chanset_t *chan)
{
if (!chan)
return 0;
< at >< at > -511,7 +511,7 < at >< at > dovoice(struct chanset_t *chan)
}
int
-doflood(struct chanset_t *chan)
+doflood(const struct chanset_t *chan)
{
struct flag_record fr = { FR_GLOBAL | FR_CHAN | FR_BOT, 0, 0, 0 };
if (!chan)
< at >< at > -524,7 +524,7 < at >< at > doflood(struct chanset_t *chan)
}
int
-dolimit(struct chanset_t *chan)
+dolimit(const struct chanset_t *chan)
{
if (!chan)
return 0;
< at >< at > -564,64 +564,64 < at >< at > whois_access(struct userrec *user, struct userrec *whois_user)
return 1;
}
-int deflag_translate(const char *buf)
+deflag_t deflag_translate(const char *buf)
{
if (str_isdigit(buf))
- return (atoi(buf));
+ return (static_cast<deflag_t>(atoi(buf)));
if (!strcasecmp(buf, "ignore"))
- return P_IGNORE;
+ return DEFLAG_IGNORE;
else if (!strcasecmp(buf, "deop"))
- return P_DEOP;
+ return DEFLAG_DEOP;
else if (!strcasecmp(buf, "kick"))
- return P_KICK;
+ return DEFLAG_KICK;
else if (!strcasecmp(buf, "delete") || !strcasecmp(buf, "remove"))
- return P_DELETE;
- return P_IGNORE;
+ return DEFLAG_DELETE;
+ else if (!strcasecmp(buf, "react"))
+ return DEFLAG_REACT;
+ return DEFLAG_IGNORE;
}
-void deflag_user(struct userrec *u, int why, char *msg, struct chanset_t *chan)
+void deflag_user(struct userrec *u, deflag_event_t why, const char *msg, const struct chanset_t *chan)
{
- char tmp[30] = "", tmp2[1024] = "";
+ char tmp[50] = "", tmp2[1024] = "";
struct flag_record fr = {FR_GLOBAL | FR_CHAN, 0, 0, 0 };
int which = 0;
switch (why) {
- case DEFLAG_BADCOOKIE:
+ case DEFLAG_EVENT_BADCOOKIE:
strlcpy(tmp, "Bad op cookie", sizeof(tmp));
which = chan->bad_cookie;
break;
- case DEFLAG_MANUALOP:
+ case DEFLAG_EVENT_MANUALOP:
strlcpy(tmp, STR("Manual op in -manop channel"), sizeof(tmp));
which = chan->manop;
break;
-#ifdef G_MEAN
- case DEFLAG_MEAN_DEOP:
- strlcpy(tmp, STR("Deopped bot in +mean channel"), sizeof(tmp));
- ent = &CFG_MEANDEOP;
+ case DEFLAG_EVENT_REVENGE_DEOP:
+ strlcpy(tmp, STR("Deopped bot in +revenge channel"), sizeof(tmp));
+ which = chan->revenge;
break;
- case DEFLAG_MEAN_KICK:
- strlcpy(tmp, STR("Kicked bot in +mean channel"), sizeof(tmp));
- ent = &CFG_MEANDEOP;
+ case DEFLAG_EVENT_REVENGE_KICK:
+ strlcpy(tmp, STR("Kicked bot in +revenge channel"), sizeof(tmp));
+ which = chan->revenge;
break;
- case DEFLAG_MEAN_BAN:
- strlcpy(tmp, STR("Banned bot in +mean channel"), sizeof(tmp));
- ent = &CFG_MEANDEOP;
+ case DEFLAG_EVENT_REVENGE_BAN:
+ strlcpy(tmp, STR("Banned bot in +revenge channel"), sizeof(tmp));
+ which = chan->revenge;
break;
-#endif /* G_MEAN */
- case DEFLAG_MDOP:
+ case DEFLAG_EVENT_MDOP:
strlcpy(tmp, "Mass deop", sizeof(tmp));
which = chan->mdop;
break;
- case DEFLAG_MOP:
+ case DEFLAG_EVENT_MOP:
strlcpy(tmp, "Mass op", sizeof(tmp));
which = chan->mop;
break;
default:
simple_snprintf(tmp, sizeof(tmp), "Reason #%i", why);
}
- if (which == P_DEOP) {
+ if (which == DEFLAG_DEOP) {
putlog(LOG_WARN, "*", "Setting %s +d (%s): %s", u->handle, tmp, msg);
simple_snprintf(tmp2, sizeof(tmp2), "+d: %s (%s)", tmp, msg);
set_user(&USERENTRY_COMMENT, u, tmp2);
< at >< at > -640,7 +640,7 < at >< at > void deflag_user(struct userrec *u, int why, char *msg, struct chanset_t *chan)
/* did anything change? */
if (fr.match)
set_user_flagrec(u, &fr, chan->dname);
- } else if (which == P_KICK) {
+ } else if (which == DEFLAG_KICK) {
putlog(LOG_WARN, "*", "Setting %s +dk (%s): %s", u->handle, tmp, msg);
simple_snprintf(tmp2, sizeof(tmp2), "+dk: %s (%s)", tmp, msg);
set_user(&USERENTRY_COMMENT, u, tmp2);
< at >< at > -659,7 +659,7 < at >< at > void deflag_user(struct userrec *u, int why, char *msg, struct chanset_t *chan)
/* did anything change */
if (fr.match)
set_user_flagrec(u, &fr, chan->dname);
- } else if (which == P_DELETE) {
+ } else if (which == DEFLAG_DELETE) {
putlog(LOG_WARN, "*", "Deleting %s (%s): %s", u->handle, tmp, msg);
deluser(u->handle);
} else {
diff --git a/src/flags.h b/src/flags.h
index ac4ed92..5614012 100755
--- a/src/flags.h
+++ b/src/flags.h
< at >< at > -48,16 +48,15 < at >< at > struct flag_record {
* unused letters: bchijpstw
*/
-#define DEFLAG_BADCOOKIE 1
-#define DEFLAG_MANUALOP 2
-#ifdef G_MEAN
-# define DEFLAG_MEAN_DEOP 3
-# define DEFLAG_MEAN_KICK 4
-# define DEFLAG_MEAN_BAN 5
-#endif /* G_MEAN */
-#define DEFLAG_MDOP 6
-#define DEFLAG_MOP 7
-
+enum deflag_event_t {
+ DEFLAG_EVENT_BADCOOKIE = 1,
+ DEFLAG_EVENT_MANUALOP,
+ DEFLAG_EVENT_REVENGE_DEOP,
+ DEFLAG_EVENT_REVENGE_KICK,
+ DEFLAG_EVENT_REVENGE_BAN,
+ DEFLAG_EVENT_MDOP,
+ DEFLAG_EVENT_MOP,
+};
#define USER_DEFAULT0
< at >< at > -142,7 +141,7 < at >< at > struct flag_record {
#define chan_doflood(x)((x).chan & BOT_FLOODBOT)
void init_flags(void);
-void get_user_flagrec(struct userrec *, struct flag_record *, const char *, struct chanset_t* = NULL);
+void get_user_flagrec(const struct userrec *, struct flag_record *, const char *, const struct chanset_t* = NULL);
void set_user_flagrec(struct userrec *, struct flag_record *, const char *);
void break_down_flags(const char *, struct flag_record *, struct flag_record *);
int build_flags(char *, struct flag_record *, struct flag_record *);
< at >< at > -151,12 +150,12 < at >< at > int flagrec_ok(struct flag_record *, struct flag_record *);
flag_t sanity_check(flag_t, int);
flag_t chan_sanity_check(flag_t, int);
char geticon(int);
-int privchan(struct flag_record, struct chanset_t *, int);
+int privchan(const struct flag_record, const struct chanset_t *, int);
#define chk_op(fr, chan) real_chk_op(fr, chan, 1)
-int real_chk_op(struct flag_record, struct chanset_t *, bool);
-int chk_autoop(struct flag_record, struct chanset_t *);
+int real_chk_op(const struct flag_record, const struct chanset_t *, bool);
+int chk_autoop(const struct flag_record, const struct chanset_t *);
#define chk_deop(fr, chan) real_chk_deop(fr, chan, 1)
-int real_chk_deop(struct flag_record, struct chanset_t *, bool);
+int real_chk_deop(const struct flag_record, const struct chanset_t *, bool);
#define chk_voice(fr, chan) (\
(\
(!chan || (!privchan(fr, chan, PRIV_VOICE) && !chk_devoice(fr))) \
< at >< at > -166,13 +165,13 < at >< at > int real_chk_deop(struct flag_record, struct chanset_t *, bool);
#define chk_devoice(fr) ((chan_quiet(fr) || (glob_quiet(fr) && !chan_voice(fr))) ? 1 : 0)
#define isupdatehub() ((conf.bot->hub && conf.bot->u && (conf.bot->u->flags & BOT_UPDATEHUB)) ? 1 : 0)
#define ischanhub() ((!conf.bot->hub && conf.bot->u && (conf.bot->u->flags & BOT_CHANHUB)) ? 1 : 0)
-int doresolv(struct chanset_t *);
-int dovoice(struct chanset_t *);
-int doflood(struct chanset_t *);
-int dolimit(struct chanset_t *);
+int doresolv(const struct chanset_t *);
+int dovoice(const struct chanset_t *);
+int doflood(const struct chanset_t *);
+int dolimit(const struct chanset_t *);
int whois_access(struct userrec *, struct userrec *);
-void deflag_user(struct userrec *, int, char *, struct chanset_t *);
-int deflag_translate(const char *);
+void deflag_user(struct userrec *, deflag_event_t, const char *, const struct chanset_t *);
+deflag_t deflag_translate(const char *);
#endif/* _EGG_FLAGS_H */
diff --git a/src/garble.h b/src/garble.h
index 422804c..c496402 100755
--- a/src/garble.h
+++ b/src/garble.h
< at >< at > -1,7 +1,9 < at >< at >
#ifndef _GARBLE_H
#define _GARBLE_H
+#ifdef DEBUG
#define STR(x) x
+#endif
const char *degarble(int, const char *);
diff --git a/src/generate_defs.sh b/src/generate_defs.sh
new file mode 100755
index 0000000..5369e69
--- /dev/null
+++ b/src/generate_defs.sh
< at >< at > -0,0 +1,65 < at >< at >
+#! /bin/sh
+
+### Export LC_ALL=C sort(1) stays consistent
+export LC_ALL=C
+
+if [ -z "$SED" -o -z "$CXX" ]; then
+ echo "This must be ran by configure" >&2
+ exit 1
+fi
+echo "Generating lib symbols"
+INCLUDES="${TCL_INCLUDES} ${SSL_INCLUDES}"
+
+mkdir -p src/.defs > /dev/null 2>&1
+TMPFILE=$(mktemp "/tmp/pre.XXXXXX")
+for file in $(grep -l DLSYM_GLOBAL src/*.c|grep -v "src/_"); do
+ defsFile_wrappers="src/.defs/$(basename $file .c)_defs.c"
+ defsFile_pre="src/.defs/$(basename $file .c)_pre.h"
+ defsFile_post="src/.defs/$(basename $file .c)_post.h"
+
+ rm -f $defsFile_pre $defsFile_post $defsFile_wrappers > /dev/null 2>&1
+ touch $defsFile_pre $defsFile_post $defsFile_wrappers
+done
+
+for file in $(grep -l DLSYM_GLOBAL src/*.c|grep -v "src/_"); do
+ defsFile_wrappers="src/.defs/$(basename $file .c)_defs.c"
+ defsFile_pre="src/.defs/$(basename $file .c)_pre.h"
+ defsFile_post="src/.defs/$(basename $file .c)_post.h"
+
+ echo "extern \"C\" {" > $defsFile_wrappers
+ echo "extern \"C\" {" > $defsFile_post
+
+ cd src >/dev/null 2>&1
+ $CXX -E -I. -I.. -I../lib ${INCLUDES} -DHAVE_CONFIG_H ../${file} > $TMPFILE 2> /dev/null
+ # Fix wrapped prototypes
+ $SED -e :a -e N -e '$!ba' -e 's/,\n/,/g' $TMPFILE > $TMPFILE.sed
+ mv $TMPFILE.sed $TMPFILE
+
+ cd .. >/dev/null 2>&1
+
+ for symbol in $($SED -n -e 's/.*DLSYM_GLOBAL(.*, \([^)]*\).*/\1/p' $file|sort -u); do
+ # Check if the typedef is already defined ...
+ typedef=$(grep "^typedef .*(\*${symbol}_t)" $(dirname $file)/$(basename $file .c).h)
+ # ... if not, generate it
+ if [ -z "$typedef" ]; then
+ # Trim off any extern "C", trim out the variable names, cleanup whitespace issues
+ typedef=$(grep -w "${symbol}" $TMPFILE | head -n 1 | $SED -e 's/extern "C" *//' -e "s/\(.*\) *${symbol} *(\(.*\)).*/typedef \1 (*${symbol}_t)(\2);/" -e 's/[_0-9A-Za-z]*\(,\)/\1/g' -e 's/[_0-9A-Za-z]*\();\)/\1/g' -e 's/ */ /g' -e 's/ \([,)]\)/\1/g' -e 's/ *()/(void)/g')
+ existing_typedef=0
+ else
+ existing_typedef=1
+ fi
+
+ if [ "${typedef%;}" = "${typedef}" ]; then
+ echo "Error: Unable to generate typedef for: ${symbol}" >&2
+ test -n "$typedef" && echo "$typedef" >&2
+ continue
+ fi
+
+ #pipe typedef into generate_symbol.sh
+ test -n "$typedef" && echo "${symbol} ${existing_typedef} ${typedef}"
+ done | src/generate_symbol.sh $defsFile_wrappers $defsFile_pre $defsFile_post
+
+ echo "}" >> $defsFile_wrappers
+ echo "}" >> $defsFile_post
+done
+rm -f $TMPFILE
diff --git a/src/generate_symbol.sh b/src/generate_symbol.sh
new file mode 100755
index 0000000..31991f1
--- /dev/null
+++ b/src/generate_symbol.sh
< at >< at > -0,0 +1,56 < at >< at >
+#! /bin/sh
+
+defsFile_wrappers="$1"
+defsFile_pre="$2"
+defsFile_post="$3"
+
+# X="typedef int (*Tcl_Eval_t)(Tcl_Interp*, const char*);"
+
+while read symbol existing_typedef typedef; do
+ echo "#define ${symbol} ORIGINAL_SYMBOL_${symbol}" >> $defsFile_pre
+ echo "#undef ${symbol}" >> $defsFile_post
+ test $existing_typedef -eq 0 && echo "$typedef" >> $defsFile_post
+
+ returntype=$(echo "$typedef" | sed -e 's/typedef \([^(]*\) (\*\([^ ]*\)_t)(\(.*\));/\1/')
+ name=$(echo "$typedef" | sed -e 's/typedef \([^(]*\) (\*\([^ ]*\)_t)(\(.*\));/\2/')
+ params=$(echo "$typedef" | sed -e 's/typedef \([^(]*\) (\*\([^ ]*\)_t)(\(.*\));/\3/')
+
+ SAVE_IFS=$IFS
+ IFS=,
+
+ params_full=""
+ param_names=""
+
+ # Set params to $1,$2, etc
+ set $params
+ paramCount=$#
+ lastParam=$(expr $paramCount - 1)
+ i=0
+
+ while [ $i -lt $paramCount ]; do
+ x="x${i}"
+ if [ $1 = "void" ]; then
+ params_full="void"
+ param_names=""
+ else
+ params_full="${params_full}${1} ${x}"
+ param_names="${param_names}${x}"
+ if [ $i -ne $lastParam ]; then
+ params_full="${params_full},"
+ param_names="${param_names}, "
+ fi
+ fi
+ shift
+ i=$((i + 1))
+ done
+
+ cat >> $defsFile_wrappers << EOF
+$returntype $name ($params_full) {
+ return DLSYM_VAR($name)($param_names);
+}
+EOF
+
+ echo "$returntype $name ($params_full);" >> $defsFile_post
+
+ IFS=$SAVE_IFS
+done
diff --git a/src/libcrypto.c b/src/libcrypto.c
new file mode 100644
index 0000000..f51fe4a
--- /dev/null
+++ b/src/libcrypto.c
< at >< at > -0,0 +1,133 < at >< at >
+/*
+ * Copyright (C) 1997 Robey Pointer
+ * Copyright (C) 1999 - 2002 Eggheads Development Team
+ * Copyright (C) 2002 - 2010 Bryan Drewery
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+/*
+ * libcrypto.c -- handles:
+ * libcrypto handling
+ *
+ */
+
+
+#include "common.h"
+#include "main.h"
+#include "dl.h"
+#include <bdlib/src/String.h>
+#include <bdlib/src/Array.h>
+
+#include "libcrypto.h"
+#include ".defs/libcrypto_defs.c"
+
+void *libcrypto_handle = NULL;
+static bd::Array<bd::String> my_symbols;
+
+static int load_symbols(void *handle) {
+ const char *dlsym_error = NULL;
+
+ DLSYM_GLOBAL(handle, AES_cbc_encrypt);
+ DLSYM_GLOBAL(handle, AES_decrypt);
+ DLSYM_GLOBAL(handle, AES_encrypt);
+ DLSYM_GLOBAL(handle, AES_set_decrypt_key);
+ DLSYM_GLOBAL(handle, AES_set_encrypt_key);
+ DLSYM_GLOBAL(handle, BF_decrypt);
+ DLSYM_GLOBAL(handle, BF_encrypt);
+ DLSYM_GLOBAL(handle, BF_set_key);
+ DLSYM_GLOBAL(handle, ERR_error_string);
+ DLSYM_GLOBAL(handle, ERR_free_strings);
+ DLSYM_GLOBAL(handle, ERR_get_error);
+ DLSYM_GLOBAL(handle, OPENSSL_cleanse);
+ DLSYM_GLOBAL(handle, RAND_file_name);
+ DLSYM_GLOBAL(handle, RAND_load_file);
+ DLSYM_GLOBAL(handle, RAND_seed);
+ DLSYM_GLOBAL(handle, RAND_status);
+ DLSYM_GLOBAL(handle, RAND_write_file);
+ DLSYM_GLOBAL(handle, MD5_Final);
+ DLSYM_GLOBAL(handle, MD5_Init);
+ DLSYM_GLOBAL(handle, MD5_Update);
+ DLSYM_GLOBAL(handle, SHA1_Final);
+ DLSYM_GLOBAL(handle, SHA1_Init);
+ DLSYM_GLOBAL(handle, SHA1_Update);
+ DLSYM_GLOBAL(handle, SHA256_Final);
+ DLSYM_GLOBAL(handle, SHA256_Init);
+ DLSYM_GLOBAL(handle, SHA256_Update);
+
+ DLSYM_GLOBAL(handle, BN_bin2bn);
+ DLSYM_GLOBAL(handle, BN_bn2bin);
+ DLSYM_GLOBAL(handle, BN_clear_free);
+ DLSYM_GLOBAL(handle, BN_dec2bn);
+ DLSYM_GLOBAL(handle, BN_dup);
+ DLSYM_GLOBAL(handle, BN_hex2bn);
+ DLSYM_GLOBAL(handle, BN_num_bits);
+
+ DLSYM_GLOBAL(handle, DH_compute_key);
+ DLSYM_GLOBAL(handle, DH_free);
+ DLSYM_GLOBAL(handle, DH_generate_key);
+ DLSYM_GLOBAL(handle, DH_new);
+ DLSYM_GLOBAL(handle, DH_size);
+
+ DLSYM_GLOBAL(handle, EVP_cleanup);
+ DLSYM_GLOBAL(handle, CRYPTO_cleanup_all_ex_data);
+
+
+ return 0;
+}
+
+
+int load_libcrypto() {
+ if (libcrypto_handle) {
+ return 0;
+ }
+
+ sdprintf("Loading libcrypto");
+
+ bd::Array<bd::String> libs_list(bd::String("libcrypto.so." SHLIB_VERSION_NUMBER " libcrypto.so libcrypto.so.0.9.8 libcrypto.so.7 libcrypto.so.6").split(' '));
+
+ for (size_t i = 0; i < libs_list.length(); ++i) {
+ dlerror(); // Clear Errors
+ libcrypto_handle = dlopen(bd::String(libs_list[i]).c_str(), RTLD_LAZY|RTLD_GLOBAL);
+ if (libcrypto_handle) {
+ sdprintf("Found libcrypto: %s", bd::String(libs_list[i]).c_str());
+ break;
+ }
+ }
+ if (!libcrypto_handle) {
+ sdprintf("Unable to find libcrypto");
+ return(1);
+ }
+
+ load_symbols(libcrypto_handle);
+
+ return 0;
+}
+
+int unload_libcrypto() {
+ if (libcrypto_handle) {
+ // Cleanup symbol table
+ for (size_t i = 0; i < my_symbols.length(); ++i) {
+ dl_symbol_table.remove(my_symbols[i]);
+ static_cast<bd::String>(my_symbols[i]).clear();
+ }
+ my_symbols.clear();
+
+ dlclose(libcrypto_handle);
+ libcrypto_handle = NULL;
+ return 0;
+ }
+ return 1;
+}
diff --git a/src/libcrypto.h b/src/libcrypto.h
new file mode 100644
index 0000000..a60cd7b
--- /dev/null
+++ b/src/libcrypto.h
< at >< at > -0,0 +1,33 < at >< at >
+#ifndef _LIBCRYPTO_H
+#define _LIBCRYPTO_H
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include ".defs/libcrypto_pre.h"
+
+#include <openssl/crypto.h>
+#include <openssl/aes.h>
+#include <openssl/blowfish.h>
+#include <openssl/md5.h>
+#include <openssl/sha.h>
+#include <openssl/err.h>
+#include <openssl/rand.h>
+
+#include ".defs/libcrypto_post.h"
+
+#include "src/crypto/aes_util.h"
+#include "src/crypto/bf_util.h"
+#include "src/crypto/dh_util.h"
+
+#include "common.h"
+#include "dl.h"
+#include <bdlib/src/String.h>
+
+
+
+int load_libcrypto();
+int unload_libcrypto();
+
+#endif /* !_LIBCRYPTO_H */
diff --git a/src/libssl.c b/src/libssl.c
new file mode 100644
index 0000000..109a552
--- /dev/null
+++ b/src/libssl.c
< at >< at > -0,0 +1,106 < at >< at >
+/*
+ * Copyright (C) 1997 Robey Pointer
+ * Copyright (C) 1999 - 2002 Eggheads Development Team
+ * Copyright (C) 2002 - 2010 Bryan Drewery
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+/*
+ * libssl.c -- handles:
+ * libssl handling
+ *
+ */
+
+
+#include "common.h"
+#include "main.h"
+#include "dl.h"
+#include <bdlib/src/String.h>
+#include <bdlib/src/Array.h>
+
+#include "libssl.h"
+#include ".defs/libssl_defs.c"
+
+void *libssl_handle = NULL;
+static bd::Array<bd::String> my_symbols;
+
+static int load_symbols(void *handle) {
+ const char *dlsym_error = NULL;
+
+ DLSYM_GLOBAL(handle, SSL_get_error);
+ DLSYM_GLOBAL(handle, SSL_connect);
+ DLSYM_GLOBAL(handle, SSL_CTX_free);
+ DLSYM_GLOBAL(handle, SSL_CTX_new);
+ DLSYM_GLOBAL(handle, SSL_free);
+ DLSYM_GLOBAL(handle, SSL_library_init);
+ DLSYM_GLOBAL(handle, SSL_load_error_strings);
+ DLSYM_GLOBAL(handle, SSL_new);
+ DLSYM_GLOBAL(handle, SSL_pending);
+ DLSYM_GLOBAL(handle, SSL_read);
+ DLSYM_GLOBAL(handle, SSL_set_fd);
+ DLSYM_GLOBAL(handle, SSL_shutdown);
+ DLSYM_GLOBAL(handle, SSLv23_client_method);
+ DLSYM_GLOBAL(handle, SSL_write);
+ DLSYM_GLOBAL(handle, SSL_CTX_ctrl);
+ DLSYM_GLOBAL(handle, SSL_CTX_set_cipher_list);
+ DLSYM_GLOBAL(handle, SSL_CTX_set_tmp_dh_callback);
+
+ return 0;
+}
+
+
+int load_libssl() {
+ if (ssl_ctx) {
+ return 0;
+ }
+
+ sdprintf("Loading libssl");
+
+ bd::Array<bd::String> libs_list(bd::String("libssl.so." SHLIB_VERSION_NUMBER " libssl.so libssl.so.0.9.8 libssl.so.7 libssl.so.6").split(' '));
+
+ for (size_t i = 0; i < libs_list.length(); ++i) {
+ dlerror(); // Clear Errors
+ libssl_handle = dlopen(bd::String(libs_list[i]).c_str(), RTLD_LAZY);
+ if (libssl_handle) {
+ sdprintf("Found libssl: %s", bd::String(libs_list[i]).c_str());
+ break;
+ }
+ }
+ if (!libssl_handle) {
+ sdprintf("Unable to find libssl");
+ return(1);
+ }
+
+ load_symbols(libssl_handle);
+
+ return 0;
+}
+
+int unload_libssl() {
+ if (libssl_handle) {
+ // Cleanup symbol table
+ for (size_t i = 0; i < my_symbols.length(); ++i) {
+ dl_symbol_table.remove(my_symbols[i]);
+ static_cast<bd::String>(my_symbols[i]).clear();
+ }
+ my_symbols.clear();
+
+ dlclose(libssl_handle);
+ libssl_handle = NULL;
+ return 0;
+ }
+ return 1;
+}
diff --git a/src/libssl.h b/src/libssl.h
new file mode 100644
index 0000000..ed3e641
--- /dev/null
+++ b/src/libssl.h
< at >< at > -0,0 +1,30 < at >< at >
+#ifndef _LIBSSL_H
+#define _LIBSSL_H
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include "common.h"
+#include "dl.h"
+#include <bdlib/src/String.h>
+
+#include ".defs/libssl_pre.h"
+
+#ifdef EGG_SSL_EXT
+# ifndef EGG_SSL_INCS
+# include <openssl/ssl.h>
+# define EGG_SSL_INCS 1
+# endif
+#endif
+
+typedef DH* (*dh_callback_t)(SSL*, int, int);
+
+#include ".defs/libssl_post.h"
+
+typedef void (*SSL_CTX_set_tmp_dh_callback_t)(SSL_CTX*, dh_callback_t);
+
+int load_libssl();
+int unload_libssl();
+
+#endif /* !_LIBSSL_H */
diff --git a/src/libtcl.c b/src/libtcl.c
new file mode 100644
index 0000000..72bc995
--- /dev/null
+++ b/src/libtcl.c
< at >< at > -0,0 +1,152 < at >< at >
+/*
+ * Copyright (C) 1997 Robey Pointer
+ * Copyright (C) 1999 - 2002 Eggheads Development Team
+ * Copyright (C) 2002 - 2010 Bryan Drewery
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+/*
+ * tcl.c -- handles:
+ * libtcl handling
+ *
+ */
+
+
+#include "common.h"
+#include "main.h"
+#include "dl.h"
+#include <bdlib/src/String.h>
+#include <bdlib/src/Array.h>
+
+#include "libtcl.h"
+#include ".defs/libtcl_defs.c"
+
+#ifdef USE_SCRIPT_TCL
+Tcl_Interp *global_interp = NULL;
+#endif
+
+void *libtcl_handle = NULL;
+static bd::Array<bd::String> my_symbols;
+
+void initialize_binds_tcl();
+
+static int load_symbols(void *handle) {
+#ifdef USE_SCRIPT_TCL
+ const char *dlsym_error = NULL;
+
+ DLSYM_GLOBAL(handle, Tcl_Eval);
+ DLSYM_GLOBAL(handle, Tcl_GetStringResult);
+ DLSYM_GLOBAL(handle, Tcl_DeleteInterp);
+ DLSYM_GLOBAL(handle, Tcl_CreateCommand);
+ DLSYM_GLOBAL(handle, Tcl_CreateInterp);
+ DLSYM_GLOBAL(handle, Tcl_FindExecutable);
+ DLSYM_GLOBAL(handle, Tcl_Init);
+#endif
+
+ return 0;
+}
+
+int load_libtcl() {
+#ifndef USE_SCRIPT_TCL
+ sdprintf("Not compiled with TCL support");
+ return 1;
+#else
+ if (global_interp) {
+ return 0;
+ }
+#endif
+
+ bd::Array<bd::String> libs_list(bd::String("libtcl.so libtcl83.so libtcl8.3.so libtcl84.so libtcl8.4.so libtcl85.so libtcl8.5.so").split(' '));
+
+ for (size_t i = 0; i < libs_list.length(); ++i) {
+ dlerror(); // Clear Errors
+ libtcl_handle = dlopen(bd::String(libs_list[i]).c_str(), RTLD_LAZY);
+ if (libtcl_handle) break;
+ }
+ if (!libtcl_handle) {
+ sdprintf("Unable to find libtcl");
+ return 1;
+ }
+
+ load_symbols(libtcl_handle);
+
+#ifdef USE_SCRIPT_TCL
+ // create interp
+ global_interp = Tcl_CreateInterp();
+ Tcl_FindExecutable(binname);
+
+ if (Tcl_Init(global_interp) != TCL_OK) {
+ sdprintf("Tcl_Init error: %s", Tcl_GetStringResult(global_interp));
+ return 1;
+ }
+
+ initialize_binds_tcl();
+#endif
+ return 0;
+}
+
+#ifdef USE_SCRIPT_TCL
+
+#include "chanprog.h"
+static int cmd_privmsg STDVAR {
+ bd::String str = argv[2];
+ for (int i = 3; i < argc; ++i)
+ str += " " + bd::String(argv[i]);
+ privmsg(argv[1], str, DP_SERVER);
+
+ return TCL_OK;
+}
+
+void initialize_binds_tcl() {
+ Tcl_CreateCommand(global_interp, "privmsg", (Tcl_CmdProc*) cmd_privmsg, NULL, NULL);
+}
+
+#endif
+
+int unload_libtcl() {
+ if (libtcl_handle) {
+#ifdef USE_SCRIPT_TCL
+ if (global_interp) {
+ Tcl_DeleteInterp(global_interp);
+ global_interp = NULL;
+ }
+#endif
+
+ // Cleanup symbol table
+ for (size_t i = 0; i < my_symbols.length(); ++i) {
+ dl_symbol_table.remove(my_symbols[i]);
+ static_cast<bd::String>(my_symbols[i]).clear();
+ }
+ my_symbols.clear();
+
+ dlclose(libtcl_handle);
+ libtcl_handle = NULL;
+ return 0;
+ }
+ return 1;
+}
+
+#ifdef USE_SCRIPT_TCL
+bd::String tcl_eval(const bd::String& str) {
+ load_libtcl();
+ if (!global_interp) return bd::String();
+ if (Tcl_Eval(global_interp, str.c_str()) == TCL_OK) {
+ return Tcl_GetStringResult(global_interp);
+ } else
+ return tcl_eval("set errorInfo");
+ return bd::String();
+}
+#endif
diff --git a/src/libtcl.h b/src/libtcl.h
new file mode 100644
index 0000000..7f5b0b3
--- /dev/null
+++ b/src/libtcl.h
< at >< at > -0,0 +1,26 < at >< at >
+#ifndef _LIBTCL_H
+#define _LIBTCL_H
+
+#include "common.h"
+#include "dl.h"
+#include <bdlib/src/String.h>
+#ifdef USE_SCRIPT_TCL
+
+#include ".defs/libtcl_pre.h"
+
+#include <tcl.h>
+
+#include ".defs/libtcl_post.h"
+
+
+#define STDVAR (ClientData cd, Tcl_Interp *interp, int argc, const char *argv[])
+
+extern Tcl_Interp *global_interp;
+bd::String tcl_eval(const bd::String&);
+#endif
+
+int load_libtcl();
+int unload_libtcl();
+
+
+#endif /* !_LIBTCL_H */
diff --git a/src/log.c b/src/log.c
index 0d3712b..f60fc6c 100755
--- a/src/log.c
+++ b/src/log.c
< at >< at > -349,7 +349,7 < at >< at > irc_log(struct chanset_t *chan, const char *format, ...)
if ((chan && strcasecmp(chan->dname, relay_chan)) || !chan) {
bd::String msg;
msg = bd::String::printf("[%s] %s", chan ? chan->dname : "*" , va_out);
- privmsg(relay_chan, msg.c_str(), DP_HELP);
+ privmsg(relay_chan, msg, DP_HELP);
}
/*
chanout_but(-1, 1, "[%s] %s\n", chan->dname, va_out);
diff --git a/src/main.c b/src/main.c
index 1a1b91b..c62983e 100755
--- a/src/main.c
+++ b/src/main.c
< at >< at > -26,7 +26,6 < at >< at >
*
*/
-
#include "common.h"
#include "main.h"
#include "userent.h"
< at >< at > -99,6 +98,7 < at >< at > bool have_linked_to_hub = 0; /* Have we ever been linked to a hub? */
intdefault_uflags = 0;/* Default userdefinied flags for people
who say 'hello' or for .adduser */
int do_restart = 0;
+int do_write_userfile = 0;
boolbackgrd = 1;/* Run in the background? */
uid_t myuid;
pid_t mypid;
< at >< at > -198,6 +198,7 < at >< at > void fatal(const char *s, int recoverable)
}
if (!recoverable) {
+// uninit_openssl();
// if (conf.bot && conf.bot->pid_file)
// unlink(conf.bot->pid_file);
exit(1);
< at >< at > -320,12 +321,13 < at >< at > static void show_help()
printf(format, STR("-u <binary>"), STR("Update binary, Automatically kill/respawn bots"));
printf(format, STR("-U <binary>"), STR("Update binary"));
printf(format, STR("-v"), STR("Displays bot version"));
+ printf(format, STR("-V"), STR("Displays the pack.cfg being used"));
exit(0);
}
// leaf: BkLP
-#define PARSE_FLAGS STR("0234:aB:cCd:De:EH:k:hnr:tu:U:v")
-#define FLAGS_CHECKPASS STR("cCdDeEknrtuU")
+#define PARSE_FLAGS STR("0234:aB:cCd:De:EH:k:hnr:tu:U:vV")
+#define FLAGS_CHECKPASS STR("cCdDeEknrtuUV")
static void dtx_arg(int& argc, char *argv[])
{
int i = 0, checked_pass = 0;
< at >< at > -429,13 +431,26 < at >< at > static void dtx_arg(int& argc, char *argv[])
printf(STR("BuildOS: %s%s%s BuildArch: %s%s%s\n"), BOLD(-1), BUILD_OS, BOLD_END(-1), BOLD(-1), BUILD_ARCH, BOLD_END(-1));
printf(STR("- http://wraith.botpack.net -\n"));
#ifdef DEBUG
-printf(STR("pack: %zu conf: %zu settings_t: %zu prefix: %zu pad: %zu needed padding: %zu\n"), SIZE_PACK, SIZE_CONF, sizeof(settings_t), PREFIXLEN, SIZE_PAD, (16 - ((sizeof(settings_t) - sizeof(settings.padding)) % 16)) % 16);
+printf(STR("pack: %zu conf: %zu settings_t: %zu prefix: %zu pad: %zu/%zu needed padding: %zu/%zu\n"),
+ SIZE_PACK,
+ SIZE_CONF,
+ SIZE_SETTINGS,
+ PREFIXLEN,
+ SIZE_PAD_PACK,
+ SIZE_PAD,
+ (SIZE_PAD_ALIGN - ((SIZE_PACK - SIZE_PAD_PACK) % SIZE_PAD_ALIGN)) % SIZE_PAD_ALIGN,
+ (SIZE_PAD_ALIGN - ((SIZE_SETTINGS - SIZE_PAD) % SIZE_PAD_ALIGN)) % SIZE_PAD_ALIGN
+ );
#endif
if (settings.dynamic_initialized[0]) {
bin_to_conf();
}
exit(0);
}
+ case 'V':
+ writecfg();
+ exit(0);
+ break;
case '?':
default:
break;
< at >< at > -520,6 +535,10 < at >< at > static void core_secondly()
cnt = 0;
}
+ if (unlikely(do_write_userfile) && do_write_userfile-- == 1) {
+ real_write_userfile(-1);
+ }
+
memcpy(&nowtm, gmtime(&now), sizeof(struct tm));
if (nowtm.tm_min != lastmin) {
int i = 0;
< at >< at > -686,6 +705,11 < at >< at > int main(int argc, char **argv)
check_trace(1);
#endif
+ if (init_openssl()) {
+ fprintf(stderr, "Unable to initialize/find OpenSSL.\n");
+ return 1;
+ }
+
/* Initialize variables and stuff */
timer_update_now(&egg_timeval_now);
now = egg_timeval_now.sec;
< at >< at > -812,7 +836,7 < at >< at > int main(int argc, char **argv)
if (!conf.bot->hub && conf.bot->localhub)
sdprintf(STR("I am localhub (%s)"), conf.bot->nick);
- if (conf.autocron && (conf.bot->hub || conf.bot->localhub))
+ if (!sdebug && (conf.autocron && (conf.bot->hub || conf.bot->localhub)))
check_crontab();
/* Move into background? */
diff --git a/src/main.h b/src/main.h
index e051158..9b87c5a 100755
--- a/src/main.h
+++ b/src/main.h
< at >< at > -15,7 +15,7 < at >< at > enum {
};
extern introle, default_flags, default_uflags, do_confedit,
-updating, do_restart;
+updating, do_restart, do_write_userfile;
extern booluse_stderr, backgrd, used_B, term_z, loading, have_linked_to_hub, restart_was_update, restarting, safe_to_log;
extern chartempdir[], *binname, owner[121], version[151], ver[101], quit_msg[], *socksfile;
extern time_tonline_since, now, restart_time;
diff --git a/src/misc.c b/src/misc.c
index 967ab7b..ae58c7e 100755
--- a/src/misc.c
+++ b/src/misc.c
< at >< at > -436,46 +436,63 < at >< at > void show_motd(int idx)
void show_channels(int idx, char *handle)
{
- struct chanset_t *chan = NULL;
- struct flag_record fr = { FR_CHAN | FR_GLOBAL, 0, 0, 0 };
struct userrec *u = NULL;
- int first = 0, total = 0;
- size_t l = 0;
- char format[120] = "";
+ size_t maxChannelLength = 0;
+ bd::Array<bd::String> channelNames;
+ bd::HashTable<bd::String, struct chanset_t*> channels;
+ bd::String group;
- if (handle)
+ if (handle && handle[0] != '%') {
u = get_user_by_handle(userlist, handle);
- else
+ } else {
u = dcc[idx].user;
-
- for (chan = chanset;chan ;chan = chan->next) {
- get_user_flagrec(u, &fr, chan->dname);
- if (l < strlen(chan->dname)) {
- l = strlen(chan->dname);
+ if (handle && handle[0] == '%') {
+ group = handle + 1;
}
- if (real_chk_op(fr, chan, 0))
- total++;
}
- simple_snprintf(format, sizeof(format), " %%c%%-%zus %%-s%%-s%%-s%%-s%%-s%%-s\n", (l+2));
-
- for (chan = chanset;chan;chan = chan->next) {
+ for (struct chanset_t* chan = chanset; chan; chan = chan->next) {
+ struct flag_record fr = { FR_CHAN | FR_GLOBAL, 0, 0, 0 };
+ const bd::String chname(chan->dname);
+ // If a group was passed, ensure it matches
+ if (group.length() && chan->groups->find(group) == chan->groups->npos) {
+ continue;
+ }
get_user_flagrec(u, &fr, chan->dname);
- if (real_chk_op(fr, chan, 0)) {
- if (!first) {
- dprintf(idx, "%s %s access to %d channel%s:\n", handle ? u->handle : "You", handle ? "has" : "have", total, (total > 1) ? "s" : "");
+ if (group.length() || real_chk_op(fr, chan, 0)) {
+ if (maxChannelLength < chname.length()) {
+ maxChannelLength = chname.length();
+ }
+ channelNames << chname;
+ channels[chname] = chan;
+ }
+ }
- first = 1;
+ if (channelNames.length()) {
+ char format[120] = "";
+ simple_snprintf(format, sizeof(format), " %%c%%-%zus %%-s%%-s%%-s%%-s%%-s%%-s\n", (maxChannelLength+2));
+ if (group.length()) {
+ dprintf(idx, "group '%s' is in %zu channel%s:\n", group.c_str(), channelNames.length(), (channelNames.length() > 1) ? "s" : "");
+ } else {
+ dprintf(idx, "%s %s access to %zu channel%s:\n", handle ? u->handle : "You", handle ? "has" : "have", channelNames.length(), (channelNames.length() > 1) ? "s" : "");
}
- dprintf(idx, format, !conf.bot->hub && me_op(chan) ? '< at >' : ' ', chan->dname, !shouldjoin(chan) ? "(inactive) " : "",
+
+ for (size_t i = 0; i < channelNames.length(); ++i) {
+ const bd::String chname(channelNames[i]);
+ const struct chanset_t* chan = channels[chname];
+ dprintf(idx, format, !conf.bot->hub && me_op(chan) ? '< at >' : ' ', chan->dname, ((conf.bot->hub && channel_inactive(chan)) || (!conf.bot->hub && !shouldjoin(chan))) ? "(inactive) " : "",
channel_privchan(chan) ? "(private) " : "", chan->manop ? "(no manop) " : "",
channel_bitch(chan) && !channel_botbitch(chan) ? "(bitch) " : channel_botbitch(chan) ? "(botbitch) " : "",
channel_closed(chan) ? "(closed) " : "", channel_backup(chan) ? "(backup)" : "");
}
- }
- if (!first)
+ } else {
+ if (group.length()) {
+ dprintf(idx, "No channels found for group '%s'\n", group.c_str());
+ } else {
dprintf(idx, "%s %s not have access to any channels.\n", handle ? u->handle : "You", handle ? "does" : "do");
}
+ }
+}
/* Create a string with random letters and digits
*/
< at >< at > -614,9 +631,8 < at >< at > int str_isdigit(const char *str)
*/
void kill_bot(char *s1, char *s2)
{
- if (conf.bot->hub)
write_userfile(-1);
- else
+ if (!conf.bot->hub)
server_die();
chatout("*** %s\n", s1);
botnet_send_chat(-1, conf.bot->nick, s1);
< at >< at > -823,7 +839,6 < at >< at > restart(int idx)
socks->my_close();
- if (conf.bot->hub)
write_userfile(idx);
/*
if (server_online) {
diff --git a/src/mod/Makefile.in b/src/mod/Makefile.in
index ea43226..d6c7ec1 100755
--- a/src/mod/Makefile.in
+++ b/src/mod/Makefile.in
< at >< at > -38,7 +38,7 < at >< at > mod_objs = channels.mod_o \
egg_ac_parameters = < at >egg_ac_parameters< at >
MAKE_MOD = $(MAKE) 'MAKE=$(MAKE)' 'CXX=$(CXX)' 'LD=$(LD)' \
-'CCDEPMODE=$(CCDEPMODE)' \
+'CCDEPMODE=$(CCDEPMODE)' 'top_srcdir=$(MOD_UPDIR)$(top_srcdir)' \
'STRIP=$(STRIP)' 'CXXFLAGS=$(MOD_CXXFLAGS)' 'CPPFLAGS=$(MOD_CPPFLAGS)' \
'LIBS=$(LIBS)' 'SHELL=$(SHELL)'
diff --git a/src/mod/channels.mod/Makefile b/src/mod/channels.mod/Makefile
index b5e2305..e242b73 100755
--- a/src/mod/channels.mod/Makefile
+++ b/src/mod/channels.mod/Makefile
< at >< at > -1,12 +1,13 < at >< at >
# Makefile for src/mod/channels.mod/
srcdir = .
-depcomp = /bin/sh ../../../autotools/depcomp
+depcomp = /bin/sh ../../../build/autotools/depcomp
#This line is simply for configure to generate .deps/
OBJS = channels.o
include ./.deps/includes
+include ../mod.mk
doofus:
< at >echo ""
< at >< at > -16,14 +17,6 < at >< at > doofus:
static: ../channels.o
-../channels.o:
-< at >echo -e "Compiling: \033[1mchannels\033[0m"
-source='channels.c' object='$< at >' depfile='.deps/channels.Po' tmpdepfile='.deps/channels.TPo' depmode=$(CCDEPMODE) $(depcomp) \
-$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(srcdir)/channels.c
-< at >rm -f ../channels.o
-< at >mv channels.o ../
-
-
clean:
< at >rm -f .depend *.o *~
diff --git a/src/mod/channels.mod/tclchan.c b/src/mod/channels.mod/chanmisc.c
similarity index 83%
rename from src/mod/channels.mod/tclchan.c
rename to src/mod/channels.mod/chanmisc.c
index be8368f..c5cd64f 100755
--- a/src/mod/channels.mod/tclchan.c
+++ b/src/mod/channels.mod/chanmisc.c
< at >< at > -306,7 +306,7 < at >< at > int SplitList(char *resultBuf, const char *list, int *argcPtr, const char ***arg
*/
int channel_modify(char *result, struct chanset_t *chan, int items, char **item, bool cmd)
{
- bool error = 0;
+ bool error = 0, changed_groups = false;
int old_status = chan->status,
old_mode_mns_prot = chan->mode_mns_prot,
old_mode_pls_prot = chan->mode_pls_prot;
< at >< at > -336,6 +336,20 < at >< at > int channel_modify(char *result, struct chanset_t *chan, int items, char **item,
}
strlcpy(s, item[i], sizeof(s));
set_mode_protect(chan, s);
+ } else if (!strcmp(item[i], "groups")) {
+ i++;
+ if (i >= items) {
+if (result)
+ strlcpy(result, "channel groups needs argument", RESULT_LEN);
+return ERROR;
+ }
+ // Get string into right format
+ bd::String changroups(item[i]);
+ // Replace commas with spaces to be in proper format
+ changroups = changroups.sub(",", " ");
+ changroups.trim();
+ *(chan->groups) = changroups.split(" ");
+ changed_groups = true;
} else if (!strcmp(item[i], "topic")) {
char *p = NULL;
< at >< at > -373,16 +387,17 < at >< at > int channel_modify(char *result, struct chanset_t *chan, int items, char **item,
}
chan->limitraise = atoi(item[i]);
chan->limit_prot = 0;
-/*
- } else if (!strcmp(item[i], "revenge-mode")) {
+ } else if (!strcmp(item[i], "fish-key")) {
i++;
if (i >= items) {
if (result)
- strlcpy(result, "channel revenge-mode needs argument", RESULT_LEN);
+ strlcpy(result, "channel fish-key needs argument", RESULT_LEN);
return ERROR;
}
- chan->revenge_mode = atoi(item[i]);
-*/
+ bd::String key(item[i]);
+ key.trim();
+ set_fish_key(chan->dname, key);
+ strlcpy(chan->fish_key, key.c_str(), sizeof(chan->fish_key));
} else if (!strcmp(item[i], "ban-time")) {
i++;
if (i >= items) {
< at >< at > -407,6 +422,28 < at >< at > int channel_modify(char *result, struct chanset_t *chan, int items, char **item,
return ERROR;
}
chan->invite_time = atoi(item[i]);
+ } else if (!strcmp(item[i], "capslimit") || !strcmp(item[i], "caps-limit")) {
+ i++;
+ if (i >= items) {
+ if (result)
+ strlcpy(result, "channel caps-limit needs argument", RESULT_LEN);
+ return ERROR;
+ }
+ int capslimit = atoi(item[i]);
+ if (capslimit > 100 || capslimit < 0 || item[i][0] == '-') {
+ if (result)
+ strlcpy(result, "channel caps-limit out of range (0-100)", RESULT_LEN);
+ return ERROR;
+ }
+ chan->capslimit = capslimit;
+ } else if (!strcmp(item[i], "colorlimit") || !strcmp(item[i], "color-limit")) {
+ i++;
+ if (i >= items) {
+ if (result)
+ strlcpy(result, "channel color-limit needs argument", RESULT_LEN);
+ return ERROR;
+ }
+ chan->colorlimit = atoi(item[i]);
} else if (!strcmp(item[i], "closed-ban")) {
i++;
if (i >= items) {
< at >< at > -415,6 +452,16 < at >< at > int channel_modify(char *result, struct chanset_t *chan, int items, char **item,
return ERROR;
}
chan->closed_ban = atoi(item[i]);
+ } else if (!strcmp(item[i], "voice-moderate")) {
+ i++;
+ if (i >= items) {
+ if (result)
+ strlcpy(result, "channel voice-moderate needs argument", RESULT_LEN);
+ return ERROR;
+ }
+ chan->voice_moderate = atoi(item[i]);
+ if (chan->mode_mns_prot & CHANMODER && chan->voice_moderate)
+ chan->voice_moderate = 0;
} else if (!strcmp(item[i], "closed-invite")) {
i++;
if (i >= items) {
< at >< at > -475,6 +522,14 < at >< at > int channel_modify(char *result, struct chanset_t *chan, int items, char **item,
return ERROR;
}
chan->mop = deflag_translate(item[i]);
+ } else if (!strcmp(item[i], "revenge")) {
+ i++;
+ if (i >= items) {
+ if (result)
+ strlcpy(result, "channel revenge needs argument", RESULT_LEN);
+ return ERROR;
+ }
+ chan->revenge = deflag_translate(item[i]);
} else if (!strcmp(item[i], "knock")) {
i++;
if (i >= items) {
< at >< at > -519,6 +574,27 < at >< at > int channel_modify(char *result, struct chanset_t *chan, int items, char **item,
}
} else
chan->flood_exempt_mode = atoi(item[i]);
+ } else if (!strcmp(item[i], "closed-exempt")) {
+ i++;
+ if (i >= items) {
+ if (result)
+ strlcpy(result, "channel closed-exempt needs argument", RESULT_LEN);
+ return ERROR;
+ }
+ if (!str_isdigit(item[i])) {
+ if (!strcasecmp("Op", item[i]))
+ chan->closed_exempt_mode = CHAN_FLAG_OP;
+ else if (!strcasecmp("Voice", item[i]))
+ chan->closed_exempt_mode = CHAN_FLAG_VOICE;
+ else if (!strcasecmp("None", item[i]))
+ chan->closed_exempt_mode = 0;
+ else {
+ if (result)
+ strlcpy(result, "channel closed-exempt only accepts Op|Voice|None", RESULT_LEN);
+ return ERROR;
+ }
+ } else
+ chan->closed_exempt_mode = atoi(item[i]);
} else if (!strcmp(item[i], "flood-lock-time")) {
i++;
if (i >= items) {
< at >< at > -551,7 +627,7 < at >< at > int channel_modify(char *result, struct chanset_t *chan, int items, char **item,
return ERROR;
}
chan->protect_backup = atoi(item[i]);
-
+ }
/* Chanint template
* } else if (!strcmp(item[i], "temp")) {
< at >< at > -563,9 +639,11 < at >< at > int channel_modify(char *result, struct chanset_t *chan, int items, char **item,
* }
* chan->temp = atoi(item[i]);
*/
- }
-
+ else if (!strcmp(item[i], "+floodban"))
+ chan->status |= CHAN_FLOODBAN;
+ else if (!strcmp(item[i], "-floodban"))
+ chan->status &= ~CHAN_FLOODBAN;
else if (!strcmp(item[i], "+enforcebans"))
chan->status |= CHAN_ENFORCEBANS;
else if (!strcmp(item[i], "-enforcebans"))
< at >< at > -638,10 +716,6 < at >< at > int channel_modify(char *result, struct chanset_t *chan, int items, char **item,
chan->status |= CHAN_BOTBITCH;
else if (!strcmp(item[i], "-botbitch"))
chan->status &= ~CHAN_BOTBITCH;
- else if (!strcmp(item[i], "+nomassjoin"))
- chan->status |= CHAN_NOMASSJOIN;
- else if (!strcmp(item[i], "-nomassjoin"))
- chan->status &= ~CHAN_NOMASSJOIN;
else if (!strcmp(item[i], "+meankicks"))
chan->status |= CHAN_MEANKICKS;
else if (!strcmp(item[i], "-meankicks"))
< at >< at > -684,6 +758,8 < at >< at > int channel_modify(char *result, struct chanset_t *chan, int items, char **item,
else if (!cmd && !HAVE_TAKE && !strcmp(item[i], "-take")) ;
else if (!cmd && !strcmp(item[i], "stopnethack-mode")) ;
else if (!cmd && !strcmp(item[i], "revenge-mode")) ;
+ else if (!cmd && !strcmp(item[i], "+nomassjoin")) ;
+ else if (!cmd && !strcmp(item[i], "-nomassjoin")) ;
else if (!cmd && !strcmp(item[i], "+revenge")) ;
else if (!cmd && !strcmp(item[i], "-revenge")) ;
else if (!cmd && !strcmp(item[i], "+revengebot")) ;
< at >< at > -742,10 +818,18 < at >< at > int channel_modify(char *result, struct chanset_t *chan, int items, char **item,
chan->flood_pub_thr = thr;
chan->flood_pub_time = time;
+ chan->flood_mpub_thr = thr;
+ chan->flood_mpub_time = time;
+ chan->flood_bytes_thr = thr;
+ chan->flood_bytes_time = time;
+ chan->flood_mbytes_thr = thr;
+ chan->flood_mbytes_time = time;
chan->flood_join_thr = thr;
chan->flood_join_time = time;
chan->flood_ctcp_thr = thr;
chan->flood_ctcp_time = time;
+ chan->flood_mctcp_thr = thr;
+ chan->flood_mctcp_time = time;
chan->flood_kick_thr = thr;
chan->flood_kick_time = time;
chan->flood_deop_thr = thr;
< at >< at > -757,6 +841,9 < at >< at > int channel_modify(char *result, struct chanset_t *chan, int items, char **item,
} else if (!strcmp(item[i] + 6, "chan")) {
pthr = &chan->flood_pub_thr;
ptime = &chan->flood_pub_time;
+ } else if (!strcmp(item[i] + 6, "bytes")) {
+pthr = &chan->flood_bytes_thr;
+ptime = &chan->flood_bytes_time;
} else if (!strcmp(item[i] + 6, "join")) {
pthr = &chan->flood_join_thr;
ptime = &chan->flood_join_time;
< at >< at > -775,6 +862,15 < at >< at > int channel_modify(char *result, struct chanset_t *chan, int items, char **item,
} else if (!strcmp(item[i] + 6, "mjoin")) {
pthr = &chan->flood_mjoin_thr;
ptime = &chan->flood_mjoin_time;
+ } else if (!strcmp(item[i] + 6, "mpub")) {
+pthr = &chan->flood_mpub_thr;
+ptime = &chan->flood_mpub_time;
+ } else if (!strcmp(item[i] + 6, "mbytes")) {
+pthr = &chan->flood_mbytes_thr;
+ptime = &chan->flood_mbytes_time;
+ } else if (!strcmp(item[i] + 6, "mctcp")) {
+pthr = &chan->flood_mctcp_thr;
+ptime = &chan->flood_mctcp_time;
} else { /* Ignore for optimal forward compatibility */
i++;
continue;
< at >< at > -811,15 +907,12 < at >< at > int channel_modify(char *result, struct chanset_t *chan, int items, char **item,
}
if ((chan->status ^ old_status) & CHAN_TAKE)
- chan->status |= (CHAN_FASTOP|CHAN_BITCH);// to avoid bots still mass opping from +take from not using cookies
+ chan->status |= CHAN_BITCH;// to avoid bots still mass opping from +take from not using cookies
if (!conf.bot->hub && (chan != chanset_default)) {
- if ((old_status ^ chan->status) & (CHAN_INACTIVE | CHAN_BACKUP)) {
- if (!shouldjoin(chan) && (chan->ircnet_status & (CHAN_ACTIVE | CHAN_PEND))) {
- putlog(LOG_DEBUG, "*", "In %s, but I shouldn't be, parting...", chan->dname);
- dprintf(DP_SERVER, "PART %s\n", chan->name[0] ? chan->name : chan->dname);
- } else if (shouldjoin(chan))
- join_chan(chan);
+ // Check if groups changed or +/-backup set
+ if (!restarting && !loading && (changed_groups || ((old_status ^ chan->status) & (CHAN_INACTIVE | CHAN_BACKUP)))) {
+ check_shouldjoin(chan);
}
if (me_op(chan)) {
if ((old_status ^ chan->status) & (CHAN_ENFORCEBANS|CHAN_NOUSERBANS|CHAN_DYNAMICBANS|CHAN_NOUSEREXEMPTS|CHAN_NOUSERINVITES|CHAN_DYNAMICEXEMPTS|CHAN_DYNAMICINVITES)) {
< at >< at > -875,6 +968,9 < at >< at > static void init_channel(struct chanset_t *chan, bool reset)
chan->channel.member->nick[0] = 0;
chan->channel.member->next = NULL;
chan->channel.topic = NULL;
+ chan->channel.floodtime = new bd::HashTable<bd::String, bd::HashTable<flood_t, time_t> >;
+ chan->channel.floodnum = new bd::HashTable<bd::String, bd::HashTable<flood_t, int> >;
+ chan->channel.cached_members = new bd::HashTable<bd::String, memberlist*>;
}
static void clear_masklist(masklist *m)
< at >< at > -901,7 +997,7 < at >< at > void clear_channel(struct chanset_t *chan, bool reset)
free(chan->channel.topic);
for (m = chan->channel.member; m; m = m1) {
m1 = m->next;
- free(m);
+ delete_member(m);
}
clear_masklist(chan->channel.ban);
< at >< at > -916,6 +1012,29 < at >< at > void clear_channel(struct chanset_t *chan, bool reset)
chan->ircnet_status = 0;
// chan->ircnet_status &= ~CHAN_HAVEBANS;
+ delete chan->channel.floodtime;
+ chan->channel.floodtime = NULL;
+ delete chan->channel.floodnum;
+ chan->channel.floodnum = NULL;
+
+ if (chan->channel.cached_members) {
+ if (chan->channel.cached_members->size()) {
+ bd::Array<bd::String> member_uhosts(chan->channel.cached_members->keys());
+ for (size_t i = 0; i < member_uhosts.length(); ++i) {
+ const bd::String uhost(member_uhosts[i]);
+
+ // Delete the cached member
+ m = (*chan->channel.cached_members)[uhost];
+ delete_member(m);
+
+ // Remove the cached member (not technically needed as it is deleted below, but for completeness.)
+ chan->channel.cached_members->remove(uhost);
+ }
+ }
+ delete chan->channel.cached_members;
+ chan->channel.cached_members = NULL;
+ }
+
if (reset)
init_channel(chan, 1);
for (size_t i = 0; i < MODES_PER_LINE_MAX; ++i) {
< at >< at > -928,6 +1047,7 < at >< at > void clear_channel(struct chanset_t *chan, bool reset)
chan->ccmode[i].op = NULL;
}
}
+
}
/* Create new channel and parse commands.
< at >< at > -989,31 +1109,45 < at >< at > int channel_add(char *result, const char *newname, char *options, bool isdefault
chan->closed_ban = 0;
chan->closed_private = 1;
chan->closed_invite = 1;
+ chan->voice_moderate = 1;
chan->voice_non_ident = 1;
chan->auto_delay = 5;
chan->ban_type = 3;
+ chan->revenge = DEFLAG_REACT;
/* Chanint template
* chan->temp = 0;
*/
+ chan->groups = new bd::Array<bd::String>;
+ *(chan->groups) << "main";
chan->protect_backup = 1;
+ chan->fish_key[0] = 0;
chan->knock_flags = 0;
chan->flood_lock_time = 120;
chan->flood_exempt_mode = 0;
- chan->flood_pub_thr = gfld_chan_thr;
- chan->flood_pub_time = gfld_chan_time;
- chan->flood_ctcp_thr = gfld_ctcp_thr;
- chan->flood_ctcp_time = gfld_ctcp_time;
- chan->flood_join_thr = gfld_join_thr;
- chan->flood_join_time = gfld_join_time;
- chan->flood_deop_thr = gfld_deop_thr;
- chan->flood_deop_time = gfld_deop_time;
- chan->flood_kick_thr = gfld_kick_thr;
- chan->flood_kick_time = gfld_kick_time;
- chan->flood_nick_thr = gfld_nick_thr;
- chan->flood_nick_time = gfld_nick_time;
+ chan->flood_pub_thr = 0;
+ chan->flood_pub_time = 0;
+ chan->flood_bytes_thr = 0;
+ chan->flood_bytes_time = 0;
+ chan->flood_ctcp_thr = 5;
+ chan->flood_ctcp_time = 30;
+ chan->flood_join_thr = 0;
+ chan->flood_join_time = 0;
+ chan->flood_deop_thr = 8;
+ chan->flood_deop_time = 10;
+ chan->flood_kick_thr = 0;
+ chan->flood_kick_time = 0;
+ chan->flood_nick_thr = 0;
+ chan->flood_nick_time = 0;
chan->flood_mjoin_thr = 6;
chan->flood_mjoin_time = 1;
-// chan->revenge_mode = global_revenge_mode;
+ chan->capslimit = 0;
+ chan->colorlimit = 0;
+ chan->flood_mpub_thr = 20;
+ chan->flood_mpub_time = 1;
+ chan->flood_mbytes_thr = 1000;
+ chan->flood_mbytes_time = 1;
+ chan->flood_mctcp_thr = 7;
+ chan->flood_mctcp_time = 1;
chan->limitraise = 20;
chan->ban_time = global_ban_time;
chan->exempt_time = global_exempt_time;
< at >< at > -1025,6 +1159,8 < at >< at > int channel_add(char *result, const char *newname, char *options, bool isdefault
chan->channel.drone_jointime = 0;
chan->channel.drone_joins = 0;
chan->channel.last_eI = 0;
+ chan->channel.floodtime = NULL;
+ chan->channel.floodnum = NULL;
/* We _only_ put the dname (display name) in here so as not to confuse
* any code later on. chan->name gets updated with the channel name as
diff --git a/src/mod/channels.mod/channels.c b/src/mod/channels.mod/channels.c
index 961801f..c00f429 100755
--- a/src/mod/channels.mod/channels.c
+++ b/src/mod/channels.mod/channels.c
< at >< at > -54,7 +54,6 < at >< at >
static bool use_info = 1;
static char glob_chanmode[64] = "nt";/* Default chanmode (drummer,990731) */
-//static int global_revenge_mode = 3;
static interval_t global_ban_time;
static interval_tglobal_exempt_time;
static interval_t global_invite_time;
< at >< at > -62,25 +61,11 < at >< at > static interval_t global_invite_time;
static char *lastdeletedmask = NULL;
-/* Global flood settings */
-static int gfld_chan_thr;
-static interval_t gfld_chan_time;
-static int gfld_deop_thr = 8;
-static interval_t gfld_deop_time = 10;
-static int gfld_kick_thr;
-static interval_t gfld_kick_time;
-static int gfld_join_thr;
-static interval_t gfld_join_time;
-static int gfld_ctcp_thr = 5;
-static interval_t gfld_ctcp_time = 30;
-static intgfld_nick_thr;
-static interval_tgfld_nick_time;
-
static int killed_bots = 0;
#include "channels.h"
#include "cmdschan.c"
-#include "tclchan.c"
+#include "chanmisc.c"
#include "userchan.c"
/* This will close channels if the HUB:leaf count is skewed from config setting */
< at >< at > -582,6 +567,9 < at >< at > static void set_mode_protect(struct chanset_t *chan, char *set)
if (chan->mode_mns_prot & CHANINV && chan->closed_invite)
chan->closed_invite = 0;
+
+ if (chan->mode_mns_prot & CHANMODER && chan->voice_moderate)
+ chan->voice_moderate = 0;
}
static void get_mode_protect(struct chanset_t *chan, char *s, size_t ssiz)
< at >< at > -721,6 +709,11 < at >< at > void remove_channel(struct chanset_t *chan)
free(chan->key);
if (chan->rmkey)
free(chan->rmkey);
+ if (chan->groups) {
+ delete(chan->groups);
+ }
+ delete chan->channel.floodtime;
+ delete chan->channel.floodnum;
free(chan);
}
< at >< at > -800,8 +793,11 < at >< at > void channels_report(int idx, int details)
if (chan->closed_private)
strlcat(s2, "p", sizeof(s2));
}
+ if (channel_voice(chan) && chan->voice_moderate) {
+ strlcat(s2, "m", sizeof(s2));
+ }
- if (shouldjoin(chan)) {
+ if (conf.bot->hub || shouldjoin(chan)) {
if (channel_active(chan)) {
/* If it's a !chan, we want to display it's unique name too <cybah> */
if (chan->dname[0]=='!') {
< at >< at > -837,12 +833,6 < at >< at > void channels_report(int idx, int details)
i += my_strcpy(s + i, "userbans ");
if (channel_bitch(chan))
i += my_strcpy(s + i, "bitch ");
-/*
-if (channel_revenge(chan))
- i += my_strcpy(s + i, "revenge ");
-if (channel_revenge(chan))
- i += my_strcpy(s + i, "revengebot ");
-*/
if (channel_secret(chan))
i += my_strcpy(s + i, "secret ");
if (channel_cycle(chan))
< at >< at > -879,8 +869,6 < at >< at > void channels_report(int idx, int details)
*if (channel_temp(chan))
* i += my_strcpy(s + i, "temp ");
*/
- if (channel_nomassjoin(chan))
- i += my_strcpy(s + i, "nomassjoin ");
if (channel_botbitch(chan))
i += my_strcpy(s + i, "botbitch ");
if (channel_backup(chan))
< at >< at > -893,11 +881,6 < at >< at > void channels_report(int idx, int details)
dprintf(idx, " Options: %s\n", s);
if (chan->limitraise)
dprintf(idx, " Raising limit +%d every 2 minutes\n", chan->limitraise);
-/*
- if (chan->revenge_mode)
- dprintf(idx, " revenge-mode %d\n",
- chan->revenge_mode);
-*/
dprintf(idx, " Bans last %d mins.\n", chan->ban_time);
dprintf(idx, " Exemptions last %d mins.\n", chan->exempt_time);
dprintf(idx, " Invitations last %d mins.\n", chan->invite_time);
diff --git a/src/mod/channels.mod/channels.h b/src/mod/channels.mod/channels.h
index 7ce8377..7cb7617 100755
--- a/src/mod/channels.mod/channels.h
+++ b/src/mod/channels.mod/channels.h
< at >< at > -53,7 +53,7 < at >< at > int channel_modify(char *, struct chanset_t *, int, char **, bool);
int channel_add(char *, const char *, char *, bool = 0);
void clear_channel(struct chanset_t *, bool);
int u_equals_mask(maskrec *, char *);
-bool u_match_mask(struct maskrec *, char *);
+bool u_match_mask(struct maskrec *, const char *);
bool ismasked(masklist *, const char *);
bool ismodeline(masklist *, const char *);
void channels_report(int, int);
diff --git a/src/mod/channels.mod/cmdschan.c b/src/mod/channels.mod/cmdschan.c
index 0db703c..c49ae5a 100755
--- a/src/mod/channels.mod/cmdschan.c
+++ b/src/mod/channels.mod/cmdschan.c
< at >< at > -1008,29 +1008,6 < at >< at > static void cmd_pls_chan(int idx, char *par)
pls_chan(idx, par, NULL);
}
-static void cmd_botjoin(int idx, char *par)
-{
- char *bot = NULL;
- struct userrec *botu = NULL;
-
- putlog(LOG_CMDS, "*", "#%s# botjoin %s", dcc[idx].nick, par);
-
- if (!par[0]) {
- dprintf(idx, "Usage: botjoin <bot> [%s]<channel> [options]\n", CHANMETA);
- return;
- }
- bot = newsplit(&par);
- botu = get_user_by_handle(userlist, bot);
- if (botu && botu->bot) {
- pls_chan(idx, par, bot);
- } else {
- dprintf(idx, "Error: '%s' is not a bot.\n", bot);
- }
-
- dprintf(idx, "!!!! Warning: botjoin is an unfinished feature which will pretty much make all bots join the channel.\n");
- dprintf(idx, "!!!! Warning: You should probably -chan the channel now to avoid problems/confusion later.\n");
-}
-
static void mns_chan(int idx, char *par, char *bot)
{
char *chname = NULL, buf2[1024] = "";
< at >< at > -1084,27 +1061,6 < at >< at > static void cmd_mns_chan(int idx, char *par)
mns_chan(idx, par, NULL);
}
-static void cmd_botpart(int idx, char *par)
-{
- char *bot = NULL;
- struct userrec *botu = NULL;
-
- putlog(LOG_CMDS, "*", "#%s# botpart %s", dcc[idx].nick, par);
-
- if (!par[0]) {
- dprintf(idx, "Usage: botpart <bot> [%s]<channel> [options]\n", CHANMETA);
- return;
- }
-
- bot = newsplit(&par);
- botu = get_user_by_handle(userlist, bot);
- if (botu && botu->bot) {
- mns_chan(idx, par, bot);
- } else {
- dprintf(idx, "Error: '%s' is not a bot.\n", bot);
- }
-}
-
/* thanks Excelsior */
#define FLAG_COLS 4
static void show_flag(int idx, char *work, int *cnt, const char *name, unsigned int state, size_t worksiz)
< at >< at > -1179,7 +1135,7 < at >< at > static void show_int(int idx, char *work, int *cnt, const char *desc, int state,
#define SHOW_FLAG(name, state) show_flag(idx, work, &cnt, name, state, sizeof(work))
#define SHOW_INT(desc, state, yes, no) show_int(idx, work, &cnt, desc, state, yes, no, sizeof(work))
-#define P_STR deflag == P_KICK ? "Kick" : (deflag == P_DEOP ? "Deop" : (deflag == P_DELETE ? "Remove" : NULL))
+#define DEFLAG_STR deflag == DEFLAG_KICK ? "Kick" : (deflag == DEFLAG_DEOP ? "Deop" : (deflag == DEFLAG_DELETE ? "Remove" : (deflag == DEFLAG_REACT ? "React" : NULL)))
#define F_STR(x) x == CHAN_FLAG_OP ? "Op" : (x == CHAN_FLAG_VOICE ? "Voice" : (x == CHAN_FLAG_USER ? "User" : NULL))
static void cmd_chaninfo(int idx, char *par)
{
< at >< at > -1228,6 +1184,8 < at >< at > static void cmd_chaninfo(int idx, char *par)
/* FIXME: SHOW_CHAR() here */
get_mode_protect(chan, work, sizeof(work));
dprintf(idx, "Protect modes (chanmode): %s\n", work[0] ? work : "None");
+ dprintf(idx, "Groups: %s\n", chan->groups && chan->groups->length() ? static_cast<bd::String>(chan->groups->join(" ")).c_str() : "None");
+ dprintf(idx, "FiSH Key: %s\n", chan->fish_key[0] ? chan->fish_key : "not set");
// dprintf(idx, "Protect topic (topic) : %s\n", chan->topic[0] ? chan->topic : "");
/* Chanchar template
* dprintf(idx, "String temp: %s\n", chan->temp[0] ? chan->temp : "NULL");
< at >< at > -1242,15 +1200,13 < at >< at > static void cmd_chaninfo(int idx, char *par)
SHOW_FLAG("cycle",channel_cycle(chan));
SHOW_FLAG("enforcebans", channel_enforcebans(chan));
SHOW_FLAG("fastop",channel_fastop(chan));
+ SHOW_FLAG("floodban", channel_floodban(chan));
SHOW_FLAG("inactive",channel_inactive(chan));
SHOW_FLAG("meankicks",channel_meankicks(chan));
SHOW_FLAG("nodesynch",channel_nodesynch(chan));
- SHOW_FLAG("nomassjoin",channel_nomassjoin(chan));
SHOW_FLAG("private",channel_privchan(chan));
SHOW_FLAG("protect",channel_protect(chan));
SHOW_FLAG("rbl",channel_rbl(chan));
-// SHOW_FLAG("revengebot",channel_revengebot(chan));
-// SHOW_FLAG("revenge",channel_revenge(chan));
if (HAVE_TAKE)
SHOW_FLAG("take",channel_take(chan));
SHOW_FLAG("voice",channel_voice(chan));
< at >< at > -1277,39 +1233,46 < at >< at > static void cmd_chaninfo(int idx, char *par)
dprintf(idx, "Channel settings:\n");
deflag = chan->bad_cookie;
SHOW_INT("Auto-delay: ", chan->auto_delay, NULL, "None");
- SHOW_INT("Bad-cookie:" , chan->bad_cookie, P_STR, "Ignore");
+ SHOW_INT("Bad-cookie:" , chan->bad_cookie, DEFLAG_STR, "Ignore");
SHOW_INT("Ban-time: ", chan->ban_time, NULL, "Forever");
SHOW_INT("Ban-type: ", chan->ban_type, NULL, "3");
SHOW_INT("Closed-ban: ", chan->closed_ban, NULL, "Don't!");
SHOW_INT("Closed-invite:", chan->closed_invite, NULL, "Don't!");
SHOW_INT("Closed-Private:", chan->closed_private, NULL, "Don't!");
+ SHOW_INT("Closed-Exempt:", chan->closed_exempt_mode, F_STR(chan->closed_exempt_mode), "None");
SHOW_INT("Exempt-time: ", chan->exempt_time, NULL, "Forever");
SHOW_INT("Flood-exempt: ", chan->flood_exempt_mode, F_STR(chan->flood_exempt_mode), "None");
SHOW_INT("Flood-lock-time: ", chan->flood_lock_time, NULL, "Don't");
+ SHOW_INT("Caps-Limit(%): ", chan->capslimit, NULL, "None");
+ SHOW_INT("Color-Limit: ", chan->colorlimit, NULL, "None");
SHOW_INT("Invite-time: ", chan->invite_time, NULL, "Forever");
SHOW_INT("Knock: ", chan->knock_flags, F_STR(chan->knock_flags), "None");
SHOW_INT("Limit raise (limit): ", chan->limitraise, NULL, "Disabled");
deflag = chan->manop;
- SHOW_INT("Manop: ", chan->manop, P_STR, "Ignore");
+ SHOW_INT("Manop: ", chan->manop, DEFLAG_STR, "Ignore");
deflag = chan->mdop;
- SHOW_INT("Mdop: ", chan->mdop, P_STR, "Ignore");
+ SHOW_INT("Mdop: ", chan->mdop, DEFLAG_STR, "Ignore");
deflag = chan->mop;
- SHOW_INT("Mop: ", chan->mop, P_STR, "Ignore");
-// SHOW_INT("Revenge-mode: ", chan->revenge_mode, NULL, NULL);
+ SHOW_INT("Mop: ", chan->mop, DEFLAG_STR, "Ignore");
+ deflag = chan->revenge;
+ SHOW_INT("Revenge: ", chan->revenge, DEFLAG_STR, "Ignore");
SHOW_INT("Protect-backup: ", chan->protect_backup, "Do!", "Don't!");
SHOW_INT("Voice-non-ident: ", chan->voice_non_ident, "Do!", "Don't!");
+ SHOW_INT("Voice-moderate:", chan->voice_moderate, NULL, "Don't!");
- dprintf(idx, "Flood settings: chan ctcp join kick deop nick mjoin\n");
- dprintf(idx, " number: %3d %3d %3d %3d %3d %3d %3d\n",
- chan->flood_pub_thr, chan->flood_ctcp_thr,
+ dprintf(idx, "Flood settings: chan bytes ctcp join kick deop nick mjoin mpub mbytes mctcp\n");
+ dprintf(idx, " number: %3d %4d %3d %3d %3d %3d %3d %3d %3d %4d %3d\n",
+ chan->flood_pub_thr, chan->flood_bytes_thr, chan->flood_ctcp_thr,
chan->flood_join_thr, chan->flood_kick_thr,
chan->flood_deop_thr, chan->flood_nick_thr,
- chan->flood_mjoin_thr);
- dprintf(idx, " time : %3u %3u %3u %3u %3u %3u %3u\n",
- chan->flood_pub_time, chan->flood_ctcp_time,
+ chan->flood_mjoin_thr, chan->flood_mpub_thr,
+ chan->flood_mbytes_thr, chan->flood_mctcp_thr);
+ dprintf(idx, " time : %3u %4u %3u %3u %3u %3u %3u %3u %3u %4u %4u\n",
+ chan->flood_pub_time, chan->flood_bytes_time, chan->flood_ctcp_time,
chan->flood_join_time, chan->flood_kick_time,
chan->flood_deop_time, chan->flood_nick_time,
- chan->flood_mjoin_time);
+ chan->flood_mjoin_time, chan->flood_mpub_time,
+ chan->flood_mbytes_time, chan->flood_mctcp_time);
}
}
< at >< at > -1419,8 +1382,6 < at >< at > static cmd_t C_dcc_channels[] =
{"-exempt","o|o",(Function) cmd_mns_exempt,NULL, AUTH},
{"-invite","o|o",(Function) cmd_mns_invite,NULL, AUTH},
{"bans","o|o",(Function) cmd_bans,NULL, 0},
- {"botjoin","n",(Function) cmd_botjoin,NULL, 0},
- {"botpart","n",(Function) cmd_botpart,NULL, 0},
{"exempts","o|o",(Function) cmd_exempts,NULL, 0},
{"invites","o|o",(Function) cmd_invites,NULL, 0},
{"chaninfo","m|m",(Function) cmd_chaninfo,NULL, 0},
diff --git a/src/mod/channels.mod/userchan.c b/src/mod/channels.mod/userchan.c
index c692443..48a599e 100755
--- a/src/mod/channels.mod/userchan.c
+++ b/src/mod/channels.mod/userchan.c
< at >< at > -219,7 +219,7 < at >< at > int u_equals_mask(maskrec *u, char *mask)
return 0;
}
-bool u_match_mask(maskrec *rec, char *mask)
+bool u_match_mask(maskrec *rec, const char *mask)
{
for (; rec; rec = rec->next)
if (wild_match(rec->mask, mask) || match_cidr(rec->mask, mask))
< at >< at > -701,9 +701,6 < at >< at > static void write_chan(bd::Stream& stream, int idx, struct chanset_t* chan)
putlog(LOG_DEBUG, "*", "writing channel %s to userfile..", chan->dname);
bool force_inactive = 0;
- /* if a bot should explicitly NOT join, just set it +inactive ... */
- if (idx >= 0 && !botshouldjoin(dcc[idx].user, chan))
- force_inactive = 1;
stream << bd::String::printf("+ channel add %s { ", chan->dname);
if (chan != chanset_default)
< at >< at > -717,34 +714,43 < at >< at > bd::String channel_to_string(struct chanset_t* chan, bool force_inactive) {
get_mode_protect(chan, w, sizeof(w));
return bd::String::printf("\
-chanmode { %s } bad-cookie %d manop %d mdop %d mop %d limit %d ban-type %d \
-flood-chan %d:%d flood-ctcp %d:%d flood-join %d:%d \
+chanmode { %s } groups { %s } bad-cookie %d manop %d mdop %d mop %d limit %d revenge %d ban-type %d \
+flood-chan %d:%d flood-bytes %d:%d flood-ctcp %d:%d flood-join %d:%d \
flood-kick %d:%d flood-deop %d:%d flood-nick %d:%d flood-mjoin %d:%d \
-closed-ban %d closed-invite %d closed-private %d ban-time %d \
-exempt-time %d invite-time %d voice-non-ident %d auto-delay %d \
-flood-exempt %d flood-lock-time %d knock %d \
-%cmeankicks %cenforcebans %cdynamicbans %cuserbans %cbitch \
+flood-mpub %d:%d flood-mbytes %d:%d flood-mctcp %d:%d \
+capslimit %d colorlimit %d closed-ban %d closed-invite %d closed-private %d closed-exempt %d ban-time %d \
+exempt-time %d invite-time %d voice-non-ident %d voice-moderate %d auto-delay %d \
+flood-exempt %d flood-lock-time %d knock %d fish-key { %s } \
+%cmeankicks %cenforcebans %cdynamicbans %cuserbans %cbitch %cfloodban \
%cprivate %ccycle %cinactive %cdynamicexempts %cuserexempts \
%cdynamicinvites %cuserinvites %cnodesynch %cclosed %cvoice \
-%cfastop %cautoop %cbotbitch %cbackup %cnomassjoin %crbl %cvoicebitch %cprotect protect-backup %d %c%s",
+%cfastop %cautoop %cbotbitch %cbackup %crbl %cvoicebitch %cprotect protect-backup %d %c%s",
w,
/* Chanchar template
* temp,
* also include temp %s in dprintf.
*/
+ chan->groups && chan->groups->length() ? static_cast<bd::String>(chan->groups->join(" ")).c_str() : "",
chan->bad_cookie,
chan->manop,
chan->mdop,
chan->mop,
chan->limitraise,
+chan->revenge,
chan->ban_type,
chan->flood_pub_thr, chan->flood_pub_time,
+chan->flood_bytes_thr, chan->flood_bytes_time,
chan->flood_ctcp_thr, chan->flood_ctcp_time,
chan->flood_join_thr, chan->flood_join_time,
chan->flood_kick_thr, chan->flood_kick_time,
chan->flood_deop_thr, chan->flood_deop_time,
chan->flood_nick_thr, chan->flood_nick_time,
chan->flood_mjoin_thr, chan->flood_mjoin_time,
+chan->flood_mpub_thr, chan->flood_mpub_time,
+chan->flood_mbytes_thr, chan->flood_mbytes_time,
+chan->flood_mctcp_thr, chan->flood_mctcp_time,
+ chan->capslimit,
+ chan->colorlimit,
chan->closed_ban,
/* Chanint template
* chan->temp,
< at >< at > -752,19 +758,23 < at >< at > flood-exempt %d flood-lock-time %d knock %d \
*/
chan->closed_invite,
chan->closed_private,
+ chan->closed_exempt_mode,
chan->ban_time,
chan->exempt_time,
chan->invite_time,
chan->voice_non_ident,
+ chan->voice_moderate,
chan->auto_delay,
chan->flood_exempt_mode,
chan->flood_lock_time,
chan->knock_flags,
+ chan->fish_key,
PLSMNS(channel_meankicks(chan)),
PLSMNS(channel_enforcebans(chan)),
PLSMNS(channel_dynamicbans(chan)),
PLSMNS(!channel_nouserbans(chan)),
PLSMNS(channel_bitch(chan)),
+PLSMNS(channel_floodban(chan)),
PLSMNS(channel_privchan(chan)),
PLSMNS(channel_cycle(chan)),
force_inactive ? '+' : PLSMNS(channel_inactive(chan)),
< at >< at > -779,7 +789,6 < at >< at > flood-exempt %d flood-lock-time %d knock %d \
PLSMNS(channel_autoop(chan)),
PLSMNS(channel_botbitch(chan)),
PLSMNS(channel_backup(chan)),
- PLSMNS(channel_nomassjoin(chan)),
PLSMNS(channel_rbl(chan)),
PLSMNS(channel_voicebitch(chan)),
PLSMNS(channel_protect(chan)),
< at >< at > -825,11 +834,6 < at >< at > void write_chans_compat(bd::Stream& stream, int idx)
putlog(LOG_DEBUG, "*", "writing channel %s to userfile..", chan->dname);
get_mode_protect(chan, w, sizeof(w));
- /* if a bot should explicitly NOT join, just set it +inactive ... */
- if (idx >= 0 && !botshouldjoin(dcc[idx].user, chan))
- inactive = '+';
- /* ... otherwise give the bot the *actual* setting */
- else
inactive = PLSMNS(channel_inactive(chan));
stream << bd::String::printf("\
< at >< at > -837,12 +841,12 < at >< at > void write_chans_compat(bd::Stream& stream, int idx)
bad-cookie %d manop %d mdop %d mop %d limit %d \
flood-chan %d:%d flood-ctcp %d:%d flood-join %d:%d \
flood-kick %d:%d flood-deop %d:%d flood-nick %d:%d \
-closed-ban %d closed-invite %d closed-private %d ban-time %d \
+caps-limit %d color-limit %d closed-ban %d closed-invite %d closed-private %d ban-time %d \
exempt-time %d invite-time %d voice-non-ident %d auto-delay %d \
%cenforcebans %cdynamicbans %cuserbans %cbitch \
%cprivate %ccycle %cinactive %cdynamicexempts %cuserexempts \
%cdynamicinvites %cuserinvites %cnodesynch %cclosed %cvoice \
-%cfastop %cautoop %cbotbitch %cbackup %cnomassjoin %c%s}\n",
+%cfastop %cautoop %cbotbitch %cbackup %c%s}\n",
chan->dname,
w,
chan->added_by,
< at >< at > -858,6 +862,8 < at >< at > exempt-time %d invite-time %d voice-non-ident %d auto-delay %d \
chan->flood_kick_thr, chan->flood_kick_time,
chan->flood_deop_thr, chan->flood_deop_time,
chan->flood_nick_thr, chan->flood_nick_time,
+ chan->capslimit,
+ chan->colorlimit,
chan->closed_ban,
chan->closed_invite,
chan->closed_private,
< at >< at > -884,7 +890,6 < at >< at > exempt-time %d invite-time %d voice-non-ident %d auto-delay %d \
PLSMNS(channel_autoop(chan)),
PLSMNS(channel_botbitch(chan)),
PLSMNS(channel_backup(chan)),
- PLSMNS(channel_nomassjoin(chan)),
HAVE_TAKE ? PLSMNS(channel_take(chan)) : ' ',
HAVE_TAKE ? "take " : " "
);
diff --git a/src/mod/compress.mod/Makefile b/src/mod/compress.mod/Makefile
index f2937bf..e23efe3 100755
--- a/src/mod/compress.mod/Makefile
+++ b/src/mod/compress.mod/Makefile
< at >< at > -1,12 +1,13 < at >< at >
# Makefile for src/mod/compress.mod/
srcdir = .
-depcomp = /bin/sh ../../../autotools/depcomp
+depcomp = /bin/sh ../../../build/autotools/depcomp
#This line is simply for configure to generate .deps/
OBJS = compress.o
include ./.deps/includes
+include ../mod.mk
doofus:
< at >echo ""
< at >< at > -16,13 +17,6 < at >< at > doofus:
static: ../compress.o
-../compress.o:
-< at >echo -e "Compiling: \033[1mcompress\033[0m"
-source='compress.c' object='$< at >' depfile='.deps/compress.Po' tmpdepfile='.deps/compress.TPo' depmode=$(CCDEPMODE) $(depcomp) \
-$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(srcdir)/compress.c
-< at >rm -f ../compress.o
-< at >mv compress.o ../
-
clean:
< at >rm -f .depend *.o *~
diff --git a/src/mod/console.mod/Makefile b/src/mod/console.mod/Makefile
index 3ce2068..8848bfd 100755
--- a/src/mod/console.mod/Makefile
+++ b/src/mod/console.mod/Makefile
< at >< at > -1,12 +1,13 < at >< at >
# Makefile for src/mod/console.mod/
srcdir = .
-depcomp = /bin/sh ../../../autotools/depcomp
+depcomp = /bin/sh ../../../build/autotools/depcomp
#This line is simply for configure to generate .deps/
OBJS = console.o
include ./.deps/includes
+include ../mod.mk
doofus:
< at >echo ""
< at >< at > -16,13 +17,6 < at >< at > doofus:
static: ../console.o
-../console.o:
-< at >echo -e "Compiling: \033[1mconsole\033[0m"
-source='console.c' object='$< at >' depfile='.deps/console.Po' tmpdepfile='.deps/console.TPo' depmode=$(CCDEPMODE) $(depcomp) \
-$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(srcdir)/console.c
-< at >rm -f ../console.o
-< at >mv console.o ../
-
clean:
< at >rm -f .depend *.o *~
diff --git a/src/mod/ctcp.mod/Makefile b/src/mod/ctcp.mod/Makefile
index ef3ddf2..b316405 100755
--- a/src/mod/ctcp.mod/Makefile
+++ b/src/mod/ctcp.mod/Makefile
< at >< at > -1,12 +1,13 < at >< at >
# Makefile for src/mod/ctcp.mod/
srcdir = .
-depcomp = /bin/sh ../../../autotools/depcomp
+depcomp = /bin/sh ../../../build/autotools/depcomp
#This line is simply for configure to generate .deps/
OBJS = ctcp.o
include ./.deps/includes
+include ../mod.mk
doofus:
< at >echo ""
< at >< at > -16,13 +17,6 < at >< at > doofus:
static: ../ctcp.o
-../ctcp.o:
-< at >echo -e "Compiling: \033[1mctcp\033[0m"
-source='ctcp.c' object='$< at >' depfile='.deps/ctcp.Po' tmpdepfile='.deps/ctcp.TPo' depmode=$(CCDEPMODE) $(depcomp) \
-$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(srcdir)/ctcp.c
-< at >rm -f ../ctcp.o
-< at >mv ctcp.o ../
-
clean:
< at >rm -f .depend *.o *~
diff --git a/src/mod/ctcp.mod/ctcp.c b/src/mod/ctcp.mod/ctcp.c
index 470e93d..6d9b0cf 100755
--- a/src/mod/ctcp.mod/ctcp.c
+++ b/src/mod/ctcp.mod/ctcp.c
< at >< at > -407,7 +407,7 < at >< at > static int ctcp_FINGER(char *nick, char *uhost, struct userrec *u, char *object,
bd::String msg;
msg = bd::String::printf("\001%s %s (%s) Idle %d second%s\001", keyword, "",
botuserhost, (int) idletime, idletime == 1 ? "" : "s");
- notice(nick, msg.c_str(), DP_HELP);
+ notice(nick, msg, DP_HELP);
return BIND_RET_BREAK;
}
< at >< at > -418,7 +418,7 < at >< at > static int ctcp_ECHO(char *nick, char *uhost, struct userrec *u, char *object, c
strlcpy(reply, text, sizeof(reply));
bd::String msg;
msg = bd::String::printf("\001%s %s\001", keyword, reply);
- notice(nick, msg.c_str(), DP_HELP);
+ notice(nick, msg, DP_HELP);
return BIND_RET_BREAK;
}
static int ctcp_PING(char *nick, char *uhost, struct userrec *u, char *object, char *keyword, char *text)
< at >< at > -426,7 +426,7 < at >< at > static int ctcp_PING(char *nick, char *uhost, struct userrec *u, char *object, c
if (strlen(text) <= 80) { /* bitchx ignores > 80 */
bd::String msg;
msg = bd::String::printf("\001%s %s\001", keyword, text);
- notice(nick, msg.c_str(), DP_HELP);
+ notice(nick, msg, DP_HELP);
}
return BIND_RET_BREAK;
}
< at >< at > -476,11 +476,11 < at >< at > static int ctcp_VERSION(char *nick, char *uhost, struct userrec *u, char *object
bd::String msg;
msg = bd::String::printf("\001%s %s%s\001", keyword, ctcpversion, s);
- notice(nick, msg.c_str(), queue);
+ notice(nick, msg, queue);
if (ctcpversion2[0]) {
msg = bd::String::printf("\001%s %s\001", keyword, ctcpversion2);
- notice(nick, msg.c_str(), DP_HELP);
+ notice(nick, msg, DP_HELP);
}
return BIND_RET_BREAK;
}
< at >< at > -490,7 +490,7 < at >< at > static int ctcp_WHOAMI(char *nick, char *uhost, struct userrec *u, char *object,
if (cloak_script > 0 && cloak_script < 9) {
bd::String msg;
msg = bd::String::printf("\002BitchX\002: Access Denied");
- notice(nick, msg.c_str(), DP_HELP);
+ notice(nick, msg, DP_HELP);
}
return BIND_RET_BREAK;
}
< at >< at > -506,7 +506,7 < at >< at > static int ctcp_OP(char *nick, char *uhost, struct userrec *u, char *object, cha
*p = 0;
bd::String msg;
msg = bd::String::printf("\002BitchX\002: I'm not on %s or I'm not opped", chan);
- notice(nick, msg.c_str(), DP_HELP);
+ notice(nick, msg, DP_HELP);
}
return BIND_RET_BREAK;
}
< at >< at > -526,14 +526,14 < at >< at > static int ctcp_INVITE_UNBAN(char *nick, char *uhost, struct userrec *u, char *o
if (chan->ircnet_status & CHAN_ACTIVE) {
if (!strcasecmp(chan->name, chname)) {
msg = bd::String::printf("\002BitchX\002: Access Denied");
- notice(nick, msg.c_str(), DP_HELP);
+ notice(nick, msg, DP_HELP);
return BIND_RET_LOG;
}
}
chan = chan->next;
}
msg = bd::String::printf("\002BitchX\002: I'm not on that channel");
- notice(nick, msg.c_str(), DP_HELP);
+ notice(nick, msg, DP_HELP);
}
return BIND_RET_BREAK;
}
< at >< at > -548,7 +548,7 < at >< at > static int ctcp_USERINFO(char *nick, char *uhost, struct userrec *u, char *objec
}
bd::String msg;
msg = bd::String::printf("\001%s %s\001", keyword, ctcpuserinfo);
- notice(nick, msg.c_str(), DP_HELP);
+ notice(nick, msg, DP_HELP);
return BIND_RET_BREAK;
}
< at >< at > -610,11 +610,11 < at >< at > static int ctcp_CLIENTINFO(char *nick, char *uhost, struct userrec *u, char *obj
strlcpy(buf, "UPTIME my uptime", sizeof(buf));
else {
msg = bd::String::printf("\001ERRMSG %s is not a valid function\001", text);
- notice(nick, msg.c_str(), DP_HELP);
+ notice(nick, msg, DP_HELP);
return BIND_RET_LOG;
}
msg = bd::String::printf("\001%s %s\001", keyword, buf);
- notice(nick, msg.c_str(), DP_HELP);
+ notice(nick, msg, DP_HELP);
return BIND_RET_BREAK;
}
< at >< at > -625,7 +625,7 < at >< at > static int ctcp_TIME(char *nick, char *uhost, struct userrec *u, char *object, c
strlcpy(tms, ctime(&now), sizeof(tms));
bd::String msg;
msg = bd::String::printf("\001%s %s\001", keyword, tms);
- notice(nick, msg.c_str(), DP_HELP);
+ notice(nick, msg, DP_HELP);
return BIND_RET_BREAK;
}
< at >< at > -658,8 +658,8 < at >< at > static int ctcp_CHAT(char *nick, char *uhost, struct userrec *u, char *object, c
* CTCP replies are NOTICE's this has to be a PRIVMSG
* -poptix 5/1/1997 */
bd::String msg;
- msg = bd::String::printf("\001DCC CHAT chat %lu %u\001", iptolong(getmyip()), dcc[ix].port);
- privmsg(nick, msg.c_str(), DP_SERVER);
+ msg = bd::String::printf("+p \001DCC CHAT chat %lu %u\001", iptolong(getmyip()), dcc[ix].port);
+ privmsg(nick, msg, DP_SERVER);
}
return BIND_RET_BREAK;
}
diff --git a/src/mod/irc.mod/Makefile b/src/mod/irc.mod/Makefile
index 2ebfa06..5c99408 100755
--- a/src/mod/irc.mod/Makefile
+++ b/src/mod/irc.mod/Makefile
< at >< at > -1,13 +1,14 < at >< at >
# Makefile for src/mod/irc.mod/
srcdir = .
-depcomp = /bin/sh ../../../autotools/depcomp
+depcomp = /bin/sh ../../../build/autotools/depcomp
#This line is simply for configure to generate .deps/
OBJS = irc.o
include ./.deps/includes
+include ../mod.mk
doofus:
< at >echo ""
< at >< at > -17,14 +18,6 < at >< at > doofus:
static: ../irc.o
-../irc.o:
-< at >echo -e "Compiling: \033[1mirc\033[0m"
-source='irc.c' object='$< at >' depfile='.deps/irc.Po' tmpdepfile='.deps/irc.TPo' depmode=$(CCDEPMODE) $(depcomp) \
-$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(srcdir)/irc.c
-< at >rm -f ../irc.o
-< at >mv irc.o ../
-
-
clean:
< at >rm -f .depend *.o *~
diff --git a/src/mod/irc.mod/chan.c b/src/mod/irc.mod/chan.c
index 38d4259..628ca70 100755
--- a/src/mod/irc.mod/chan.c
+++ b/src/mod/irc.mod/chan.c
< at >< at > -59,7 +59,7 < at >< at > static void resolv_member_callback(int id, void *client_data, const char *host,
}
memberlist *m = NULL;
- char *pe = NULL, s[UHOSTLEN + 1], user[15] = "";
+ char *pe = NULL, user[15] = "";
bool matched_user = 0;
/* Apply lookup results to all matching members by host */
< at >< at > -69,9 +69,9 < at >< at > static void resolv_member_callback(int id, void *client_data, const char *host,
if (pe && !strcmp(pe + 1, r->host)) {
strlcpy(user, m->userhost, pe - m->userhost + 1);
simple_snprintf(m->userip, sizeof(m->userip), "%s< at >%s", user, bd::String(ips[0]).c_str());
+ simple_snprintf(m->fromip, sizeof(m->fromip), "%s!%s", m->nick, m->userip);
if (!m->user) {
- simple_snprintf(s, sizeof(s), "%s!%s", m->nick, m->userip);
- m->user = get_user_by_host(s);
+ m->user = get_user_by_host(m->fromip);
/* Act on this lookup */
if (m->user)
< at >< at > -280,19 +280,23 < at >< at > static memberlist *newmember(struct chanset_t *chan, char *nick)
}
++(chan->channel.members);
+ n->floodtime = new bd::HashTable<flood_t, time_t>;
+ n->floodnum = new bd::HashTable<flood_t, int>;
return n;
}
+void delete_member(memberlist* m) {
+ delete m->floodtime;
+ delete m->floodnum;
+ free(m);
+}
+
static bool member_getuser(memberlist* m, bool act_on_lookup) {
if (!m) return 0;
if (!m->user && !m->tried_getuser) {
- static char s[UHOSTLEN] = "";
-
- simple_snprintf(s, sizeof(s), "%s!%s", m->nick, m->userhost);
- m->user = get_user_by_host(s);
+ m->user = get_user_by_host(m->from);
if (!m->user && m->userip[0]) {
- simple_snprintf(s, sizeof(s), "%s!%s", m->nick, m->userip);
- m->user = get_user_by_host(s);
+ m->user = get_user_by_host(m->fromip);
}
m->tried_getuser = 1;
< at >< at > -363,7 +367,7 < at >< at > static char *getchanmode(struct chanset_t *chan)
return s;
}
-static void check_exemptlist(struct chanset_t *chan, char *from)
+static void check_exemptlist(struct chanset_t *chan, const char *from)
{
if (!use_exempts)
return;
< at >< at > -449,7 +453,10 < at >< at > static void priority_do(struct chanset_t * chan, bool opsonly, int action, bool
flush_mode(chan, QUICK);
return;
}
- } else if ((action == PRIO_KICK) && !chan_sentkick(m)) {
+ } else if ((action == PRIO_KICK) && !chan_sentkick(m) &&
+ // Check closed-exempt
+ !((chan_hasop(m) && chan->closed_exempt_mode == CHAN_FLAG_OP) ||
+ ((chan_hasvoice(m) || chan_hasop(m)) && chan->closed_exempt_mode == CHAN_FLAG_VOICE))) {
++actions;
++sent;
if (chan->closed_ban)
< at >< at > -542,30 +549,28 < at >< at > static void do_mask(struct chanset_t *chan, masklist *m, char *mask, char Mode)
/* This is a clone of detect_flood, but works for channel specificity now
* and handles kick & deop as well.
*/
-static bool detect_chan_flood(char *floodnick, char *floodhost, char *from,
- struct chanset_t *chan, int which, char *victim)
+static bool detect_chan_flood(memberlist* m, const char *from, struct chanset_t *chan, flood_t which, const char *msg)
{
- if (!chan || (which < 0) || (which >= FLOOD_CHAN_MAX))
+ /* Do not punish non-existant channel members and IRC services like
+ * ChanServ
+ */
+ if (!chan || (which < 0) || (which >= FLOOD_CHAN_MAX) || !m)
return 0;
/* Okay, make sure i'm not flood-checking myself */
- if (match_my_nick(floodnick))
+ if (m->is_me) {
return 0;
- if (!strcasecmp(floodhost, botuserhost))
+ }
+ if (!strcasecmp(m->userhost, botuserhost))
return 0;
/* My user< at >host (?) */
- /* Do not punish non-existant channel members and IRC services like
- * ChanServ
- */
- memberlist *m = ismember(chan, floodnick);
-
- if (!m && (which != FLOOD_JOIN) && (which != FLOOD_PART))
- return 0;
-
struct flag_record fr = {FR_GLOBAL | FR_CHAN, 0, 0, 0 };
+ struct userrec *u = NULL;
- get_user_flagrec(get_user_by_host(from), &fr, chan->dname, chan);
+ member_getuser(m);
+ u = m->user;
+ get_user_flagrec(u, &fr, chan->dname, chan);
if (glob_bot(fr) ||
((which == FLOOD_DEOP) &&
(glob_master(fr) || chan_master(fr))) ||
< at >< at > -578,10 +583,10 < at >< at > static bool detect_chan_flood(char *floodnick, char *floodhost, char *from,
)))
return 0;
- char h[UHOSTLEN] = "", ftype[12] = "", *p = NULL;
- struct userrec *u = NULL;
- int thr = 0;
- time_t lapse = 0;
+ char h[UHOSTLEN] = "", ftype[14] = "", *p = NULL;
+ int thr = 0, mthr = 0;
+ int increment = 1;
+ time_t lapse = 0, mlapse = 0;
/* Determine how many are necessary to make a flood. */
switch (which) {
< at >< at > -589,12 +594,24 < at >< at > static bool detect_chan_flood(char *floodnick, char *floodhost, char *from,
case FLOOD_NOTICE:
thr = chan->flood_pub_thr;
lapse = chan->flood_pub_time;
+ mthr = chan->flood_mpub_thr;
+ mlapse = chan->flood_mpub_time;
strlcpy(ftype, "pub", sizeof(ftype));
break;
+ case FLOOD_BYTES:
+ thr = chan->flood_bytes_thr;
+ lapse = chan->flood_bytes_time;
+ mthr = chan->flood_mbytes_thr;
+ mlapse = chan->flood_mbytes_time;
+ strlcpy(ftype, "bytes", sizeof(ftype));
+ increment = static_cast<int>(strlen(msg));
+ break;
case FLOOD_CTCP:
thr = chan->flood_ctcp_thr;
lapse = chan->flood_ctcp_time;
- strlcpy(ftype, "pub", sizeof(ftype));
+ mthr = chan->flood_mctcp_thr;
+ mlapse = chan->flood_mctcp_time;
+ strlcpy(ftype, "ctcp", sizeof(ftype));
break;
case FLOOD_NICK:
thr = chan->flood_nick_thr;
< at >< at > -618,56 +635,110 < at >< at > static bool detect_chan_flood(char *floodnick, char *floodhost, char *from,
strlcpy(ftype, "kick", sizeof(ftype));
break;
}
- if ((thr == 0) || (lapse == 0))
- return 0;/* no flood protection */
if ((which == FLOOD_KICK) || (which == FLOOD_DEOP))
- p = floodnick;
+ p = m->nick;
else {
- p = strchr(floodhost, '< at >');
+ p = strchr(m->userhost, '< at >');
if (p) {
p++;
}
if (!p)
return 0;
}
- if (rfc_casecmp(chan->floodwho[which], p)) {/* new */
- strlcpy(chan->floodwho[which], p, sizeof(chan->floodwho[which]));
- chan->floodtime[which] = now;
- chan->floodnum[which] = 1;
+
+ // Track across all clients in the channel
+ if (mlapse && mthr) {
+ if (!chan->channel.floodtime->contains("all")) {
+ (*chan->channel.floodtime)["all"][which] = now;
+ (*chan->channel.floodnum)["all"][which] = increment;
return 0;
}
- if (chan->floodtime[which] < now - lapse) {
+
+ bd::HashTable<flood_t, time_t> *global_floodtime = &(*chan->channel.floodtime)["all"];
+ bd::HashTable<flood_t, int> *global_floodnum = &(*chan->channel.floodnum)["all"];
+
+ if ((*global_floodtime)[which] < now - mlapse) {
/* Flood timer expired, reset it */
- chan->floodtime[which] = now;
- chan->floodnum[which] = 1;
+ (*global_floodtime)[which] = now;
+ (*global_floodnum)[which] = increment;
+ } else {
+ (*global_floodnum)[which] += increment;
+
+ if ((*global_floodnum)[which] >= mthr) {/* FLOOD */
+ /* Reset counters */
+ (*global_floodnum).remove(which);
+ (*global_floodtime).remove(which);
+ if (!chan->channel.drone_set_mode) {
+ lockdown_chan(chan, FLOOD_MASS_FLOOD, ftype);
+ }
+ }
+ }
+ }
+
+ if ((thr == 0) || (lapse == 0)) {
+ return 0;/* no flood protection */
+ }
+
+ // Track individual hosts/clients
+ bd::HashTable<flood_t, time_t> *floodtime; // floodtime[FLOOD_PRIVMSG] = now;
+ bd::HashTable<flood_t, int> *floodnum; // floodnum[FLOOD_PRIVMSG] = 1;
+
+ switch (which) {
+ // These 2 don't have a persistent member, use chan list
+ case FLOOD_JOIN:
+ case FLOOD_PART:
+ // If not found, add them and start the count for next iteration
+ if (!chan->channel.floodtime->contains(m->userhost)) {
+ (*chan->channel.floodtime)[m->userhost][which] = now;
+ (*chan->channel.floodnum)[m->userhost][which] = increment;
return 0;
+ } else {
+ floodtime = &(*chan->channel.floodtime)[m->userhost];
+ floodnum = &(*chan->channel.floodnum)[m->userhost];
}
- /* Deop'n the same person, sillyness ;) - so just ignore it */
- if (which == FLOOD_DEOP) {
- if (!rfc_casecmp(chan->deopd, victim))
+ break;
+ default:
+ // Everything else, log to the member
+ // If not found, add them and start the count for next iteration
+ if (!m->floodtime->contains(which)) {
+ (*m->floodtime)[which] = now;
+ (*m->floodnum)[which] = increment;
return 0;
- else
- strlcpy(chan->deopd, victim, sizeof(chan->deopd));
+ } else {
+ floodtime = m->floodtime;
+ floodnum = m->floodnum;
+ }
+ break;
}
- chan->floodnum[which]++;
- if (chan->floodnum[which] >= thr) {/* FLOOD */
+
+ if ((*floodtime)[which] < now - lapse) {
+ /* Flood timer expired, reset it */
+ (*floodtime)[which] = now;
+ (*floodnum)[which] = increment;
+ return 0;
+ }
+ (*floodnum)[which] += increment;
+
+ if ((*floodnum)[which] >= thr) {/* FLOOD */
/* Reset counters */
- chan->floodnum[which] = 0;
- chan->floodtime[which] = 0;
- chan->floodwho[which][0] = 0;
- if (which == FLOOD_DEOP)
- chan->deopd[0] = 0;
- u = get_user_by_host(from);
+ (*floodnum).remove(which);
+ (*floodtime).remove(which);
switch (which) {
case FLOOD_PRIVMSG:
case FLOOD_NOTICE:
case FLOOD_CTCP:
+ case FLOOD_BYTES:
/* Flooding chan! either by public or notice */
if (!chan_sentkick(m) && me_op(chan)) {
-putlog(LOG_MODES, chan->dname, "Channel flood from %s -- kicking", floodnick);
- dprintf(DP_MODE, "KICK %s %s :%s%s\n", chan->name, floodnick, kickprefix, response(RES_FLOOD));
-m->flags |= SENTKICK;
+ if (channel_floodban(chan)) {
+ putlog(LOG_MODES, chan->dname, "Channel flood from %s -- banning", m->nick);
+ char *s1 = quickban(chan, from);
+ u_addmask('b', chan, s1, conf.bot->nick, "channel flood", now + (60 * chan->ban_time), 0);
+ } else {
+ const char *response = punish_flooder(chan, m);
+ putlog(LOG_MODES, chan->dname, "Channel flood from %s -- %s", m->nick, response);
+ }
}
return 1;
case FLOOD_JOIN:
< at >< at > -689,16 +760,14 < at >< at > static bool detect_chan_flood(char *floodnick, char *floodhost, char *from,
putlog(LOG_MISC | LOG_JOIN, chan->dname, "JOIN flood from < at >%s! Banning.", p);
else
putlog(LOG_MISC | LOG_JOIN, chan->dname, "NICK flood from < at >%s! Banning.", p);
- strlcpy(ftype + 4, " flood", sizeof(ftype) - 4);
+ strlcat(ftype, " flood", sizeof(ftype));
u_addmask('b', chan, h, conf.bot->nick, ftype, now + (60 * chan->ban_time), 0);
if (which == FLOOD_PART)
add_mode(chan, '+', 'b', h);
if (!channel_enforcebans(chan) && me_op(chan)) {
- char s[UHOSTLEN];
for (m = chan->channel.member; m && m->nick[0]; m = m->next) {
- simple_snprintf(s, sizeof(s), "%s!%s", m->nick, m->userhost);
- if (!chan_sentkick(m) && wild_match(h, s) &&
-(m->joined >= chan->floodtime[which]) &&
+ if (!chan_sentkick(m) && wild_match(h, m->from) &&
+(m->joined >= (*floodtime)[which]) &&
!m->is_me && me_op(chan)) {
m->flags |= SENTKICK;
if (which == FLOOD_JOIN)
< at >< at > -711,8 +780,8 < at >< at > static bool detect_chan_flood(char *floodnick, char *floodhost, char *from,
return 1;
case FLOOD_KICK:
if (me_op(chan) && !chan_sentkick(m)) {
-putlog(LOG_MODES, chan->dname, "Kicking %s, for mass kick.", floodnick);
- dprintf(DP_MODE, "KICK %s %s :%s%s\n", chan->name, floodnick, kickprefix, response(RES_KICKFLOOD));
+putlog(LOG_MODES, chan->dname, "Kicking %s, for mass kick.", m->nick);
+ dprintf(DP_MODE, "KICK %s %s :%s%s\n", chan->name, m->nick, kickprefix, response(RES_KICKFLOOD));
m->flags |= SENTKICK;
}
if (channel_protect(chan))
< at >< at > -722,14 +791,14 < at >< at > static bool detect_chan_flood(char *floodnick, char *floodhost, char *from,
if (me_op(chan) && !chan_sentkick(m)) {
putlog(LOG_MODES, chan->dname,
"Mass deop on %s by %s", chan->dname, from);
- dprintf(DP_MODE, "KICK %s %s :%s%s\n", chan->name, floodnick, kickprefix, response(RES_MASSDEOP));
+ dprintf(DP_MODE, "KICK %s %s :%s%s\n", chan->name, m->nick, kickprefix, response(RES_MASSDEOP));
m->flags |= SENTKICK;
}
if (u) {
char s[256] = "";
simple_snprintf(s, sizeof(s), "Mass deop on %s by %s", chan->dname, from);
- deflag_user(u, DEFLAG_MDOP, s, chan);
+ deflag_user(u, DEFLAG_EVENT_MDOP, s, chan);
}
if (channel_protect(chan))
do_protect(chan, "Mass Deop");
< at >< at > -740,23 +809,21 < at >< at > static bool detect_chan_flood(char *floodnick, char *floodhost, char *from,
}
/* Given a chan/m do all necesary exempt checks and ban. */
-static void refresh_ban_kick(struct chanset_t*, memberlist *, char *);
+static void refresh_ban_kick(struct chanset_t*, memberlist *, const char *);
static void do_closed_kick(struct chanset_t *chan, memberlist *m)
{
if (!chan || !m) return;
- char s[UHOSTLEN] = "", *s1 = NULL;
-
- simple_snprintf(s, sizeof(s), "%s!%s", m->nick, m->userhost);
+ char *s1 = NULL;
if (!(use_exempts &&
- (u_match_mask(global_exempts,s) ||
- u_match_mask(chan->exempts, s)))) {
- if (u_match_mask(global_bans, s) || u_match_mask(chan->bans, s))
- refresh_ban_kick(chan, m, s);
+ (u_match_mask(global_exempts, m->from) ||
+ u_match_mask(chan->exempts, m->from)))) {
+ if (u_match_mask(global_bans, m->from) || u_match_mask(chan->bans, m->from))
+ refresh_ban_kick(chan, m, m->from);
- check_exemptlist(chan, s);
- s1 = quickban(chan, s);
+ check_exemptlist(chan, m->from);
+ s1 = quickban(chan, m->from);
u_addmask('b', chan, s1, conf.bot->nick, "joined closed chan", now + (60 * chan->ban_time), 0);
}
return;
< at >< at > -764,7 +831,7 < at >< at > static void do_closed_kick(struct chanset_t *chan, memberlist *m)
/* Given a nick!user< at >host, place a quick ban on them on a chan.
*/
-static char *quickban(struct chanset_t *chan, char *from)
+static char *quickban(struct chanset_t *chan, const char *from)
{
static char s1[512] = "";
< at >< at > -779,27 +846,21 < at >< at > static char *quickban(struct chanset_t *chan, char *from)
static void kick_all(struct chanset_t *chan, char *hostmask, const char *comment, int bantype)
{
int flushed = 0;
- char s[UHOSTLEN] = "", sip[UHOSTLEN] = "";
struct flag_record fr = {FR_GLOBAL | FR_CHAN, 0, 0, 0 };
for (memberlist *m = chan->channel.member; m && m->nick[0]; m = m->next) {
- simple_snprintf(s, sizeof(s), "%s!%s", m->nick, m->userhost);
- if (m->userip[0])
- simple_snprintf(sip, sizeof(sip), "%s!%s", m->nick, m->userip);
- else
- sip[0] = 0;
get_user_flagrec(m->user, &fr, chan->dname, chan);
- if ((wild_match(hostmask, s) || match_cidr(hostmask, s) ||
- (sip[0] && (wild_match(hostmask, sip) || match_cidr(hostmask, sip)))) &&
+ if ((wild_match(hostmask, m->from) || match_cidr(hostmask, m->from) ||
+ (m->userip[0] && (wild_match(hostmask, m->fromip) || match_cidr(hostmask, m->fromip)))) &&
!chan_sentkick(m) &&
!m->is_me && !chan_issplit(m) &&
!(use_exempts &&
- ((bantype && (isexempted(chan, s) || (chan->ircnet_status & CHAN_ASKED_EXEMPTS))) ||
- (u_match_mask(global_exempts, s) ||
- u_match_mask(chan->exempts, s) ||
- (sip[0] &&
- (u_match_mask(global_exempts, sip) ||
- u_match_mask(chan->exempts, sip))))))) {
+ ((bantype && (isexempted(chan, m->from) || (chan->ircnet_status & CHAN_ASKED_EXEMPTS))) ||
+ (u_match_mask(global_exempts, m->from) ||
+ u_match_mask(chan->exempts, m->from) ||
+ (m->userip[0] &&
+ (u_match_mask(global_exempts, m->fromip) ||
+ u_match_mask(chan->exempts, m->fromip))))))) {
if (!flushed) {
/* We need to kick someone, flush eventual bans first */
flush_mode(chan, QUICK);
< at >< at > -815,7 +876,7 < at >< at > static void kick_all(struct chanset_t *chan, char *hostmask, const char *comment
/* If any bans match this wildcard expression, refresh them on the channel.
*/
-static void refresh_ban_kick(struct chanset_t* chan, memberlist *m, char *user)
+static void refresh_ban_kick(struct chanset_t* chan, memberlist *m, const char *user)
{
if (!m || chan_sentkick(m))
return;
< at >< at > -871,7 +932,7 < at >< at > static void refresh_exempt(struct chanset_t *chan, char *user)
}
}
-static void refresh_invite(struct chanset_t *chan, char *user)
+static void refresh_invite(struct chanset_t *chan, const char *user)
{
maskrec *i = NULL;
< at >< at > -901,14 +962,11 < at >< at > static void enforce_bans(struct chanset_t *chan)
if ((chan->ircnet_status & CHAN_ASKED_EXEMPTS))
return;
- char me[UHOSTLEN] = "", meip[UHOSTLEN] = "";
-
- simple_snprintf(me, sizeof(me), "%s!%s", botname, botuserhost);
- simple_snprintf(meip, sizeof(meip), "%s!%s", botname, botuserip);
+ const memberlist *me = ismember(chan, botname);
/* Go through all bans, kicking the users. */
for (masklist *b = chan->channel.ban; b && b->mask[0]; b = b->next) {
- if (!(wild_match(b->mask, me) || match_cidr(b->mask, meip)) && !isexempted(chan, b->mask))
+ if (!(wild_match(b->mask, me->from) || match_cidr(b->mask, me->fromip)) && !isexempted(chan, b->mask))
kick_all(chan, b->mask, "You are banned", 1);
}
}
< at >< at > -1018,14 +1076,14 < at >< at > void check_this_ban(struct chanset_t *chan, char *banmask, bool sticky)
if (!me_op(chan))
return;
- char user[UHOSTLEN] = "";
+ const char *user = NULL;
for (memberlist *m = chan->channel.member; m && m->nick[0]; m = m->next) {
for (int i = 0; i < (m->userip[0] ? 2 : 1); ++i) {
if (i == 0 && m->userip[0]) // Check userip first in case userhost is already an ip
- simple_snprintf(user, sizeof(user), "%s!%s", m->nick, m->userip);
+ user = m->fromip;
else
- simple_snprintf(user, sizeof(user), "%s!%s", m->nick, m->userhost);
+ user = m->from;
if ((wild_match(banmask, user) || match_cidr(banmask, user)) &&
!(use_exempts &&
(u_match_mask(global_exempts, user) ||
< at >< at > -1068,6 +1126,10 < at >< at > void recheck_channel_modes(struct chanset_t *chan)
mns &= ~CHANPRIV;
}
}
+ if (channel_voice(chan) && chan->voice_moderate) {
+ pls |= CHANMODER;
+ mns &= ~CHANMODER;
+ }
if (!(chan->ircnet_status & CHAN_ASKEDMODES)) {
if (pls & CHANINV && !(cur & CHANINV))
< at >< at > -1174,12 +1236,12 < at >< at > static void check_this_member(struct chanset_t *chan, char *nick, struct flag_re
}
}
- char s[UHOSTLEN] = "";
+ const char *s = NULL;
for (int i = 0; i < (m->userip[0] ? 2 : 1); ++i) {
if (i == 0 && m->userip[0]) // Check userip first in case userhost is already an ip
- simple_snprintf(s, sizeof(s), "%s!%s", m->nick, m->userip);
+ s = m->fromip;
else
- simple_snprintf(s, sizeof(s), "%s!%s", m->nick, m->userhost);
+ s = m->from;
/* check vs invites */
if (use_invites &&
< at >< at > -1231,11 +1293,12 < at >< at > void check_this_user(char *hand, int del, char *host)
u = NULL; // Pretend user doesn't exist when checking
} else if (0 && del == 2) { //-host, may now match on a diff user and need to act on them
/*
+ const char *s = NULL;
for (int i = 0; i < (m->userip[0] ? 2 : 1); ++i) {
if (i == 0 && m->userip[0]) // Check userip first in case userhost is already an ip
- simple_snprintf(s, sizeof(s), "%s!%s", m->nick, m->userip);
+ s = m->fromip;
else
- simple_snprintf(s, sizeof(s), "%s!%s", m->nick, m->userhost);
+ s = m->from;
if (wild_match(host, s) ||
(i == 0 && m->userip[0] && match_cidr(host, s))) {
check_member = 1;
< at >< at > -1668,7 +1731,7 < at >< at > static int got341(char *from, char *msg)
putlog(LOG_MISC, "*", "HIJACKED invite detected: %s to %s", nick, chan->dname);
bd::String msg;
msg = bd::String::printf("ALERT! \002%s was invited via a hijacked connection/process.\002", nick);
- privmsg(chan->name, msg.c_str(), DP_MODE_NEXT);
+ privmsg(chan->name, msg, DP_MODE_NEXT);
return 0;
}
#endif /* CACHE */
< at >< at > -1889,12 +1952,15 < at >< at > static int got352or4(struct chanset_t *chan, char *user, char *host, char *nick,
/* Store the userhost */
simple_snprintf(m->userhost, sizeof(m->userhost), "%s< at >%s", user, host);
+ simple_snprintf(m->from, sizeof(m->from), "%s!%s", m->nick, m->userhost);
+ member_update_from_cache(chan, m);
if (!m->userip[0]) {
if (ip)
simple_snprintf(m->userip, sizeof(m->userip), "%s< at >%s", user, ip);
else if (is_dotted_ip(host))
simple_snprintf(m->userip, sizeof(m->userip), "%s< at >%s", user, host);
+ simple_snprintf(m->fromip, sizeof(m->fromip), "%s!%s", m->nick, m->userip);
}
}
< at >< at > -1942,6 +2008,11 < at >< at > static int got352or4(struct chanset_t *chan, char *user, char *host, char *nick,
resolve_to_rbl(chan, m->userip);
}
+ // If there's an opped bot, queue op to request_op
+ if (m->user && m->user->bot && chan_hasop(m)) {
+ chan->channel.do_opreq = 1;
+ }
+
return 0;
}
< at >< at > -2056,9 +2127,10 < at >< at > static int got315(char *from, char *msg)
recheck_channel(chan, 2);
else if (chan->channel.members == 1)
chan->ircnet_status |= CHAN_STOP_CYCLE;
- else if (any_ops(chan))
+ else if (chan->channel.do_opreq) {
request_op(chan);
}
+ }
/* do not check for i-lines here. */
return 0;
}
< at >< at > -2425,6 +2497,37 < at >< at > static int got475(char *from, char *msg)
return 0;
}
+/* got 478: Channel ban list is full
+ * [< at >] irc.blessed.net 478 wtest #wraith-devel *!*< at >host.com :Channel ban list is full
+ */
+static int got478(char *from, char *msg)
+{
+ char *chname = NULL;
+ struct chanset_t *chan = NULL;
+
+ newsplit(&msg);
+ chname = newsplit(&msg);
+
+ /* !channel short names (also referred to as 'description names'
+ * can be received by skipping over the unique ID.
+ */
+ if ((chname[0] == '!') && (strlen(chname) > CHANNEL_ID_LEN)) {
+ chname += CHANNEL_ID_LEN;
+ chname[0] = '!';
+ }
+ /* We use dname because name is first set on JOIN and we might not
+ * have joined the channel yet.
+ */
+ chan = findchan_by_dname(chname);
+ if (chan && shouldjoin(chan)) {
+ // Only lockdown if not already locked down
+ if (!chan->channel.drone_set_mode) {
+ lockdown_chan(chan, FLOOD_BANLIST);
+ }
+ }
+ return 0;
+}
+
/* got invitation
*/
static int gotinvite(char *from, char *msg)
< at >< at > -2590,8 +2693,6 < at >< at > static int gotjoin(char *from, char *chname)
chan->ircnet_status &= ~CHAN_STOP_CYCLE;
- detect_chan_flood(nick, uhost, from, chan, FLOOD_JOIN, NULL);
-
if ((host = strchr(uhost, '< at >')))
++host;
< at >< at > -2625,6 +2726,7 < at >< at > static int gotjoin(char *from, char *chname)
if (!m->user && !m->userip[0] && doresolv(chan)) {
if (is_dotted_ip(host)) {
strlcpy(m->userip, uhost, sizeof(m->userip));
+ simple_snprintf(m->fromip, sizeof(m->fromip), "%s!%s", m->nick, m->userip);
if (channel_rbl(chan))
resolve_to_rbl(chan, m->userip);
} else
< at >< at > -2637,8 +2739,12 < at >< at > static int gotjoin(char *from, char *chname)
m = newmember(chan, nick);
m->joined = m->last = now;
strlcpy(m->userhost, uhost, sizeof(m->userhost));
- if (is_dotted_ip(host))
+ member_update_from_cache(chan, m);
+ simple_snprintf(m->from, sizeof(m->from), "%s!%s", m->nick, m->userhost);
+ if (is_dotted_ip(host)) {
strlcpy(m->userip, uhost, sizeof(m->userip));
+ simple_snprintf(m->fromip, sizeof(m->fromip), "%s!%s", m->nick, m->userip);
+ }
m->user = get_user_by_host(from);
m->tried_getuser = 1;
< at >< at > -2650,6 +2756,7 < at >< at > static int gotjoin(char *from, char *chname)
//m->flags |= STOPWHO;
if (match_my_nick(nick)) {
+ m->is_me = 1;
/* It was me joining! Need to update the channel record with the
* unique name for the channel (as the server see's it). <cybah>
*/
< at >< at > -2668,6 +2775,7 < at >< at > static int gotjoin(char *from, char *chname)
reset_chan_info(chan);
} else {
irc_log(chan, "Join: %s (%s)", nick, uhost);
+ detect_chan_flood(m, from, chan, FLOOD_JOIN);
set_handle_laston(chan->dname, m->user, now);
}
}
< at >< at > -2681,7 +2789,7 < at >< at > static int gotjoin(char *from, char *chname)
bool is_op = chk_op(fr, chan);
/* Check for a mass join */
- if (!splitjoin && channel_nomassjoin(chan) && !is_op) {
+ if (!splitjoin && chan->flood_mjoin_time && chan->flood_mjoin_thr && !is_op) {
if (chan->channel.drone_jointime < now - chan->flood_mjoin_time) { //expired, reset counter
chan->channel.drone_joins = 0;
}
< at >< at > -2689,7 +2797,7 < at >< at > static int gotjoin(char *from, char *chname)
chan->channel.drone_jointime = now;
if (!chan->channel.drone_set_mode && chan->channel.drone_joins >= chan->flood_mjoin_thr) { //flood from dronenet, let's attempt to set +im
- detected_drone_flood(chan, m);
+ lockdown_chan(chan, FLOOD_MASSJOIN);
}
}
< at >< at > -2820,7 +2928,7 < at >< at > static int gotpart(char *from, char *msg)
set_handle_laston(chan->dname, u, now);
if (m) {
- detect_chan_flood(nick, m->userhost, from, chan, FLOOD_PART, NULL);
+ detect_chan_flood(m, from, chan, FLOOD_PART);
killmember(chan, nick);
}
if (msg[0])
< at >< at > -2858,44 +2966,57 < at >< at > static int gotkick(char *from, char *origmsg)
}
if (channel_active(chan)) {
char *whodid = NULL, s1[UHOSTLEN] = "", buf[UHOSTLEN] = "", *uhost = buf;
- memberlist *m = NULL;
- struct userrec *u = NULL;
+ memberlist *m = NULL, *mv = NULL;
struct flag_record fr = {FR_GLOBAL | FR_CHAN, 0, 0, 0 };
fixcolon(msg);
- u = get_user_by_host(from);
- if (!u || (u && !u->bot))
- chan->channel.fighting++;
strlcpy(uhost, from, sizeof(buf));
whodid = splitnick(&uhost);
- detect_chan_flood(whodid, uhost, from, chan, FLOOD_KICK, nick);
chan = findchan(chname);
if (!chan)
return 0;
m = ismember(chan, whodid);
- if (m)
+ if (m) {
+ detect_chan_flood(m, from, chan, FLOOD_KICK);
+
m->last = now;
+ member_getuser(m);
+ if (m->user) {
/* This _needs_ to use chan->dname <cybah> */
- get_user_flagrec(u, &fr, chan->dname, chan);
- set_handle_laston(chan->dname, u, now);
+ get_user_flagrec(m->user, &fr, chan->dname, chan);
+ set_handle_laston(chan->dname, m->user, now);
+ }
+ }
- chan = findchan(chname);
- if (!chan)
- return 0;
+ if ((!m || !m->user) || (m && m->user && !m->user->bot)) {
+ chan->channel.fighting++;
+ }
- if ((m = ismember(chan, nick))) {
- member_getuser(m);
- if (m->user)
- set_handle_laston(chan->dname, m->user, now);
-// maybe_revenge(chan, from, s1, REVENGE_KICK);
+ mv = ismember(chan, nick);
+
+ member_getuser(mv);
+ if (mv->user) {
+ // Revenge kick clients that kick our bots
+ if (chan->revenge && !mv->is_me && m && m != mv && mv->user->bot && !(m->user && m->user->bot)) {
+ if (role < 5 && !chan_sentkick(m) && me_op(chan)) {
+ m->flags |= SENTKICK;
+ dprintf(DP_MODE_NEXT, "KICK %s %s :%s%s\r\n", chan->name, m->nick, kickprefix, response(RES_REVENGE));
} else {
- simple_snprintf(s1, sizeof(s1), "%s!*< at >could.not.loookup.hostname", nick);
+ if (m->user) {
+ char tmp[128] = "";
+ simple_snprintf(tmp, sizeof(tmp), "Kicked bot %s on %s", mv->nick, chan->dname);
+ deflag_user(m->user, DEFLAG_EVENT_REVENGE_KICK, tmp, chan);
+ }
+ }
+ }
+
+ set_handle_laston(chan->dname, mv->user, now);
}
irc_log(chan, "%s was kicked by %s (%s)", s1, from, msg);
/* Kicked ME?!? the sods! */
- if (match_my_nick(nick)) {
+ if (mv->is_me) {
check_rejoin(chan);
} else {
killmember(chan, nick);
< at >< at > -2940,10 +3061,11 < at >< at > static int gotnick(char *from, char *msg)
if (rfc_casecmp(nick, msg)) {
/* Someone on channel with old nick?! */
if ((mm = ismember(chan, msg)))
- killmember(chan, mm->nick);
+ killmember(chan, mm->nick, false);
}
strlcpy(m->nick, msg, sizeof(m->nick));
+ strlcpy(m->from, s1, sizeof(m->from));
/*
* Banned?
< at >< at > -2951,7 +3073,7 < at >< at > static int gotnick(char *from, char *msg)
memberlist_reposition(chan, m);
- detect_chan_flood(msg, uhost, from, chan, FLOOD_NICK, NULL);
+ detect_chan_flood(m, from, chan, FLOOD_NICK);
/* don't fill the serverqueue with modes or kicks in a nickflood */
if (chan_sentkick(m) || chan_sentdeop(m) || chan_sentop(m) ||
< at >< at > -3123,8 +3245,9 < at >< at > static int gotmsg(char *from, char *msg)
memberlist *m = ismember(chan, nick);
/* Only check if flood-ctcp is active */
- if (flood_ctcp.count && detect_avalanche(msg)) {
- u = get_user_by_host(from);
+ if (m && flood_ctcp.count && detect_avalanche(msg)) {
+ member_getuser(m);
+ u = m->user;
get_user_flagrec(u, &fr, chan->dname, chan);
/* Discard -- kick user if it was to the channel */
if (m && me_op(chan) &&
< at >< at > -3170,13 +3293,10 < at >< at > static int gotmsg(char *from, char *msg)
ctcp = buf2;
strlcpy(ctcp, p1, sizeof(buf2));
strcpy(p1 - 1, p + 1);
- detect_chan_flood(nick, uhost, from, chan,
-strncmp(ctcp, "ACTION ", 7) ?
-FLOOD_CTCP : FLOOD_PRIVMSG, NULL);
-
- chan = findchan(realto);
- if (!chan)
- return 0;
+ if (m) {
+ detect_chan_flood(m, from, chan, strncmp(ctcp, "ACTION ", 7) ? FLOOD_CTCP : FLOOD_PRIVMSG);
+ detect_chan_flood(m, from, chan, FLOOD_BYTES, msg);
+ }
/* Respond to the first answer_ctcp */
p = strchr(msg, 1);
< at >< at > -3188,10 +3308,6 < at >< at > static int gotmsg(char *from, char *msg)
if (!ignoring || trigger_on_ignore) {
if (check_bind_ctcp(nick, uhost, u, to, code, ctcp) == BIND_RET_LOG) {
- chan = findchan(realto);
- if (!chan)
-return 0;
-
update_idle(chan->dname, nick);
}
/* Log DCC, it's to a channel damnit! */
< at >< at > -3224,13 +3340,13 < at >< at > static int gotmsg(char *from, char *msg)
int botmatch = 0;
char *my_msg = NULL, *my_ptr = NULL, *fword = NULL;
-#ifdef unfinished
if (me_op(chan) && doflood(chan))
detect_offense(m, chan, msg);
-#endif
- /* Check even if we're ignoring the host. (modified by Eule 17.7.99) */
- detect_chan_flood(nick, uhost, from, chan, FLOOD_PRIVMSG, NULL);
+ if (m) {
+ detect_chan_flood(m, from, chan, FLOOD_PRIVMSG);
+ detect_chan_flood(m, from, chan, FLOOD_BYTES, msg);
+ }
if (auth_chan) {
my_msg = my_ptr = strdup(msg);
< at >< at > -3242,7 +3358,6 < at >< at > static int gotmsg(char *from, char *msg)
/* is it a cmd? */
if (auth_prefix[0] && fword && fword[0] && fword[1] && ((botmatch && fword[0] != auth_prefix[0]) || (fword[0] == auth_prefix[0]))) {
Auth *auth = Auth::Find(uhost);
-
if (auth && auth->Authed()) {
if (fword[0] == auth_prefix[0])
fword++;
< at >< at > -3281,9 +3396,13 < at >< at > static int gotnotice(char *from, char *msg)
fixcolon(msg);
strlcpy(uhost, from, sizeof(buf));
nick = splitnick(&uhost);
- u = get_user_by_host(from);
- if (flood_ctcp.count && detect_avalanche(msg)) {
memberlist *m = ismember(chan, nick);
+ if (m) {
+ member_getuser(m);
+ u = m->user;
+ }
+
+ if (flood_ctcp.count && detect_avalanche(msg)) {
get_user_flagrec(u, &fr, chan->dname, chan);
/* Discard -- kick user if it was to the channel */
< at >< at > -3320,13 +3439,10 < at >< at > static int gotnotice(char *from, char *msg)
strlcpy(ctcp, p1, sizeof(buf2));
strcpy(p1 - 1, p + 1);
p = strchr(msg, 1);
- detect_chan_flood(nick, uhost, from, chan,
-strncmp(ctcp, "ACTION ", 7) ?
-FLOOD_CTCP : FLOOD_PRIVMSG, NULL);
-
- chan = findchan(realto);
- if (!chan)
-return 0;
+ if (m) {
+ detect_chan_flood(m, from, chan, strncmp(ctcp, "ACTION ", 7) ? FLOOD_CTCP : FLOOD_PRIVMSG);
+ detect_chan_flood(m, from, chan, FLOOD_BYTES, msg);
+ }
if (ctcp[0] != ' ') {
code = newsplit(&ctcp);
< at >< at > -3343,12 +3459,10 < at >< at > static int gotnotice(char *from, char *msg)
}
}
if (msg[0]) {
- /* Check even if we're ignoring the host. (modified by Eule 17.7.99) */
- detect_chan_flood(nick, uhost, from, chan, FLOOD_NOTICE, NULL);
-
- chan = findchan(realto);
- if (!chan)
- return 0;
+ if (m) {
+ detect_chan_flood(m, from, chan, FLOOD_NOTICE);
+ detect_chan_flood(m, from, chan, FLOOD_BYTES, msg);
+ }
update_idle(chan->dname, nick);
< at >< at > -3377,6 +3491,7 < at >< at > static cmd_t irc_raw[] =
{"473","",(Function) got473,"irc:473", LEAF},
{"474","",(Function) got474,"irc:474", LEAF},
{"475","",(Function) got475,"irc:475", LEAF},
+ {"478","",(Function) got478,"irc:478", LEAF},
{"INVITE","",(Function) gotinvite,"irc:invite", LEAF},
{"TOPIC","",(Function) gottopic,"irc:topic", LEAF},
{"331","",(Function) got331,"irc:331", LEAF},
diff --git a/src/mod/irc.mod/cmdsirc.c b/src/mod/irc.mod/cmdsirc.c
index 6aaf4e6..a4a2711 100755
--- a/src/mod/irc.mod/cmdsirc.c
+++ b/src/mod/irc.mod/cmdsirc.c
< at >< at > -121,7 +121,7 < at >< at > static void cmd_act(int idx, char *par)
chan->dname, par);
bd::String msg;
msg = bd::String::printf("\001ACTION %s\001", par);
- privmsg(chan->name, msg.c_str(), DP_HELP);
+ privmsg(chan->name, msg, DP_HELP);
dprintf(idx, "Action to %s: %s\n", chan->dname, par);
}
< at >< at > -284,8 +284,9 < at >< at > static void cmd_kickban(int idx, char *par)
dprintf(idx, "%s is not on %s\n", nick, chan->dname);
return;
}
- simple_snprintf(s, sizeof s, "%s!%s", m->nick, m->userhost);
- u = get_user_by_host(s);
+ member_getuser(m);
+ u = m->user;
+ strlcpy(s, m->from, sizeof(s));
get_user_flagrec(u, &victim, chan->dname);
if ((chan_master(victim) || glob_master(victim)) &&
< at >< at > -294,7 +295,7 < at >< at > static void cmd_kickban(int idx, char *par)
dprintf(idx, "%s is a %s master.\n", nick, chan->dname);
return;
}
- if (glob_bot(victim) && !(glob_owner(user) || chan_owner(user))) {
+ if (glob_bot(victim)) {
if (all) goto next;
dprintf(idx, "%s is another channel bot!\n", nick);
return;
< at >< at > -484,7 +485,6 < at >< at > static void cmd_op(int idx, char *par)
if (!all && !chan)
return;
- char s[UHOSTLEN] = "";
memberlist *m = NULL;
struct userrec *u = NULL;
< at >< at > -528,8 +528,8 < at >< at > static void cmd_op(int idx, char *par)
dprintf(idx, "%s is not on %s.\n", nick, chan->dname);
return;
}
- simple_snprintf(s, sizeof s, "%s!%s", m->nick, m->userhost);
- u = get_user_by_host(s);
+ member_getuser(m);
+ u = m->user;
get_user_flagrec(u, &victim, chan->dname);
if (chk_deop(victim, chan)) {
dprintf(idx, "%s is currently being auto-deopped on %s.\n", m->nick, chan->dname);
< at >< at > -618,7 +618,7 < at >< at > static void cmd_mmode(int idx, char *par)
{
char *mode = newsplit(&par);
if (strlen(mode) > 2 || !strchr("+-", mode[0]) || !par[0]) {
- dprintf(idx, "Usage: mmode <(+|-)MODE> <#channel> <a|o|v|d|r> [bots=n] [alines=n] [slines=n] [overlap=n] [bitch] [simul] [local]\n");
+ dprintf(idx, "Usage: mmode <(+|-)MODE> <#channel> <a|o|v|d|r> [bots=n] [alines=n] [slines=n] [overlap=n] [bitch] [botbitch] [simul] [local]\n");
dprintf(idx, "Ie. mmode -o #chan a\n");
return;
}
< at >< at > -651,7 +651,7 < at >< at > static void cmd_mmode(int idx, char *par)
}
}
if (!chan || !chname || !chname[0]) {
- dprintf(idx, "Usage: mmode <(+|-)MODE> <#channel> <a|o|v|d|r> [bots=n] [alines=n] [slines=n] [overlap=n] [bitch] [simul] [local]\n");
+ dprintf(idx, "Usage: mmode <(+|-)MODE> <#channel> <a|o|v|d|r> [bots=n] [alines=n] [slines=n] [overlap=n] [bitch] [botbitch] [simul] [local]\n");
dprintf(idx, "Ie. mmode -o #chan a\n");
return;
}
< at >< at > -659,7 +659,7 < at >< at > static void cmd_mmode(int idx, char *par)
char *who = newsplit(&par);
if (strlen(who) > 1 || !strchr("aovdr", who[0])) {
- dprintf(idx, "Usage: mmode <(+|-)MODE> <#channel> <a|o|v|d|r> [bots=n] [alines=n] [slines=n] [overlap=n] [bitch] [simul] [local]\n");
+ dprintf(idx, "Usage: mmode <(+|-)MODE> <#channel> <a|o|v|d|r> [bots=n] [alines=n] [slines=n] [overlap=n] [bitch] [botbitch] [simul] [local]\n");
dprintf(idx, "Ie. mmode -o #chan a\n");
dprintf(idx, "a = all.\n");
dprintf(idx, "o = ops.\n");
< at >< at > -716,7 +716,7 < at >< at > static void cmd_mmode(int idx, char *par)
}
int force_bots = 0, force_alines = 0, force_slines = 0, force_overlap = 0;
- bool bitch = 0, simul = 0, local = 0;
+ bool bitch = 0, botbitch = 0, simul = 0, local = 0;
while (par && par[0]) {
char *p = newsplit(&par);
< at >< at > -766,6 +766,8 < at >< at > static void cmd_mmode(int idx, char *par)
}
} else if (!strncasecmp(p, "bitch", 5)) {
bitch = 1;
+ } else if (!strncasecmp(p, "botbitch", 8)) {
+ botbitch = 1;
} else if (!strncasecmp(p, "simul", 5)) {
simul = 1;
} else if (!strncasecmp(p, "local", 5)) {
< at >< at > -953,6 +955,10 < at >< at > static void cmd_mmode(int idx, char *par)
chan->status |= CHAN_BITCH;
do_chanset(NULL, chan, "+bitch", DO_LOCAL | DO_NET);
}
+ if (botbitch && !simul) {
+ chan->status |= CHAN_BOTBITCH;
+ do_chanset(NULL, chan, "+botbitch", DO_LOCAL | DO_NET);
+ }
free(targets);
free(overlaps);
free(chanbots);
< at >< at > -970,7 +976,6 < at >< at > static void cmd_deop(int idx, char *par)
if (!all && !chan)
return;
- char s[UHOSTLEN] = "";
memberlist *m = NULL;
struct userrec *u = NULL;
< at >< at > -1016,8 +1021,8 < at >< at > static void cmd_deop(int idx, char *par)
dprintf(idx, "I'm not going to deop myself.\n");
return;
}
- simple_snprintf(s, sizeof s, "%s!%s", m->nick, m->userhost);
- u = get_user_by_host(s);
+ member_getuser(m);
+ u = m->user;
get_user_flagrec(u, &victim, chan->dname);
if ((chan_master(victim) || glob_master(victim)) &&
< at >< at > -1026,6 +1031,10 < at >< at > static void cmd_deop(int idx, char *par)
if (all) goto next;
return;
}
+ if (glob_bot(victim)) {
+ dprintf(idx, "%s is another channel bot!\n", nick);
+ return;
+ }
if (chk_op(victim, chan) && !(chan_master(user) || glob_master(user))) {
dprintf(idx, "%s has the op flag for %s.\n", m->nick, chan->dname);
if (all) goto next;
< at >< at > -1070,7 +1079,6 < at >< at > static void cmd_kick(int idx, char *par)
return;
}
- char s[UHOSTLEN] = "";
memberlist *m = NULL;
struct userrec *u = NULL;
< at >< at > -1107,8 +1115,8 < at >< at > static void cmd_kick(int idx, char *par)
dprintf(idx, "%s is not on %s\n", nick, chan->dname);
return;
}
- simple_snprintf(s, sizeof s, "%s!%s", m->nick, m->userhost);
- u = get_user_by_host(s);
+ member_getuser(m);
+ u = m->user;
get_user_flagrec(u, &victim, chan->dname);
if (chk_op(victim, chan) && !(chan_master(user) || glob_master(user))) {
if (all) goto next;
< at >< at > -1121,7 +1129,7 < at >< at > static void cmd_kick(int idx, char *par)
dprintf(idx, "%s is a %s master.\n", nick, chan->dname);
return;
}
- if (glob_bot(victim) && !(glob_owner(user) || chan_owner(user))) {
+ if (glob_bot(victim)) {
dprintf(idx, "%s is another channel bot!\n", nick);
return;
}
< at >< at > -1199,7 +1207,6 < at >< at > static void cmd_mop(int idx, char *par)
putlog(LOG_CMDS, "*", "#%s# (%s) mop %s", dcc[idx].nick, all ? "*" : chan->dname, par);
memberlist *m = NULL;
- char s[256] = "";
while (chan) {
get_user_flagrec(dcc[idx].user, &user, chan->dname);
< at >< at > -1220,14 +1227,7 < at >< at > static void cmd_mop(int idx, char *par)
}
if (channel_active(chan) && !channel_pending(chan)) {
for (m = chan->channel.member; m && m->nick[0]; m = m->next) {
- if (!m->user) {
- simple_snprintf(s, sizeof(s), "%s!%s", m->nick, m->userhost);
- m->user = get_user_by_host(s);
- if (!m->user && m->userip[0]) {
- simple_snprintf(s, sizeof(s), "%s!%s", m->nick, m->userip);
- m->user = get_user_by_host(s);
- }
- }
+ member_getuser(m);
if (m->user && u_pass_match(m->user, "-"))
continue;/* dont op users without a pass */
get_user_flagrec(m->user, &victim, chan->dname);
< at >< at > -1285,10 +1285,8 < at >< at > static void cmd_find(int idx, char *par)
for (m = chan->channel.member; m && m->nick[0]; m = m->next) {
member_getuser(m, 1);
- char s[UHOSTLEN] = "";
- simple_snprintf(s, sizeof(s), "%s!%s", m->nick, m->userhost);
- if ((!lookup_user && wild_match(par, s)) || (lookup_user && m->user == u)) {
+ if ((!lookup_user && wild_match(par, m->from)) || (lookup_user && m->user == u)) {
fcount++;
if (!found) {
found = (memberlist **) my_calloc(1, sizeof(memberlist *) * 100);
< at >< at > -1722,8 +1720,9 < at >< at > static void cmd_adduser(int idx, char *par)
}
if (strlen(hand) > HANDLEN)
hand[HANDLEN] = 0;
- simple_snprintf(s, sizeof s, "%s!%s", m->nick, m->userhost);
- if ((u = get_user_by_host(s))) {
+ member_getuser(m);
+ strlcpy(s, m->from, sizeof(s));
+ if ((u = m->user)) {
dprintf(idx, "%s is already known as %s.\n", nick, u->handle);
return;
}
< at >< at > -1760,7 +1759,7 < at >< at > static void cmd_adduser(int idx, char *par)
bd::String msg;
msg = bd::String::printf("*** You've been add to this botnet as '%s' with the host '%s'. Ask a botnet admin for the msg cmds. Your initial password is: %s", hand, p1, s2);
- privmsg(nick, msg.c_str(), DP_HELP);
+ privmsg(nick, msg, DP_HELP);
} else {
dprintf(idx, "Added hostmask %s to %s.\n", p1, u->handle);
addhost_by_handle(hand, p1);
< at >< at > -1777,7 +1776,7 < at >< at > static void cmd_deluser(int idx, char *par)
return;
}
- char *nick = NULL, s[UHOSTLEN] = "", *added = NULL;
+ char *nick = NULL, *added = NULL;
struct chanset_t *chan = NULL;
memberlist *m = NULL;
struct userrec *u = NULL;
< at >< at > -1794,8 +1793,8 < at >< at > static void cmd_deluser(int idx, char *par)
return;
}
get_user_flagrec(dcc[idx].user, &user, chan->dname);
- simple_snprintf(s, sizeof s, "%s!%s", m->nick, m->userhost);
- if (!(u = get_user_by_host(s))) {
+ member_getuser(m);
+ if (!(u = m->user)) {
dprintf(idx, "%s is not a valid user.\n", nick);
return;
}
< at >< at > -1929,7 +1928,7 < at >< at > static void cmd_play(int idx, char *par)
while (stream.tell() < stream.length()) {
str = stream.getline().chomp();
if (str.length()) {
- privmsg(chan->name, str.c_str(), DP_PLAY);
+ privmsg(chan->name, str, DP_PLAY);
++lines;
}
}
diff --git a/src/mod/irc.mod/irc.c b/src/mod/irc.mod/irc.c
index 18ae7bc..e3d2605 100755
--- a/src/mod/irc.mod/irc.c
+++ b/src/mod/irc.mod/irc.c
< at >< at > -61,6 +61,8 < at >< at >
#include <stdarg.h>
+#include <math.h>
+
#define PRIO_DEOP 1
#define PRIO_KICK 2
< at >< at > -112,39 +114,118 < at >< at > voice_ok(memberlist *m, struct chanset_t *chan)
#include "cmdsirc.c"
#include "msgcmds.c"
-#ifdef unfinished
-static void
+static int
detect_offense(memberlist* m, struct chanset_t *chan, char *msg)
{
+ if (!chan || !msg
+ || !(chan->capslimit || chan->colorlimit)
+ || chan_sentkick(m)) //sanity check
+ return 0;
+
struct flag_record fr = { FR_GLOBAL | FR_CHAN, 0, 0, 0 };
struct userrec *u = m->user ? m->user : get_user_by_host(m->userhost);
- int i = 0;
+ get_user_flagrec(u, &fr, chan->dname, chan);
- //size_t tot = strlen(msg);
+ if (glob_bot(fr) ||
+ (m && chan->flood_exempt_mode == CHAN_FLAG_OP && chan_hasop(m)) ||
+ (m && chan->flood_exempt_mode == CHAN_FLAG_VOICE && (chan_hasvoice(m) || chan_hasop(m))))
+ return 0;
- get_user_flagrec(u, &fr, chan->dname, chan);
+ int color_count = 0, hit_check = 0, hit_count = 0;
+ double caps_percentage = 0, caps_count = 0;
+ const double caps_limit = chan->capslimit ? double(chan->capslimit) / 100.0 : double(0);
- for (; *msg; ++msg) {
- if (egg_isupper(*msg))
- i++;
+ // Need to know how long the message is, and want to ignore spaces, so avoid a strlen() and just loop to count
+ size_t tot = 0;
+ if (caps_limit) {
+ char *msg_check = msg;
+ while (msg_check && *msg_check) {
+ if (!egg_isspace(*msg_check) && *msg_check != 3 && *msg_check != 2) {
+ ++tot;
+ }
+ ++msg_check;
}
-/* if ((chan->capslimit)) { */
- while (((msg) && *msg)) {
- if (egg_isupper(*msg))
- i++;
- msg++;
+ if (tot >= 30) {
+ hit_check = tot/5; //check in-between for hits to save waste of cpu
+ } else if (!tot && !chan->colorlimit) {
+ // Nothing to do, bail out
+ return 0;
+ }
}
-/*
- if (chan->capslimit && ((i / tot) >= chan->capslimit)) {
-dprintf(DP_MODE, "PRIVMSG %s :flood stats for %s: %d/%d are CAP, percentage: %d\n", chan->name, nick, i, tot, (i/tot)*100);
- if ((((i / tot) * 100) >= 50)) {
-dprintf(DP_HELP, "PRIVMSG %s :cap flood.\n", chan->dname);
+ while (msg && *msg) {
+ // Skip spaces
+ if (egg_isspace(*msg)) {
+ ++msg;
+ continue;
+ }
+
+ if (egg_isupper(*msg)) {
+ ++caps_count;
+ } else if (*msg == 3 || *msg == 2) {
+ ++color_count;
+ }
+
+ if (hit_check && !(hit_count % hit_check)) {
+ if (caps_limit) {
+ caps_percentage = (caps_count)/(double(tot));
+ if (caps_percentage >= caps_limit) {
+ break;
+ }
+ }
+ if (chan->colorlimit && color_count >= chan->colorlimit) {
+ break;
+ }
+ ++hit_count;
+ }
+ ++msg;
+ }
+ if (chan->capslimit && caps_count && tot >= 6) {
+ caps_percentage = (caps_count)/(double(tot));
+ if (caps_percentage >= caps_limit) {
+ const char *response = punish_flooder(chan, m);
+ putlog(LOG_MODES, chan->name, "Caps flood (%d%%) from %s -- %s", int(caps_percentage * 100), m->nick, response);
+ return 1;
+ }
+ } else if (chan->colorlimit && color_count) {
+ if (color_count >= chan->colorlimit) {
+ const char *response = punish_flooder(chan, m);
+ putlog(LOG_MODES, chan->name, "Color flood (%d) from %s -- %s", color_count, m->nick, response);
+ return 1;
+ }
+ }
+ return 0;
+}
+
+void set_devoice(struct chanset_t *chan, memberlist* m) {
+ if (!(m->flags & EVOICE)) {
+ putlog(LOG_DEBUG, "< at >", "Giving EVOICE flag to: %s (%s)", m->nick, chan->dname);
+ m->flags |= EVOICE;
}
-*/
}
-#endif
+
+const char* punish_flooder(struct chanset_t* chan, memberlist* m, const char *reason) {
+ if (channel_voice(chan) && chan->voice_moderate) {
+ if (!chan_sentdevoice(m)) {
+ add_mode(chan, '-', 'v', m->nick);
+ m->flags |= SENTDEVOICE;
+ set_devoice(chan, m);
+ return "devoicing";
+ } else {
+ return "devoiced";
+ }
+ } else {
+ if (!chan_sentkick(m)) {
+ dprintf(DP_SERVER, "KICK %s %s :%s%s\n", chan->name, m->nick, kickprefix, reason ? reason : response(RES_FLOOD));
+ m->flags |= SENTKICK;
+ return "kicking";
+ } else {
+ return "kicked";
+ }
+ }
+ return "ignoring";
+}
void unlock_chan(struct chanset_t *chan)
{
< at >< at > -152,7 +233,7 < at >< at > void unlock_chan(struct chanset_t *chan)
char buf[3] = "", *p = buf;
if ((chan->channel.drone_set_mode & CHANINV) && !(chan->mode_pls_prot & CHANINV))
*p++ = 'i';
- if ((chan->channel.drone_set_mode & CHANMODER) && !(chan->mode_pls_prot & CHANMODER))
+ if ((chan->channel.drone_set_mode & CHANMODER) && !((chan->mode_pls_prot & CHANMODER) || (channel_voice(chan) && chan->voice_moderate)))
*p++ = 'm';
*p = 0;
dprintf(DP_MODE, "MODE %s :-%s\n", chan->name[0] ? chan->name : chan->dname, buf);
< at >< at > -160,7 +241,10 < at >< at > void unlock_chan(struct chanset_t *chan)
chan->channel.drone_set_mode = 0;
}
-void detected_drone_flood(struct chanset_t* chan, memberlist* m) {
+void lockdown_chan(struct chanset_t* chan, flood_reason_t reason, const char* flood_type) {
+ if (!me_op(chan)) {
+ return;
+ }
egg_timeval_t howlong;
chan->channel.drone_set_mode = 0;
< at >< at > -186,7 +270,13 < at >< at > void detected_drone_flood(struct chanset_t* chan, memberlist* m) {
howlong.usec = 0;
timer_create_complex(&howlong, "unlock", (Function) unlock_chan, (void *) chan, 0);
- putlog(LOG_MISC, "*", "Flood detected in %s! Locking for %d seconds.", chan->dname, chan->flood_lock_time);
+ if (reason == FLOOD_MASSJOIN) {
+ putlog(LOG_MISC, "*", "Join flood detected in %s! Locking for %d seconds.", chan->dname, chan->flood_lock_time);
+ } else if (reason == FLOOD_BANLIST) {
+ putlog(LOG_MISC, "*", "Banlist full in %s! Locking for %d seconds.", chan->dname, chan->flood_lock_time);
+ } else if (reason == FLOOD_MASS_FLOOD) {
+ putlog(LOG_MISC, "*", "Mass flood (%s) detected in %s! Locking for %d seconds.", flood_type, chan->dname, chan->flood_lock_time);
+ }
}
}
< at >< at > -201,7 +291,7 < at >< at > void notice_invite(struct chanset_t *chan, char *handle, char *nick, char *uhost
bd::String msg;
msg = bd::String::printf("\001ACTION has invited %s(%s%s%s) to %s.%s\001",
fhandle, nick, uhost ? "!" : "", uhost ? uhost : "", chan->dname, op ? ops : "");
- privmsg(chan->name, msg.c_str(), DP_MODE);
+ privmsg(chan->name, msg, DP_MODE);
}
#ifdef CACHE
< at >< at > -598,8 +688,6 < at >< at > getin_request(char *botnick, char *code, char *par)
if (what[0] != 'K') {
if (!(channel_pending(chan) || channel_active(chan))) {
- putlog(LOG_GETIN, "*", "%sreq from %s/%s %s %s - I'm not on %s right now.", type, botnick, nick, desc,
- chan->dname, chan->dname);
return;
}
}
< at >< at > -675,13 +763,13 < at >< at > getin_request(char *botnick, char *code, char *par)
}
// Does the remote bot have the same number of clients in its channel as me? And a shared member?
- int members = atoi(tmp);
+ const char *bot_network = tmp;
char *shared_nick = par[0] ? newsplit(&par) : NULL;
memberlist* shared_member = shared_nick ? ismember(chan, shared_nick) : NULL;
char *shared_host = par[0] ? newsplit(&par) : NULL;
- if (!shared_nick || !shared_member || !shared_host || !((chan->channel.members - chan->channel.splitmembers) == members) || strcmp(shared_host, shared_member->userhost)) {
- putlog(LOG_GETIN, "*", "opreq from %s/%s on %s - Bot seems to be on a different network???", botnick, nick, chan->dname);
+ if (!shared_nick || !shared_member || !shared_host || (strcasecmp(curnetwork, bot_network)) || strcmp(shared_host, shared_member->userhost)) {
+ putlog(LOG_GETIN, "*", "opreq from %s/%s on %s - Bot seems to be on a different network '%s' / me: '%s'", botnick, nick, chan->dname, bot_network, curnetwork);
return;
}
< at >< at > -695,6 +783,27 < at >< at > getin_request(char *botnick, char *code, char *par)
putlog(LOG_GETIN, "*", "opreq from %s/%s on %s - Opped", botnick, nick, chan->dname);
} else if (what[0] == 'i') {
+ // Should I respond to this request?
+ // If there's 18 eligible bots in the channel, and in-bots is 2, I have a 2/18 chance of replying.
+ int eligible_bots = 0;
+ for (memberlist* m = chan->channel.member; m && m->nick[0]; m = m->next) {
+ if (chan_hasop(m)) {
+ member_getuser(m, 0);
+ if (m->user && m->user->bot) {
+ ++eligible_bots;
+ }
+ }
+ }
+
+ if (!eligible_bots) {
+ return;
+ }
+
+ if (!((randint(eligible_bots) + 1) <= static_cast<unsigned int>(in_bots))) {
+ // Not my turn
+ return;
+ }
+
if (mem) {
putlog(LOG_GETIN, "*", "inreq from %s/%s for %s - %s is already on %s", botnick, nick, chan->dname, nick, chan->dname);
return;
< at >< at > -722,17 +831,12 < at >< at > getin_request(char *botnick, char *code, char *par)
return;
}
+
bool sendi = 0;
if (chan->channel.maxmembers) {
- int lim = (chan->channel.members - chan->channel.splitmembers) + 5, curlim = chan->channel.maxmembers;
- if (curlim < lim) {
- char s2[6] = "";
-
- sendi = 1;
- simple_snprintf(s2, sizeof(s2), "%d", lim);
- add_mode(chan, '+', 'l', s2);
- putlog(LOG_GETIN, "*", "inreq from %s/%s for %s - Raised limit to %d", botnick, nick, chan->dname, lim);
+ if (raise_limit(chan, 5)) {
+ putlog(LOG_GETIN, "*", "inreq from %s/%s for %s - Raised limit", botnick, nick, chan->dname);
}
}
< at >< at > -816,8 +920,10 < at >< at > getin_request(char *botnick, char *code, char *par)
static void
request_op(struct chanset_t *chan)
{
- if (!chan || (chan && (channel_pending(chan) || !shouldjoin(chan) || !channel_active(chan) || me_op(chan))))
+ if (!chan || (chan && (channel_pending(chan) || !shouldjoin(chan) || !channel_active(chan) || me_op(chan)))) {
+ chan->channel.do_opreq = 0;
return;
+ }
if (chan->channel.no_op) {
if (chan->channel.no_op > now) /* dont op until this time has passed */
< at >< at > -826,7 +932,6 < at >< at > request_op(struct chanset_t *chan)
chan->channel.no_op = 0;
}
- chan->channel.do_opreq = 0;
/* check server lag */
if (server_lag > lag_threshold) {
putlog(LOG_GETIN, "*", "Not asking for ops on %s - I'm too lagged", chan->dname);
< at >< at > -921,7 +1026,7 < at >< at > request_op(struct chanset_t *chan)
}
/* first scan for bots on my server, ask first found for ops */
- simple_snprintf(s, sizeof(s), "gi o %s %s %d %s %s", chan->dname, botname, (chan->channel.members - chan->channel.splitmembers), shared_member->nick, shared_member->userhost);
+ simple_snprintf(s, sizeof(s), "gi o %s %s %s %s %s", chan->dname, botname, curnetwork, shared_member->nick, shared_member->userhost);
/* look for bots 0-1 hops away */
for (i2 = 0; i2 < i; i2++) {
< at >< at > -986,15 +1091,17 < at >< at > request_in(struct chanset_t *chan)
}
int foundBots = 0;
- char* botops[MAX_BOTS];
+// char* botops[MAX_BOTS];
for (tand_t* bot = tandbot; bot && (foundBots < MAX_BOTS); bot = bot->next) {
if (bot->hub || !bot->u)
continue;
get_user_flagrec(bot->u, &fr, chan->dname, chan);
- if (bot_shouldjoin(bot->u, &fr, chan) && chk_op(fr, chan))
- botops[foundBots++] = bot->bot;
+ if (bot_shouldjoin(bot->u, &fr, chan) && chk_op(fr, chan)) {
+ ++foundBots;
+// botops[foundBots++] = bot->bot;
+ }
}
if (!foundBots) {
< at >< at > -1002,207 +1109,10 < at >< at > request_in(struct chanset_t *chan)
return;
}
- int cnt = foundBots < in_bots ? foundBots : in_bots;
- char s[255] = "";
- char l[1024] = "";
- size_t len = 0;
-
- simple_snprintf(s, sizeof(s), "gi i %s %s %s!%s %s", chan->dname, botname, botname, botuserhost, botuserip);
-
- shuffleArray(botops, foundBots);
- for (int n = 0; n < cnt; ++n) {
- putbot(botops[n], s);
-
- if (l[0])
- len += strlcpy(l + len, ", ", sizeof(l) - len);
- len += strlcpy(l + len, botops[n], sizeof(l) - len);
- }
- l[len] = 0;
- putlog(LOG_GETIN, "*", "Requested help to join %s from %s", chan->dname, l);
-}
-
-
-#ifdef REVENGE
-/* Contains the logic to decide wether we want to punish someone. Returns
- * true (1) if we want to, false (0) if not.
- */
-static bool
-want_to_revenge(struct chanset_t *chan, struct userrec *u,
- struct userrec *u2, char *badnick, char *victimstr, bool mevictim)
-{
- struct flag_record fr = { FR_GLOBAL | FR_CHAN, 0, 0, 0 };
-
- /* Do not take revenge upon ourselves. */
- if (match_my_nick(badnick))
- return 0;
-
- get_user_flagrec(u, &fr, chan->dname, chan);
-
- /* Kickee didn't kick themself? */
- if (rfc_casecmp(badnick, victimstr)) {
- /* They kicked me? */
- if (mevictim) {
- /* ... and I'm allowed to take revenge? <snicker> */
- if (channel_revengebot(chan))
- return 1;
- /* Do we revenge for our users ... and do we actually know the victim? */
- } else if (channel_revenge(chan) && u2) {
- struct flag_record fr2 = { FR_GLOBAL | FR_CHAN, 0, 0, 0 };
-
- get_user_flagrec(u2, &fr2, chan->dname, chan);
- /* Protecting friends? */
- /* Protecting ops? */
- if ((channel_protectops(chan) && chk_op(fr2, chan)))
- return 1;
- }
- }
- return 0;
-}
-
-/* Dependant on revenge_mode, punish the offender.
- */
-static void
-punish_badguy(struct chanset_t *chan, char *whobad,
- struct userrec *u, char *badnick, char *victimstr, bool mevictim, int type)
-{
- memberlist *m = ismember(chan, badnick);
-
- if (!m)
- return;
-
- char reason[1024] = "", ct[81] = "", *kick_msg = NULL;
- struct flag_record fr = { FR_GLOBAL | FR_CHAN, 0, 0, 0 };
-
- get_user_flagrec(u, &fr, chan->dname, chan);
-
- /* Get current time into a string */
- strftime(ct, sizeof ct, "%d %b %Z", gmtime(&now));
-
- /* Put together log and kick messages */
- reason[0] = 0;
- switch (type) {
- case REVENGE_KICK:
- kick_msg = "don't kick my friends, bud";
- simple_snprintf(reason, sizeof(reason), "kicked %s off %s", victimstr, chan->dname);
- break;
- case REVENGE_DEOP:
- simple_snprintf(reason, sizeof(reason), "deopped %s on %s", victimstr, chan->dname);
- kick_msg = "don't deop my friends, bud";
- break;
- default:
- kick_msg = "revenge!";
- }
- putlog(LOG_MISC, chan->dname, "Punishing %s (%s)", badnick, reason);
-
- /* Set the offender +d */
- if ((chan->revenge_mode > 0) &&
- /* ... unless there's no more to do */
- !(chan_deop(fr) || glob_deop(fr))) {
- char s[UHOSTLEN], s1[UHOSTLEN];
- memberlist *mx = NULL;
-
- /* Removing op */
- if (chk_op(fr, chan)) {
- fr.match = FR_CHAN;
- if (chan_op(fr)) {
- fr.chan &= ~USER_OP;
- } else {
- fr.chan |= USER_DEOP;
- }
- set_user_flagrec(u, &fr, chan->dname);
- putlog(LOG_MISC, "*", "No longer opping %s[%s] (%s)", u->handle, whobad, reason);
- }
- /* ... or just setting to deop */
- else if (u) {
- /* In the user list already, cool :) */
- fr.match = FR_CHAN;
- fr.chan |= USER_DEOP;
- set_user_flagrec(u, &fr, chan->dname);
- simple_snprintf(s, sizeof(s), "(%s) %s", ct, reason);
- putlog(LOG_MISC, "*", "Now deopping %s[%s] (%s)", u->handle, whobad, s);
- }
- /* ... or creating new user and setting that to deop */
- else {
- strlcpy(s1, whobad, sizeof(s1));
- maskhost(s1, s);
- strlcpy(s1, badnick, sizeof(s1));
- /* If that handle exists use "badX" (where X is an increasing number)
- * instead.
- */
- while (get_user_by_handle(userlist, s1)) {
- if (!strncmp(s1, "bad", 3)) {
- int i;
-
- i = atoi(s1 + 3);
- simple_snprintf(s1 + 3, sizeof(s1) - 3, "%d", i + 1);
- } else
- strlcpy(s1, "bad1", sizeof(s1)); /* Start with '1' */
- }
- userlist = adduser(userlist, s1, s, "-", 0, 0);
- fr.match = FR_CHAN;
- fr.chan = USER_DEOP;
- u = get_user_by_handle(userlist, s1);
- if ((mx = ismember(chan, badnick)))
- mx->user = u;
- set_user_flagrec(u, &fr, chan->dname);
- simple_snprintf(s, sizeof(s), "(%s) %s (%s)", ct, reason, whobad);
- set_user(&USERENTRY_COMMENT, u, (void *) s);
- putlog(LOG_MISC, "*", "Now deopping %s (%s)", whobad, reason);
- }
- }
-
- /* Always try to deop the offender */
- if (!mevictim)
- add_mode(chan, '-', 'o', badnick);
- /* Ban. Should be done before kicking. */
- if (chan->revenge_mode > 2) {
- char s[UHOSTLEN] = "", s1[UHOSTLEN] = "";
-
- splitnick(&whobad);
- maskhost(whobad, s1);
- simple_snprintf(s, sizeof(s), "(%s) %s", ct, reason);
- u_addmask('b', chan, s1, conf.bot->nick, s, now + (60 * chan->ban_time), 0);
- if (!mevictim && me_op(chan)) {
- add_mode(chan, '+', 'b', s1);
- flush_mode(chan, QUICK);
- }
- }
- /* Kick the offender */
- if ((chan->revenge_mode > 1) && !chan_sentkick(m) &&
- /* ... and can I actually do anything about it? */
- me_op(chan) && !mevictim) {
- dprintf(DP_MODE, "KICK %s %s :%s%s\n", chan->name, m->nick, bankickprefix, response(RES_MEAN));
- m->flags |= SENTKICK;
- }
-}
-
-/* Punishes bad guys under certain circumstances using methods as defined
- * by the revenge_mode flag.
- */
-static void
-maybe_revenge(struct chanset_t *chan, char *whobad, char *whovictim, int type)
-{
- if (!chan || (type < 0))
- return;
-
- /* Get info about offender */
- struct userrec *u = get_user_by_host(whobad), *u2 = NULL;
- char *badnick = splitnick(&whobad), *victimstr = NULL;
- bool mevictim;
-
- /* Get info about victim */
- u2 = get_user_by_host(whovictim);
- victimstr = splitnick(&whovictim);
- mevictim = match_my_nick(victimstr);
-
- /* Do we want to revenge? */
- if (!want_to_revenge(chan, u, u2, badnick, victimstr, mevictim))
- return; /* No, leave them alone ... */
-
- /* Haha! Do the vengeful thing ... */
- punish_badguy(chan, whobad, u, badnick, victimstr, mevictim, type);
+ bd::String request(bd::String::printf("gi i %s %s %s!%s %s", chan->dname, botname, botname, botuserhost, botuserip));
+ putallbots(request.c_str());
+ putlog(LOG_GETIN, "*", "Requested help to join %s", chan->dname);
}
-#endif
/* Set the key.
*/
< at >< at > -1236,7 +1146,7 < at >< at > new_mask(masklist *m, char *s, char *who)
/* Removes a nick from the channel member list (returns 1 if successful)
*/
static bool
-killmember(struct chanset_t *chan, char *nick)
+killmember(struct chanset_t *chan, char *nick, bool cacheMember)
{
memberlist *x = NULL, *old = NULL;
< at >< at > -1252,8 +1162,17 < at >< at > killmember(struct chanset_t *chan, char *nick)
old->next = x->next;
else
chan->channel.member = x->next;
- free(x);
- chan->channel.members--;
+
+ if (cacheMember) {
+ x->last = now;
+ // Don't delete here, will delete when it expires from the cache.
+ (*chan->channel.cached_members)[x->userhost] = x;
+ } else {
+ chan->channel.cached_members->remove(x->userhost);
+ delete_member(x);
+ }
+
+ --chan->channel.members;
/* The following two errors should NEVER happen. We will try to correct
* them though, to keep the bot from crashing.
< at >< at > -1276,25 +1195,36 < at >< at > killmember(struct chanset_t *chan, char *nick)
return 1;
}
-/* Check if I am a chanop. Returns boolean 1 or 0.
+/**
+ * Update the member with cached information from a parted/quitted member
*/
-bool
-me_op(struct chanset_t *chan)
-{
- memberlist *mx = ismember(chan, botname);
+static void member_update_from_cache(struct chanset_t* chan, memberlist *m) {
+ using std::swap;
- if (!mx)
- return 0;
- if (chan_hasop(mx))
- return 1;
- else
- return 0;
+ // Are they in the cache?
+ const bd::String userhost(m->userhost);
+ if (chan->channel.cached_members->contains(userhost)) {
+ memberlist *cached_member = (*chan->channel.cached_members)[userhost];
+
+ // Update important flood tracking information
+ swap(m->floodtime, cached_member->floodtime);
+ swap(m->floodnum, cached_member->floodnum);
+
+ // Update EVOICE flag
+ if (cached_member->flags & EVOICE) {
+ m->flags |= EVOICE;
+ }
+
+ // No longer need the cached member
+ delete_member(cached_member);
+ chan->channel.cached_members->remove(userhost);
+ }
}
/* Check whether I'm voice. Returns boolean 1 or 0.
*/
bool
-me_voice(struct chanset_t *chan)
+me_voice(const struct chanset_t *chan)
{
memberlist *mx = ismember(chan, botname);
< at >< at > -1423,8 +1353,6 < at >< at > check_lonely_channel(struct chanset_t *chan)
!shouldjoin(chan) || (chan->channel.mode & CHANANON))
return;
- memberlist *m = NULL;
- char s[UHOSTLEN] = "";
static int whined = 0;
if ((chan->channel.members - chan->channel.splitmembers) == 1 && channel_cycle(chan) && !channel_stop_cycle(chan)) {
< at >< at > -1436,15 +1364,10 < at >< at > check_lonely_channel(struct chanset_t *chan)
}
} else if (any_ops(chan)) {
whined = 0;
- request_op(chan);
-/* need: op */
} else {
/* Other people here, but none are ops. If there are other bots make
* them LEAVE!
*/
- bool ok = 1;
- struct userrec *u = NULL;
-
if (!whined) {
/* + is opless. Complaining about no ops when without special
* help(services), we cant get them - Raist
< at >< at > -1453,10 +1376,14 < at >< at > check_lonely_channel(struct chanset_t *chan)
putlog(LOG_MISC, "*", "%s is active but has no ops :(", chan->dname);
whined = 1;
}
+#ifdef disabled
+ memberlist *m = NULL;
+ bool ok = 1;
+
for (m = chan->channel.member; m && m->nick[0]; m = m->next) {
- simple_snprintf(s, sizeof(s), "%s!%s", m->nick, m->userhost);
- u = get_user_by_host(s);
- if (!m->is_me && (!u || !u->bot)) {
+ member_getuser(m, 0);
+
+ if (!m->is_me && (!m->user || !m->user->bot)) {
ok = 0;
break;
}
< at >< at > -1468,11 +1395,8 < at >< at > check_lonely_channel(struct chanset_t *chan)
if (!m->is_me)
dprintf(DP_SERVER, "PRIVMSG %s :go %s\n", m->nick, chan->dname);
*/
- } else {
- /* Some humans on channel, but still op-less */
- request_op(chan);
-/* need: op */
}
+#endif
}
}
< at >< at > -1525,44 +1449,59 < at >< at > check_netfight(struct chanset_t *chan)
chan->channel.fighting = 0; /* we put this here because we need to clear it once per min */
}
-void
-raise_limit(struct chanset_t *chan)
+bool
+raise_limit(struct chanset_t *chan, int default_limitraise)
{
if (!chan || !me_op(chan))
- return;
+ return false;
/* Don't bother setting limit if the user has set a protect -l */
if (chan->mode_mns_prot & CHANLIMIT)
- return;
+ return false;
- int nl = (chan->channel.members - chan->channel.splitmembers) + chan->limitraise;/* new limit */
- int i = chan->limitraise >> 2;/* DIV 4 */
+ const int limitraise = (chan->limitraise ? ((chan->limitraise % 2 == 0) ? chan->limitraise : (chan->limitraise + 1)) : default_limitraise);
+ if (limitraise) {
+ const int nl = (chan->channel.members - chan->channel.splitmembers) + limitraise;/* new limit */
+ const int i = limitraise >> 2;/* DIV 4 */
/* if the newlimit will be in the range made by these vars, dont change. */
- int ul = nl + i;/* upper limit */
- int ll = nl - i;/* lower limit */
+ const int ul = nl + i;/* upper limit */
+ const int ll = nl - i;/* lower limit */
- if ((chan->channel.maxmembers > ll) && (chan->channel.maxmembers < ul))
- return; /* the current limit is in the range, so leave it. */
+ if ((chan->channel.maxmembers >= ll) && (chan->channel.maxmembers <= ul)) {
+ return false; /* the current limit is in the range, so leave it. */
+ }
if (nl != chan->channel.maxmembers) {
char s[6] = "";
simple_snprintf(s, sizeof(s), "%d", nl);
add_mode(chan, '+', 'l', s);
+
+ return true;
+ }
}
+ return false;
}
-static void
-check_expired_chanstuff(struct chanset_t *chan)
+void check_shouldjoin(struct chanset_t* chan)
{
if ((channel_active(chan) || channel_pending(chan)) && !shouldjoin(chan)) {
sdprintf("Active/Pending in %s but I shouldn't be there, parting...", chan->dname);
- dprintf(DP_MODE, "PART %s\n", chan->name[0] ? chan->name : chan->dname);
- } else if (channel_active(chan)) {
+ dprintf(DP_SERVER, "PART %s\n", chan->name[0] ? chan->name : chan->dname);
+ } else if (shouldjoin(chan)) {
+ join_chan(chan);
+ }
+}
+
+static void
+check_expired_chanstuff(struct chanset_t *chan)
+{
+ memberlist *m = NULL;
+ check_shouldjoin(chan);
+ if (channel_active(chan) && shouldjoin(chan)) {
masklist *b = NULL, *e = NULL;
- memberlist *m = NULL, *n = NULL;
- char s[UHOSTLEN] = "";
+ memberlist *n = NULL;
struct flag_record fr = { FR_GLOBAL | FR_CHAN, 0, 0, 0 };
if (me_op(chan)) {
< at >< at > -1614,17 +1553,17 < at >< at > check_expired_chanstuff(struct chanset_t *chan)
}
} /* me_op */
-// for (m = chan->channel.member; m && m->nick[0]; m = m->next) {
- int splitmembers = 0;
+ size_t splitmembers = 0, bot_ops = 0;
+ const bool im_opped = me_op(chan);
for (m = chan->channel.member; m && m->nick[0]; m = n) {
n = m->next;
+ // Update split members
if (m->split) {
++splitmembers;
if (now - m->split > wait_split) {
- simple_snprintf(s, sizeof(s), "%s!%s", m->nick, m->userhost);
putlog(LOG_JOIN, chan->dname, "%s (%s) got lost in the net-split.", m->nick, m->userhost);
--(chan->channel.splitmembers);
- killmember(chan, m->nick);
+ killmember(chan, m->nick, false);
continue;
}
}
< at >< at > -1640,7 +1579,7 < at >< at > check_expired_chanstuff(struct chanset_t *chan)
}
}
- if (me_op(chan)) {
+ if (im_opped) {
if (dovoice(chan) && !loading) { /* autovoice of +v users if bot is +y */
if (!chan_hasop(m) && !chan_hasvoice(m) && !chan_sentvoice(m)) {
member_getuser(m, 1);
< at >< at > -1665,13 +1604,37 < at >< at > check_expired_chanstuff(struct chanset_t *chan)
}
}
}
+ if (m->user && m->user->bot) {
+ ++bot_ops;
+ }
m = n;
}
// Update minutely
chan->channel.splitmembers = splitmembers;
check_lonely_channel(chan);
- } else if (shouldjoin(chan))
- join_chan(chan);
+ if (bot_ops && !im_opped) {
+ request_op(chan);
+ }
+
+ if (role == 3) {
+ recheck_channel_modes(chan);
+ }
+ }
+ // Clear out expired cached members
+ if (chan->channel.cached_members && chan->channel.cached_members->size()) {
+ bd::Array<bd::String> member_uhosts(chan->channel.cached_members->keys());
+ for (size_t i = 0; i < member_uhosts.length(); ++i) {
+ const bd::String uhost(member_uhosts[i]);
+
+ m = (*chan->channel.cached_members)[uhost];
+
+ // Delete the expired member
+ if (now - m->last > wait_split) {
+ delete_member(m);
+ chan->channel.cached_members->remove(uhost);
+ }
+ }
+ }
}
void
< at >< at > -1794,23 +1757,10 < at >< at > static cmd_t irc_bot[] = {
{NULL, NULL, NULL, NULL, 0}
};
-static void
-getin_5secondly()
-{
- if (!server_online)
- return;
-
- for (register struct chanset_t *chan = chanset; chan; chan = chan->next) {
- if ((!channel_pending(chan) && channel_active(chan)) && !me_op(chan))
- request_op(chan);
- }
-}
-
void
irc_init()
{
timer_create_secs(60, "irc_minutely", (Function) irc_minutely);
- timer_create_secs(5, "getin_5secondly", (Function) getin_5secondly);
/* Add our commands to the imported tables. */
add_builtins("dcc", irc_dcc);
diff --git a/src/mod/irc.mod/irc.h b/src/mod/irc.mod/irc.h
index 7234c1b..995876a 100755
--- a/src/mod/irc.mod/irc.h
+++ b/src/mod/irc.mod/irc.h
< at >< at > -7,12 +7,10 < at >< at >
#define _EGG_MOD_IRC_IRC_H
#include "src/auth.h"
+#include "src/chanprog.h"
enum { BC_NOCOOKIE = 1, BC_SLACK, BC_HASH, BC_COUNTER };
-//#define REVENGE_KICK 1/* Kicked victim*/
-//#define REVENGE_DEOP 2/* Took op*/
-
#define PRIO_DEOP 1
#define PRIO_KICK 2
< at >< at > -26,6 +24,12 < at >< at > namespace bd {
class String;
}
+enum flood_reason_t {
+ FLOOD_MASSJOIN,
+ FLOOD_BANLIST,
+ FLOOD_MASS_FLOOD
+};
+
#ifdef CACHE
typedef struct cache_chan_b {
struct cache_chan_b *next;
< at >< at > -79,22 +83,21 < at >< at > static void do_protect(struct chanset_t* chan, const char* reason);
#define resetexempts(chan) resetmasks((chan), (chan)->channel.exempt, (chan)->exempts, global_exempts, 'e')
#define resetinvites(chan) resetmasks((chan), (chan)->channel.invite, (chan)->invites, global_invites, 'I')
-//static void detect_offense(memberlist*, struct chanset_t *, char *);
+static int detect_offense(memberlist*, struct chanset_t *, char *);
/* static int target_priority(struct chanset_t *, memberlist *, int); */
static bool do_op(char *, struct chanset_t *, bool, bool);
static void request_op(struct chanset_t *);
static void request_in(struct chanset_t *);
-//static void maybe_revenge(struct chanset_t *, char *, char *, int);
-static bool detect_chan_flood(char *, char *, char *, struct chanset_t *, int,
- char *);
+static bool detect_chan_flood(memberlist *m, const char* from, struct chanset_t *chan, flood_t which, const char *msg = NULL);
static bool new_mask(masklist *, char *, char *);
static void do_closed_kick(struct chanset_t *, memberlist *);
-static char *quickban(struct chanset_t *, char *);
-static bool killmember(struct chanset_t *chan, char *nick);
+static char *quickban(struct chanset_t *, const char *);
+static bool killmember(struct chanset_t *chan, char *nick, bool cacheMember = true);
+static void member_update_from_cache(struct chanset_t* chan, memberlist *m);
static void check_lonely_channel(struct chanset_t *chan);
static int gotmode(char *, char *);
void unset_im(struct chanset_t* chan);
-void detected_drone_flood(struct chanset_t* chan, memberlist*);
+void lockdown_chan(struct chanset_t* chan, flood_reason_t reason, const char* flood_type = NULL);
static void send_chan_who(int queue, struct chanset_t* chan, bool chain = 0);
#define newban(chan, mask, who) new_mask((chan)->channel.ban, mask, who)
#define newexempt(chan, mask, who) new_mask((chan)->channel.exempt, mask, who)
< at >< at > -105,6 +108,8 < at >< at > typedef struct resolvstruct resolv_member;
void resolve_to_rbl(struct chanset_t *chan, const char *host, struct resolvstruct *r = NULL);
static void do_mask(struct chanset_t *chan, masklist *m, char *mask, char Mode);
static void get_channel_masks(struct chanset_t* chan);
+const char* punish_flooder(struct chanset_t* chan, memberlist* m, const char *reason = NULL);
+void set_devoice(struct chanset_t* chan, memberlist* m);
#endif /* MAKING_IRC */
< at >< at > -117,8 +122,15 < at >< at > void notice_invite(struct chanset_t *, char *, char *, char *, bool);
void real_add_mode(struct chanset_t *, const char, const char, const char *, bool);
#define add_mode(chan, pls, mode, nick) real_add_mode(chan, pls, mode, nick, 0)
#define add_cookie(chan, nick) real_add_mode(chan, '+', 'o', nick, 1)
-bool me_op(struct chanset_t *);
-bool me_voice(struct chanset_t *);
+/* Check if I am a chanop. Returns boolean 1 or 0.
+ */
+inline bool me_op(const struct chanset_t *chan)
+{
+ const memberlist *mx = ismember(chan, botname);
+ return mx && chan_hasop(mx);
+}
+
+bool me_voice(const struct chanset_t *);
void check_this_ban(struct chanset_t *, char *, bool);
void check_this_exempt(struct chanset_t *, char *, bool);
< at >< at > -137,7 +149,7 < at >< at > inline void check_this_mask(const char type, struct chanset_t *chan, char *mask,
}
void check_this_user(char *, int, char *);
-void raise_limit(struct chanset_t *);
+bool raise_limit(struct chanset_t *, int default_limitraise = 0);
void enforce_closed(struct chanset_t *);
void recheck_channel(struct chanset_t *, int);
void recheck_channel_modes(struct chanset_t *);
< at >< at > -145,6 +157,8 < at >< at > void irc_report(int, int);
void flush_modes();
void reset_chan_info(struct chanset_t *);
char *getnick(const char *, struct chanset_t *);
+void check_shouldjoin(struct chanset_t* chan);
+void delete_member(memberlist* m);
extern intmax_bans, max_exempts, max_invites, max_modes;
extern booluse_354, include_lk;
diff --git a/src/mod/irc.mod/mode.c b/src/mod/irc.mod/mode.c
index f78f50d..ecdf8ac 100755
--- a/src/mod/irc.mod/mode.c
+++ b/src/mod/irc.mod/mode.c
< at >< at > -31,6 +31,8 < at >< at >
/* Reversing this mode? */
static bool reversing = 0;
+static bool massop = 0;
+static bool mdop_reversing = 1;
# define PLUS BIT0
# define MINUS BIT1
< at >< at > -541,8 +543,13 < at >< at > static void
got_op(struct chanset_t *chan, memberlist *m, memberlist *mv)
{
bool check_chan = 0;
- bool me_opped = mv->is_me;
+ const bool me_opped = mv->is_me;
bool meop = me_op(chan);
+ const bool was_op = chan_hasop(mv);
+
+ // No need to punish someone who was already opped.
+ if (massop && was_op)
+ return;
/* Did *I* just get opped? */
if (!meop && me_opped) {
< at >< at > -550,7 +557,14 < at >< at > got_op(struct chanset_t *chan, memberlist *m, memberlist *mv)
meop = 1;
}
+ if (mv->user) {
get_user_flagrec(mv->user, &victim, chan->dname, chan);
+
+ // Did some other bot just get opped, and I'm not opped yet?
+ if (mv->user->bot && !me_opped && !meop) {
+ chan->channel.do_opreq = 1;
+ }
+ }
/* Flags need to be set correctly right from the beginning now, so that
* add_mode() doesn't get irritated.
*/
< at >< at > -579,12 +593,16 < at >< at > got_op(struct chanset_t *chan, memberlist *m, memberlist *mv)
size_t len = 0;
/* should kick the oppee first, then deal with the opper */
+#ifdef old
if (num == 4) {
len = simple_snprintf(outbuf, sizeof(outbuf), "MODE %s -o %s\r\n", chan->name, mv->nick);
mv->flags |= SENTDEOP;
} else if (num == 5) {
len = simple_snprintf(outbuf, sizeof(outbuf), "MODE %s -o %s\r\n", chan->name, m->nick);
m->flags |= SENTDEOP;
+#endif
+ if (num == 5) {
+ add_mode(chan, '-', 'o', m->nick);
} else if (bitch && num == 6) {
len = simple_snprintf(outbuf, sizeof(outbuf), "KICK %s %s :%s\r\n", chan->name, mv->nick, response(RES_BITCHOPPED));
mv->flags |= SENTKICK;
< at >< at > -631,12 +649,15 < at >< at > got_op(struct chanset_t *chan, memberlist *m, memberlist *mv)
static void
got_deop(struct chanset_t *chan, memberlist *m, memberlist *mv, char *isserver)
{
- char s1[UHOSTLEN] = "";
+ const bool was_op = chan_hasop(mv);
- if (m)
- simple_snprintf(s1, sizeof(s1), "%s!%s", m->nick, m->userhost);
+ if (mdop_reversing && !was_op)
+ return;
+ /* m is NULL if a server made the change */
+ if (mv->user) {
get_user_flagrec(mv->user, &victim, chan->dname, chan);
+ }
/* Flags need to be set correctly right from the beginning now, so that
* add_mode() doesn't get irritated.
< at >< at > -651,19 +672,29 < at >< at > got_deop(struct chanset_t *chan, memberlist *m, memberlist *mv, char *isserver)
/* Deop'd someone on my oplist? */
if (me_op(chan)) {
/* do we want to reop victim? */
- if ((reversing) &&
- ((m && !m->is_me && rfc_casecmp(mv->nick, m->nick)) || (!m)) &&
- !mv->is_me &&
- (chk_op(victim, chan) || !chan_bitch(chan)))
+ if (
+ /* I didn't deop them, another bot didn't deop them and they didn't deop themselves. */
+ (was_op && ((m && !m->is_me && mv != m && !(m->user && m->user->bot)) || (!m))) && (
+ /*
+ * reversing
+ * They are either an op or this chan is -bitch
+ */
+ (reversing && (!chan_bitch(chan) || chk_op(victim, chan))) ||
+ /* Reop bots to avoid them needing to ask */
+ (role == 3 && mv->user && mv->user->bot && chk_op(victim, chan))
+ )
+ ) {
/* Then we'll bless the victim */
do_op(mv->nick, chan, 0, 0);
}
+ }
if (isserver[0])/* !m */
putlog(LOG_MODES, chan->dname, "TS resync (%s): %s deopped by %s", chan->dname, mv->nick, isserver);
/* Check for mass deop */
- else if (m)
- detect_chan_flood(m->nick, m->userhost, s1, chan, FLOOD_DEOP, mv->nick);
+ else if (m) {
+ detect_chan_flood(m, m->from, chan, FLOOD_DEOP, mv->nick);
+ }
/* Having op hides your +v and +h status -- so now that someone's lost ops,
* check to see if they have +v or +h
*/
< at >< at > -685,30 +716,69 < at >< at > got_deop(struct chanset_t *chan, memberlist *m, memberlist *mv, char *isserver)
/* need: op */
if (!m)
putlog(LOG_MODES, chan->dname, "TS resync deopped me on %s :(", chan->dname);
+ } else {
+ // Revenge kick clients that deop our bots
+ if (chan->revenge && m && m != mv && mv->user && mv->user->bot && !(m->user && m->user->bot)) {
+ if (role < 5 && !chan_sentkick(m) && me_op(chan)) {
+ m->flags |= SENTKICK;
+ dprintf(DP_MODE_NEXT, "KICK %s %s :%s%s\r\n", chan->name, m->nick, kickprefix, response(RES_REVENGE));
+ } else {
+ if (m->user) {
+ char tmp[128] = "";
+ simple_snprintf(tmp, sizeof(tmp), "Deopped bot %s on %s", mv->nick, chan->dname);
+ deflag_user(m->user, DEFLAG_EVENT_REVENGE_DEOP, tmp, chan);
+ }
+ }
}
- if (m) {
- char s[UHOSTLEN] = "";
-
- simple_snprintf(s, sizeof(s), "%s!%s", mv->nick, mv->userhost);
-// maybe_revenge(chan, s1, s, REVENGE_DEOP);
}
}
static void
got_ban(struct chanset_t *chan, memberlist *m, char *mask, char *isserver)
{
- char me[UHOSTLEN] = "", meip[UHOSTLEN] = "", s[UHOSTLEN] = "";
+ const memberlist *me = ismember(chan, botname);
+ char s[UHOSTLEN] = "";
- simple_snprintf(me, sizeof(me), "%s!%s", botname, botuserhost);
- simple_snprintf(meip, sizeof(meip), "%s!%s", botname, botuserip);
simple_snprintf(s, sizeof s, "%s!%s", m ? m->nick : "", m ? m->userhost : isserver);
- if (newban(chan, mask, s))
+ if (m && newban(chan, mask, m->from))
return; /* The ban was already set, don't bother with it */
if (channel_pending(chan) || !me_op(chan))
return;
- if ((wild_match(mask, me) || match_cidr(mask, meip)) && !isexempted(chan, me)) {
+ // Make an array of all matching users
+ bd::Array<memberlist*> matchedUserMembers;
+ memberlist *matched_bot = NULL;
+
+ for (memberlist *mv = chan->channel.member; mv && mv->nick[0]; mv = mv->next) {
+ member_getuser(mv);
+ if (mv->user) {
+ if ((wild_match(mask, mv->from) || match_cidr(mask, mv->from))) {
+ if (!matched_bot && mv != m && mv->user->bot) {
+ matched_bot = mv;
+ }
+ if (mv->user && !isexempted(chan, mv->from)) {
+ matchedUserMembers << mv;
+ }
+ }
+ }
+ }
+
+ // Revenge kick clients that ban our bots
+ if (chan->revenge && m && matched_bot && !(m->user && m->user->bot)) {
+ if (role < 5 && !chan_sentkick(m)) {
+ m->flags |= SENTKICK;
+ dprintf(DP_MODE_NEXT, "KICK %s %s :%s%s\r\n", chan->name, m->nick, kickprefix, response(RES_REVENGE));
+ } else {
+ if (m->user) {
+ char tmp[128] = "";
+ simple_snprintf(tmp, sizeof(tmp), "Banned bot %s (%s) on %s", matched_bot->nick, mask, chan->dname);
+ deflag_user(m->user, DEFLAG_EVENT_REVENGE_BAN, tmp, chan);
+ }
+ }
+ }
+
+ if ((wild_match(mask, me->from) || match_cidr(mask, me->fromip)) && !isexempted(chan, me->from)) {
add_mode(chan, '-', 'b', mask);
reversing = 1;
return;
< at >< at > -720,25 +790,19 < at >< at > got_ban(struct chanset_t *chan, memberlist *m, char *mask, char *isserver)
return;
}
/* remove bans on ops unless a master/bot set it */
- char s1[UHOSTLEN] = "";
-
- for (memberlist *m2 = chan->channel.member; m2 && m2->nick[0]; m2 = m2->next) {
- simple_snprintf(s1, sizeof s1, "%s!%s", m2->nick, m2->userhost);
- if ((wild_match(mask, s1) || match_cidr(mask, s1))
- && !isexempted(chan, s1)) {
- if (m2->user || (!m2->user && (m2->user = get_user_by_host(s1)))) {
- get_user_flagrec(m2->user, &victim, chan->dname, chan);
+
+ for (size_t n = 0; n < matchedUserMembers.size(); ++n) {
+ const memberlist *mv = matchedUserMembers[n];
+ get_user_flagrec(mv->user, &victim, chan->dname, chan);
if (!(glob_kick(victim) || chan_kick(victim)) &&
(((chk_op(victim, chan) && !chan_master(user) && !glob_master(user) && !glob_bot(user)) ||
- (m2->user->bot && findbot(m2->user->handle))) && !isexempted(chan, s1))) {
+ (mv->user->bot && findbot(mv->user->handle))))) {
/* if (target_priority(chan, m, 0)) */
add_mode(chan, '-', 'b', mask);
return;
}
}
}
- }
- }
refresh_exempt(chan, mask);
/* This looks for bans added through bot and tacks on banned: if a description is found */
if (m && channel_enforcebans(chan)) {
< at >< at > -1015,7 +1079,7 < at >< at > gotmode(char *from, char *msg)
memberlist *mv = NULL;
- reversing = 0;
+ massop = reversing = 0;
irc_log(chan, "%s!%s sets mode: %s", nick, from, msg);
get_user_flagrec(u, &user, ch);
< at >< at > -1086,9 +1150,10 < at >< at > gotmode(char *from, char *msg)
} else {
if (u) {
simple_snprintf(tmp, sizeof(tmp), "Mass deop on %s by %s", chan->dname, m->nick);
- deflag_user(u, DEFLAG_MDOP, tmp, chan);
+ deflag_user(u, DEFLAG_EVENT_MDOP, tmp, chan);
}
}
+ reversing = mdop_reversing = 1;
}
if (channel_protect(chan))
do_protect(chan, "Mass Deop");
< at >< at > -1105,13 +1170,15 < at >< at > gotmode(char *from, char *msg)
} else {
if (u) {
simple_snprintf(tmp, sizeof(tmp), "Mass op on %s by %s", chan->dname, m->nick);
- deflag_user(u, DEFLAG_MOP, tmp, chan);
+ deflag_user(u, DEFLAG_EVENT_MOP, tmp, chan);
}
}
}
// Don't mass deop if protect is set, it'll happen anyway below
if (channel_bitch(chan) && !channel_protect(chan))
enforce_bitch(chan); /* deop quick! */
+ else
+ reversing = massop = 1; // Reverse via got_op
}
if (channel_protect(chan))
do_protect(chan, "Mass OP");
< at >< at > -1170,8 +1237,8 < at >< at > gotmode(char *from, char *msg)
const size_t len = simple_snprintf(tmp, sizeof(tmp), "KICK %s %s :%s%s\r\n", chan->name, m->nick, kickprefix, response(RES_BADOP));
dprintf_real(DP_MODE_NEXT, tmp, len, sizeof(tmp));
}
- simple_snprintf(tmp, sizeof(tmp), "%s!%s MODE %s %s", m->nick, m->userhost, chan->dname, modes[modecnt - 1]);
- deflag_user(u, DEFLAG_BADCOOKIE, tmp, chan);
+ simple_snprintf(tmp, sizeof(tmp), "%s MODE %s %s", m->from, chan->dname, modes[modecnt - 1]);
+ deflag_user(u, DEFLAG_EVENT_BADCOOKIE, tmp, chan);
}
/* Do the logging last as it can slow down the KICK pushing */
putlog(LOG_WARNING, "*", "%s opped in %s with bad cookie(%d): %s", m->nick, chan->dname, isbadop, msg);
< at >< at > -1209,8 +1276,8 < at >< at > gotmode(char *from, char *msg)
dprintf_real(DP_MODE_NEXT, tmp, len, sizeof(tmp));
m->flags |= SENTKICK;
}
- simple_snprintf(tmp, sizeof(tmp), "%s!%s MODE %s %s", m->nick, m->userhost, chan->dname, modes[modecnt - 1]);
- deflag_user(u, DEFLAG_MANUALOP, tmp, chan);
+ simple_snprintf(tmp, sizeof(tmp), "%s MODE %s %s", m->from, chan->dname, modes[modecnt - 1]);
+ deflag_user(u, DEFLAG_EVENT_MANUALOP, tmp, chan);
}
break;
default:
< at >< at > -1415,8 +1482,7 < at >< at > gotmode(char *from, char *msg)
if (msign == '+') {
if (mv->flags & EVOICE) {
- /* FIXME: This is a lame check, we need to expand on this more */
- if (!chan_master(user) && !glob_master(user) && !chk_voice(victim, chan)) {
+ if (!chk_op(user, chan) && !chk_voice(victim, chan)) {
dv = 1;
} else {
mv->flags &= ~EVOICE;
< at >< at > -1442,14 +1508,12 < at >< at > gotmode(char *from, char *msg)
add_mode(chan, '+', 'v', mparam);
/* if they arent +v|v and VOICER is m+ then EVOICE them */
} else {
- /* FIXME: same thing here */
- if (!match_my_nick(nick) && channel_voice(chan) && !glob_bot(user) &&
- (glob_master(user) || chan_master(user)) &&
+ if (!match_my_nick(nick) && channel_voice(chan) &&
+ (chk_op(user, chan) || glob_bot(user)) &&
rfc_casecmp(nick, mparam)) {
/* if the user is not +q set them norEVOICE. */
- if (!chan_quiet(victim) && !(mv->flags & EVOICE)) {
- putlog(LOG_DEBUG, "< at >", "Giving EVOICE flag to: %s (%s)", mv->nick, chan->dname);
- mv->flags |= EVOICE;
+ if (!chan_quiet(victim)) {
+ set_devoice(chan, mv);
}
}
}
diff --git a/src/mod/irc.mod/msgcmds.c b/src/mod/irc.mod/msgcmds.c
index 6bcf4f7..dbb7ef1 100755
--- a/src/mod/irc.mod/msgcmds.c
+++ b/src/mod/irc.mod/msgcmds.c
< at >< at > -44,7 +44,7 < at >< at > static int msg_bewm(char *nick, char *host, struct userrec *u, char *par)
if (!u) {
msg = bd::String::printf(STR("---- (%s!%s) attempted to gain secure invite, but is not a recognized user."), nick, host);
- privmsg(chan->name, msg.c_str(), DP_SERVER);
+ privmsg(chan->name, msg, DP_SERVER);
putlog(LOG_CMDS, "*", STR("(%s!%s) !*! BEWM"), nick, host);
return BIND_RET_BREAK;
< at >< at > -59,12 +59,12 < at >< at > static int msg_bewm(char *nick, char *host, struct userrec *u, char *par)
if (!chk_op(fr, chan)) {
putlog(LOG_CMDS, "*", STR("(%s!%s) !%s! !BEWM"), nick, host, u->handle);
msg = bd::String::printf(STR("---- %s (%s!%s) attempted to gain secure invite, but is missing a flag."), u->handle, nick, host);
- privmsg(chan->name, msg.c_str(), DP_SERVER);
+ privmsg(chan->name, msg, DP_SERVER);
return BIND_RET_BREAK;
}
msg = bd::String::printf("\001ACTION has invited \002%s\002 (%s!%s) to %s.\001", u->handle, nick, host, chan->dname);
- privmsg(chan->name, msg.c_str(), DP_SERVER);
+ privmsg(chan->name, msg, DP_SERVER);
cache_invite(chan, nick, host, u->handle, 0, 0);
putlog(LOG_CMDS, "*", STR("(%s!%s) !%s! BEWM"), nick, host, u->handle);
< at >< at > -116,7 +116,7 < at >< at > static int msg_pass(char *nick, char *host, struct userrec *u, char *par)
set_user(&USERENTRY_PASS, u, mynew);
bd::String msg;
msg = bd::String::printf("%s '%s'.", mynew == old ? "Password set to:" : "Password changed to:", mynew);
- notice(nick, msg.c_str(), DP_HELP);
+ notice(nick, msg, DP_HELP);
return BIND_RET_BREAK;
}
< at >< at > -143,7 +143,7 < at >< at > static int msg_op(char *nick, char *host, struct userrec *u, char *par)
msg = bd::String::printf("---- (%s!%s) attempted to OP for %s but is not currently in %s.", nick, host, par, homechan);
else
msg = bd::String::printf("---- (%s!%s) attempted to OP but is not currently in %s.", nick, host, homechan);
- privmsg(homechan, msg.c_str(), DP_SERVER);
+ privmsg(homechan, msg, DP_SERVER);
return BIND_RET_BREAK;
}
}
< at >< at > -160,7 +160,7 < at >< at > static int msg_op(char *nick, char *host, struct userrec *u, char *par)
putlog(LOG_CMDS, "*", "(%s!%s) !%s! OP %s", nick, host, u->handle, par);
if (manop_warn && chan->manop) {
msg = bd::String::printf("%s is currently set to punish for manual op.", chan->dname);
- notice(nick, msg.c_str(), DP_HELP);
+ notice(nick, msg, DP_HELP);
}
}
}
< at >< at > -175,7 +175,7 < at >< at > static int msg_op(char *nick, char *host, struct userrec *u, char *par)
stats++;
if (manop_warn && chan->manop) {
msg = bd::String::printf("%s is currently set to punish for manual op.", chan->dname);
- notice(nick, msg.c_str(), DP_HELP);
+ notice(nick, msg, DP_HELP);
}
}
}
< at >< at > -219,14 +219,14 < at >< at > static int msg_ident(char *nick, char *host, struct userrec *u, char *par)
return BIND_RET_BREAK;
} else if (u) {
msg = bd::String::printf("You're not %s, you're %s.", who, u->handle);
- notice(nick, msg.c_str(), DP_HELP);
+ notice(nick, msg, DP_HELP);
return BIND_RET_BREAK;
} else {
putlog(LOG_CMDS, "*", "(%s!%s) !*! IDENT %s", nick, host, who);
simple_snprintf(s, sizeof s, "%s!%s", nick, host);
maskaddr(s, s1, 0); /* *!user< at >host */
msg = bd::String::printf("Added hostmask: %s", s1);
- notice(nick, msg.c_str(), DP_HELP);
+ notice(nick, msg, DP_HELP);
addhost_by_handle(who, s1);
check_this_user(who, 0, NULL);
return BIND_RET_BREAK;
< at >< at > -260,12 +260,12 < at >< at > static int msg_invite(char *nick, char *host, struct userrec *u, char *par)
bd::String msg;
if (!(chan = findchan_by_dname(par))) {
msg = bd::String::printf("Usage: /MSG %s %s <pass> <channel>", botname, msginvite);
- notice(nick, msg.c_str(), DP_HELP);
+ notice(nick, msg, DP_HELP);
return BIND_RET_BREAK;
}
if (!channel_active(chan)) {
msg = bd::String::printf("%s: Not on that channel right now.", par);
- notice(nick, msg.c_str(), DP_HELP);
+ notice(nick, msg, DP_HELP);
return BIND_RET_BREAK;
}
/* We need to check access here also (dw 991002) */
< at >< at > -319,7 +319,7 < at >< at > static int msg_authstart(char *nick, char *host, struct userrec *u, char *par)
auth->Status(AUTH_PASS);
bd::String msg;
msg = bd::String::printf(STR("auth%s %s"), u ? "." : "!", conf.bot->nick);
- privmsg(nick, msg.c_str(), DP_HELP);
+ privmsg(nick, msg, DP_HELP);
return BIND_RET_BREAK;
}
< at >< at > -331,7 +331,7 < at >< at > AuthFinish(Auth *auth)
auth->Done();
bd::String msg;
msg = bd::String::printf(STR("You are now authorized for cmds, see %chelp"), auth_prefix[0]);
- notice(auth->nick, msg.c_str(), DP_HELP);
+ notice(auth->nick, msg, DP_HELP);
}
static int msg_auth(char *nick, char *host, struct userrec *u, char *par)
< at >< at > -358,7 +358,7 < at >< at > static int msg_auth(char *nick, char *host, struct userrec *u, char *par)
auth->MakeHash();
bd::String msg;
msg = bd::String::printf(STR("-Auth %s %s"), auth->rand, conf.bot->nick);
- privmsg(nick, msg.c_str(), DP_HELP);
+ privmsg(nick, msg, DP_HELP);
} else {
/* no auth_key and/or no SECPASS for the user, don't require a hash auth */
AuthFinish(auth);
diff --git a/src/mod/mod.mk.in b/src/mod/mod.mk.in
new file mode 100644
index 0000000..f97b9f2
--- /dev/null
+++ b/src/mod/mod.mk.in
< at >< at > -0,0 +1,14 < at >< at >
+depcomp = /bin/sh $(top_srcdir)/build/autotools/depcomp
+
+../%.o: %.c $(top_srcdir)/src/stringfix $(top_srcdir)/build/cc1plus
+< at >echo -e "Compiling: \033[1m$*\033[0m"
+ifeq ($(CCDEPMODE),gcc3)
+if STRINGFIX='$(top_srcdir)/$(STRINGFIX)' $(CXX) -MT '$< at >' -MD -MP -MF '.deps/$*.TPo' -DSTRINGFIX=$(STRINGFIX) -B$(top_srcdir)/build $(CXXFLAGS) $(CPPFLAGS) -c $< -o $< at >; then \
+mv '.deps/$*.TPo' '.deps/$*.Po'; \
+else rm -f '.deps/$*.Tpo'; exit 1; \
+fi
+else
+# STRINGFIX included after CXX for ccache to recognize
+STRINGFIX="$(top_srcdir)/$(STRINGFIX)" libtool=no source='$<' object='$< at >' depfile='.deps/$*.Po' tmpdepfile='.deps/$*.TPo' depmode=$(CCDEPMODE) $(depcomp) \
+$(CXX) -DSTRINGFIX=$(STRINGFIX) -B$(top_srcdir)/build $(CXXFLAGS) $(CPPFLAGS) -c $< -o $< at >
+endif
diff --git a/src/mod/server.mod/Makefile b/src/mod/server.mod/Makefile
index eaa0e30..19b647b 100755
--- a/src/mod/server.mod/Makefile
+++ b/src/mod/server.mod/Makefile
< at >< at > -1,12 +1,13 < at >< at >
# Makefile for src/mod/server.mod/
srcdir = .
-depcomp = /bin/sh ../../../autotools/depcomp
+depcomp = /bin/sh ../../../build/autotools/depcomp
#This line is simply for configure to generate .deps/
OBJS = server.o
include ./.deps/includes
+include ../mod.mk
doofus:
< at >echo ""
< at >< at > -16,13 +17,6 < at >< at > doofus:
static: ../server.o
-../server.o:
-< at >echo -e "Compiling: \033[1mserver\033[0m"
-source='server.c' object='$< at >' depfile='.deps/server.Po' tmpdepfile='.deps/server.TPo' depmode=$(CCDEPMODE) $(depcomp) \
-$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(srcdir)/server.c
-< at >rm -f ../server.o
-< at >mv server.o ../
-
clean:
< at >rm -f .depend *.o *~
diff --git a/src/mod/server.mod/cmdsserv.c b/src/mod/server.mod/cmdsserv.c
index 7567579..c8d2e00 100755
--- a/src/mod/server.mod/cmdsserv.c
+++ b/src/mod/server.mod/cmdsserv.c
< at >< at > -39,7 +39,7 < at >< at > static void cmd_servers(int idx, char *par)
i = 0;
for (; x; x = x->next) {
simple_snprintf(s, sizeof s, " %s:%d %s", x->name,
- x->port ? x->port : default_port,
+ x->port ? x->port : (ssl_use ? default_port_ssl : default_port),
(i == curserv) ? "<- I am here" : "");
dprintf(idx, "%s\n", s);
i++;
< at >< at > -93,7 +93,7 < at >< at > static void cmd_jump(int idx, char *par)
port = atoi(p);
}
if (!port)
- port = default_port;
+ port = (ssl_use ? default_port_ssl : default_port);
putlog(LOG_CMDS, "*", "#%s# jump %s %d %s", dcc[idx].nick, other, port, par);
strlcpy(newserver, other, sizeof newserver);
newserverport = port;
< at >< at > -105,6 +105,63 < at >< at > static void cmd_jump(int idx, char *par)
cycle_time = 0;
}
+static void cmd_keyx(int idx, char *par) {
+ putlog(LOG_CMDS, "*", "#%s# keyx %s", dcc[idx].nick, par);
+
+ if (!par[0]) {
+ dprintf(idx, "Usage: keyx <nick>\n");
+ return;
+ }
+
+ if (strchr(CHANMETA, par[0])) {
+ dprintf(idx, "Error: Cannot key-exchange with a channel.\n");
+ return;
+ }
+
+ if (!server_online) {
+ dprintf(idx, "Error: Not online.\n");
+ return;
+ }
+
+ char *nick = newsplit(&par);
+ keyx(nick);
+ return;
+}
+
+static void cmd_setkey(int idx, char *par) {
+ putlog(LOG_CMDS, "*", "#%s# setkey %s", dcc[idx].nick, par);
+
+ const bool target_is_chan = par[0] && strchr(CHANMETA, par[0]);
+
+ if (!par[0] || target_is_chan) {
+ dprintf(idx, "Usage: setkey <nick> [key|rand]\n");
+ if (target_is_chan) {
+ dprintf(idx, "Use 'chanset fish-key' to set a key for a channel.\n");
+ }
+ return;
+ }
+
+ char *target = newsplit(&par);
+ char *newkey = newsplit(&par);
+ bool have_key = FishKeys.contains(target);
+
+ if (!newkey[0]) {
+ // Clear the key
+ if (have_key) {
+ set_fish_key(target, "");
+ dprintf(idx, "Key cleared for '%s'\n", target);
+ } else {
+ dprintf(idx, "No key found for '%s'\n", target);
+ }
+ } else {
+ // Set a new key
+ set_fish_key(target, newkey);
+ fish_data_t* fishData = FishKeys[target];
+ dprintf(idx, "Set key for '%s' to: %s", target, fishData->sharedKey.c_str());
+ }
+ return;
+}
+
static void cmd_clearqueue(int idx, char *par)
{
int msgs;
< at >< at > -167,7 +224,9 < at >< at > static cmd_t C_dcc_serv[] =
{"clearqueue","m",(Function) cmd_clearqueue,NULL, LEAF|AUTH},
{"dump","a",(Function) cmd_dump,NULL, LEAF},
{"jump","m",(Function) cmd_jump,NULL, LEAF},
+ {"keyx","o",(Function) cmd_keyx,NULL, LEAF},
{"servers","m",(Function) cmd_servers,NULL, LEAF},
+ {"setkey","m",(Function) cmd_setkey,NULL, LEAF},
{"umode","m",(Function) cmd_umode,NULL, LEAF},
{NULL,NULL,NULL,NULL, 0}
};
diff --git a/src/mod/server.mod/server.c b/src/mod/server.mod/server.c
index 95df645..6ef015f 100755
--- a/src/mod/server.mod/server.c
+++ b/src/mod/server.mod/server.c
< at >< at > -58,12 +58,12 < at >< at > int ctcp_mode;
int serv = -1;/* sock # of server currently */
int servidx = -1;/* idx of server */
char newserver[121] = "";/* new server? */
-port_t newserverport = 0;/* new server port? */
+in_port_t newserverport = 0;/* new server port? */
char newserverpass[121] = "";/* new server password? */
static char serverpass[121] = "";
static time_t trying_server;/* trying to connect to a server right now? */
int curserv = 999;/* current position in server list: */
-port_t curservport = 0;
+in_port_t curservport = 0;
rate_t flood_msg = { 5, 60 };
rate_t flood_ctcp = { 3, 60 };
char botuserhost[UHOSTLEN] = "";/* bot's user< at >host (refreshed whenever the bot joins a channel) */
< at >< at > -86,7 +86,8 < at >< at > static const interval_t stoned_timeout = 500;
struct server_list *serverlist = NULL;/* old-style queue, still used by
server list */
interval_t cycle_time;/* cycle time till next server connect */
-port_t default_port = 6667;/* default IRC port */
+in_port_t default_port = 6667;/* default IRC port */
+in_port_t default_port_ssl = 6697;/* default IRC SSL port */
bool trigger_on_ignore;/* trigger bindings if user is ignored ? */
int answer_ctcp = 1;/* answer how many stacked ctcp's ? */
static bool resolvserv;/* in the process of resolving a server host */
< at >< at > -111,6 +112,8 < at >< at > bool in_callerid = 0;
bool have_cprivmsg = 0;
bool have_cnotice = 0;
+bd::HashTable<bd::String, fish_data_t*> FishKeys;
+
static bool double_warned = 0;
static void empty_msgq(void);
< at >< at > -800,7 +803,7 < at >< at > void clearq(struct server_list *xx)
*
* -> if (*ptr == -1) then jump to that particular server
*/
-void next_server(int *ptr, char *servname, port_t *port, char *pass)
+void next_server(int *ptr, char *servname, in_port_t *port, char *pass)
{
struct server_list *x = serverlist;
< at >< at > -825,7 +828,7 < at >< at > void next_server(int *ptr, char *servname, port_t *port, char *pass)
x->next = 0;
x->name = strdup(servname);
- x->port = *port ? *port : default_port;
+ x->port = *port ? *port : (ssl_use ? default_port_ssl : default_port);
if (pass && pass[0]) {
x->pass = strdup(pass);
} else
< at >< at > -849,7 +852,7 < at >< at > void next_server(int *ptr, char *servname, port_t *port, char *pass)
*ptr = 0;
}/* Start over at the beginning */
strcpy(servname, x->name);
- *port = x->port ? x->port : default_port;
+ *port = x->port ? x->port : (ssl_use ? default_port_ssl : default_port);
if (x->pass)
strcpy(pass, x->pass);
else
< at >< at > -1027,14 +1030,13 < at >< at > static void server_secondly()
nick_available(1, 0);
}
- if (!loading) {
static int cnt_10 = 0;
// Every 10 seconds
if (cnt_10 == 9) {
- // Ensure that +D/+f are not conflicting
- if (deaf_char) {
+ // Ensure that +D/+f are not conflicting
+ if (!loading && deaf_char) {
// +f or auth bots in used need to see channel chatter.
bool need_chatter = doflood(NULL) || (Auth::ht_host.size() && auth_chan && strlen(auth_prefix));
< at >< at > -1049,10 +1051,32 < at >< at > static void server_secondly()
}
}
+ // Clear expired key exchanges that aren't finished (7 seconds)
+ const bd::Array<bd::String> fish_targets(FishKeys.keys());
+ for (size_t i = 0; i < fish_targets.length(); ++i) {
+ const bd::String target(fish_targets[i]);
+ fish_data_t* fishData = FishKeys[target];
+ bool should_delete = false;
+ if (fishData->key_created_at && !fishData->sharedKey && ((now - 7) >= fishData->key_created_at)) {
+ putlog(LOG_DEBUG, "*", "Deleting expired DH1080 FiSH exchange with %s", target.c_str());
+ should_delete = true;
+ } else if (fishData->key_created_at && fishData->sharedKey.length() && ((now - 3600) >= fishData->key_created_at)) {
+ putlog(LOG_DEBUG, "*", "Deleting expired (60 min) FiSH key with %s", target.c_str());
+ should_delete = true;
+ }
+
+ if (should_delete) {
+ FishKeys.remove(target);
+ delete fishData;
+ }
+ }
+
+
cnt_10 = 0;
- } else
+ } else {
++cnt_10;
}
+
if (connect_bursting && (now - SERVER_CONNECT_BURST_TIME) >= connect_bursting) {
end_burstmode();
putlog(LOG_DEBUG, "*", "Ending server burst mode");
diff --git a/src/mod/server.mod/server.h b/src/mod/server.mod/server.h
index 9181ffe..9bb669a 100755
--- a/src/mod/server.mod/server.h
+++ b/src/mod/server.mod/server.h
< at >< at > -9,6 +9,8 < at >< at >
#include "src/binds.h"
#include "src/dcc.h"
#include "src/set.h"
+#include <bdlib/src/String.h>
+#include <bdlib/src/HashTable.h>
#define DO_LOST 1
#define NO_LOST 0
< at >< at > -33,7 +35,7 < at >< at > struct server_list {
struct server_list*next;
char*name;
char*pass;
- port_t port;
+ in_port_t port;
};
/* Available net types. */
< at >< at > -45,12 +47,19 < at >< at > enum {
NETT_HYBRID_EFNET= 4/* new +e/+I Efnet hybrid. */
};
+typedef struct {
+ bd::String sharedKey;
+ bd::String myPrivateKey;
+ bd::String myPublicKeyB64;
+ time_t key_created_at;
+} fish_data_t;
+
extern bind_table_t*BT_ctcp, *BT_ctcr;
extern size_tnick_len;
extern booltrigger_on_ignore, floodless, keepnick, in_deaf, in_callerid, have_cprivmsg, have_cnotice;
extern int servidx, ctcp_mode, answer_ctcp, serv, curserv, default_alines, flood_count, burst;
extern unsigned int rolls;
-extern port_tdefault_port, newserverport, curservport;
+extern in_port_tdefault_port, default_port_ssl, newserverport, curservport;
extern time_tserver_online, tried_jupenick, tried_nick, release_time, connect_bursting;
extern interval_tcycle_time;
extern charcursrvname[], botrealname[121], botuserhost[], ctcp_reply[1024],
< at >< at > -58,6 +67,7 < at >< at > extern charcursrvname[], botrealname[121], botuserhost[], ctcp_reply[1024],
extern struct server_list *serverlist;
extern struct dcc_table SERVER_SOCKET;
extern rate_tflood_msg, flood_ctcp, flood_callerid;
+extern bd::HashTable<bd::String, fish_data_t*> FishKeys;
int check_bind_ctcpr(char *, char *, struct userrec *, char *, char *, char *, bind_table_t *);
void nicks_available(char* buf, char delim = 0, bool buf_contains_available = 1);
< at >< at > -80,7 +90,7 < at >< at > void rehash_monitor_list();
void replay_cache(int, bd::Stream*);
void join_chans();
void check_hostmask();
-void next_server(int *, char *, port_t *, char *);
+void next_server(int *, char *, in_port_t *, char *);
void server_send_ison();
void reset_flood();
diff --git a/src/mod/server.mod/servmsg.c b/src/mod/server.mod/servmsg.c
index a3ba66c..7542ebb 100755
--- a/src/mod/server.mod/servmsg.c
+++ b/src/mod/server.mod/servmsg.c
< at >< at > -155,6 +155,63 < at >< at > static int check_bind_raw(char *from, char *code, char *msg)
int ret = 0;
myfrom = p1 = strdup(from);
+
+ // Decrypt FiSH before processing
+ if (!strcmp(code, "PRIVMSG") || !strcmp(code, "NOTICE")) {
+ char* colon = strchr(msg, ':'), *first_word = strchr(msg, ' ');
+ bd::String target(msg, first_word - msg);
+
+ ++colon;
+ if (colon) {
+ if (!strncmp(colon, "+OK ", 4)) {
+ char *p = strchr(from, '!');
+ const bool target_is_chan = strchr(CHANMETA, target[0]);
+ bd::String ciphertext(colon), sharedKey, nick(from, p - from), key_target;
+
+ // If this is a channel msg, decrypt with the channel key
+ if (target_is_chan) {
+ key_target = target;
+ } else {
+ // Otherwise decrypt with the nick's key
+ key_target = nick;
+ }
+
+ const bool have_shared_key = FishKeys.contains(key_target);
+
+ if (have_shared_key) {
+ sharedKey = FishKeys[key_target]->sharedKey;
+ } else {
+ struct userrec *u = get_user_by_host(from);
+ if (u) {
+ sharedKey = static_cast<char*>(get_user(&USERENTRY_SECPASS, u));
+ }
+ }
+
+ if (sharedKey.length()) {
+ // Decrypt the message before passing along to the binds
+ const bd::String decrypted(egg_bf_decrypt(ciphertext, sharedKey));
+ // Does the decrypted text make sense? If not, the key is probably invalid, reset it.
+ bool isValidCipherText = true;
+ for (size_t i = 0; i < decrypted.length(); ++i) {
+ if (!isprint(decrypted[i])) {
+ isValidCipherText = false;
+ break;
+ }
+ }
+ if (isValidCipherText) {
+ bd::String cleartext(bd::String(msg, colon - msg) + decrypted);
+ mymsg = p2 = strdup(cleartext.c_str());
+ } else if (!target_is_chan && have_shared_key) {
+ // Delete the shared key
+ fish_data_t* fishData = FishKeys[key_target];
+ FishKeys.remove(key_target);
+ delete fishData;
+ }
+ }
+ }
+ }
+ }
+ if (!p2)
mymsg = p2 = strdup(msg);
ret = check_bind(BT_raw, code, NULL, myfrom, mymsg);
< at >< at > -734,12 +791,62 < at >< at > static int gotmsg(char *from, char *msg)
}
if (doit)
check_bind_msg(my_code, nick, uhost, my_u, msg);
+
+ if (my_u && FishKeys.contains(nick)) {
+ // FiSH paranoid mode. Invalidate the current key and re-key-exchange with the user.
+ if (fish_paranoid) {
+ keyx(nick);
+ }
+ }
}
}
}
return 0;
}
+// Adapated from ZNC
+void handle_DH1080_init(const char* nick, const char* uhost, const char* from, struct userrec* u, const bd::String theirPublicKeyB64) {
+ bd::String myPublicKeyB64, myPrivateKey, sharedKey;
+
+ DH1080_gen(myPrivateKey, myPublicKeyB64);
+ if (!DH1080_comp(myPrivateKey, theirPublicKeyB64, sharedKey)) {
+ sdprintf("Error computing DH1080 for %s: %s", nick, sharedKey.c_str());
+ return;
+ }
+
+ putlog(LOG_MSGS, "*", "[FiSH] Received DH1080 public key from (%s!%s) - sending mine", nick, uhost);
+ fish_data_t* fishData = FishKeys.contains(nick) ? FishKeys[nick] : new fish_data_t;
+ fishData->sharedKey.clear();
+ notice(nick, "DH1080_FINISH " + myPublicKeyB64, DP_HELP);
+ fishData->myPublicKeyB64 = myPublicKeyB64;
+ fishData->myPrivateKey = myPrivateKey;
+ fishData->sharedKey = sharedKey;
+ fishData->key_created_at = now;
+ FishKeys[nick] = fishData;
+ sdprintf("Set key for %s: %s", nick, sharedKey.c_str());
+ return;
+}
+
+void handle_DH1080_finish(const char* nick, const char* uhost, const char* from, struct userrec* u, const bd::String theirPublicKeyB64) {
+ if (!FishKeys.contains(nick)) {
+ putlog(LOG_MSGS, "*", "[FiSH] Unexpected DH1080_FINISH from (%s!%s) - ignoring", nick, uhost);
+ return;
+ }
+
+ fish_data_t* fishData = FishKeys[nick];
+ bd::String sharedKey;
+
+ if (!DH1080_comp(fishData->myPrivateKey, theirPublicKeyB64, sharedKey)) {
+ sdprintf("Error computing DH1080 for %s: %s", nick, sharedKey.c_str());
+ return;
+ }
+
+ putlog(LOG_MSGS, "*", "[FiSH] Key successfully set for (%s!%s)", nick, uhost);
+ fishData->sharedKey = sharedKey;
+ sdprintf("Set key for %s: %s", nick, sharedKey.c_str());
+ return;
+}
+
/* Got a private notice.
*/
static int gotnotice(char *from, char *msg)
< at >< at > -818,10 +925,22 < at >< at > static int gotnotice(char *from, char *msg)
} else if (!ignoring) {
detect_flood(nick, uhost, from, FLOOD_NOTICE);
u = get_user_by_host(from);
+
+ bd::String smsg(msg);
+ bd::String which = newsplit(smsg);
+
+ if (which == "DH1080_INIT") {
+ bd::String theirPublicKeyB64(newsplit(smsg));
+ handle_DH1080_init(nick, uhost, from, u, theirPublicKeyB64);
+ } else if (which == "DH1080_FINISH") {
+ bd::String theirPublicKeyB64(newsplit(smsg));
+ handle_DH1080_finish(nick, uhost, from, u, theirPublicKeyB64);
+ } else {
putlog(LOG_MSGS, "*", "-%s (%s)- %s", nick, uhost, msg);
}
}
}
+ }
return 0;
}
< at >< at > -1376,7 +1495,11 < at >< at > static void server_activity(int idx, char *msg, int len)
if (unlikely(trying_server)) {
strlcpy(dcc[idx].nick, "(server)", sizeof(dcc[idx].nick));
+ if (ssl_use) {
+ putlog(LOG_SERV, "*", "Connected to %s with SSL", dcc[idx].host);
+ } else {
putlog(LOG_SERV, "*", "Connected to %s", dcc[idx].host);
+ }
trying_server = 0;
/*
< at >< at > -1829,6 +1952,9 < at >< at > static int got718(char *from, char *msg)
putlog(LOG_WALL, "*", "(CALLERID) !%s! (%s!%s) %s (Accepting user)", u->handle, nick, uhost, msg);
dprintf(DP_HELP, "ACCEPT %s\n", nick);
dprintf(DP_HELP, "PRIVMSG %s :You have been accepted. Please send your message again.\n", nick);
+ if (fish_auto_keyx) {
+ keyx(nick);
+ }
} else {
putlog(LOG_WALL, "*", "(CALLERID) !%s! (%s!%s) %s (User is not +o or +v)", u->handle, nick, uhost, msg);
}
< at >< at > -1893,7 +2019,7 < at >< at > static void connect_server(void)
{
char pass[121] = "", botserver[UHOSTLEN] = "";
int newidx;
- port_t botserverport = 0;
+ in_port_t botserverport = 0;
waiting_for_awake = 0;
/* trying_server = now; */
< at >< at > -1924,7 +2050,12 < at >< at > static void connect_server(void)
}
next_server(&curserv, botserver, &botserverport, pass);
+
+ if (ssl_use) {
+ putlog(LOG_SERV, "*", "Trying SSL server %s:%d", botserver, botserverport);
+ } else {
putlog(LOG_SERV, "*", "Trying server %s:%d", botserver, botserverport);
+ }
dcc[newidx].port = botserverport;
strlcpy(dcc[newidx].nick, "(server)", sizeof(dcc[newidx].nick));
< at >< at > -2027,6 +2158,16 < at >< at > static void server_dns_callback(int id, void *client_data, const char *host, bd:
servidx = idx;
sdprintf("Connecting to '%s' (serv: %d, servidx: %d)", dcc[idx].host, serv, servidx);
setsockopt(serv, 6, TCP_NODELAY, &i, sizeof(int));
+#ifdef EGG_SSL_EXT
+ if (ssl_use) { /* kyotou */
+ if (net_switch_to_ssl(serv) == 0) {
+ putlog(LOG_SERV, "*", "SSL Failed to connect to %s (Error while switching to SSL)", dcc[servidx].host);
+ trying_server = 0;
+ lostdcc(servidx);
+ return;
+ }
+ }
+#endif
/* Queue standard login */
dcc[idx].timeval = now;
SERVER_SOCKET.timeout_val = &server_timeout;
diff --git a/src/mod/share.mod/Makefile b/src/mod/share.mod/Makefile
index 1def196..0e8837b 100755
--- a/src/mod/share.mod/Makefile
+++ b/src/mod/share.mod/Makefile
< at >< at > -1,12 +1,13 < at >< at >
# Makefile for src/mod/share.mod/
srcdir = .
-depcomp = /bin/sh ../../../autotools/depcomp
+depcomp = /bin/sh ../../../build/autotools/depcomp
#This line is simply for configure to generate .deps/
OBJS = share.o
include ./.deps/includes
+include ../mod.mk
doofus:
< at >echo ""
< at >< at > -16,13 +17,6 < at >< at > doofus:
static: ../share.o
-../share.o:
-< at >echo -e "Compiling: \033[1mshare\033[0m"
-source='share.c' object='$< at >' depfile='.deps/share.Po' tmpdepfile='.deps/share.TPo' depmode=$(CCDEPMODE) $(depcomp) \
-$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(srcdir)/share.c
-< at >rm -f ../share.o
-< at >mv share.o ../
-
clean:
< at >rm -f .depend *.o *~
diff --git a/src/mod/share.mod/share.c b/src/mod/share.mod/share.c
index fca9ed9..17681f3 100755
--- a/src/mod/share.mod/share.c
+++ b/src/mod/share.mod/share.c
< at >< at > -533,6 +533,7 < at >< at > share_newuser(int idx, char *par)
noshare = 0;
if (conf.bot->hub)
putlog(LOG_CMDS, "< at >", "%s: newuser %s %s", dcc[idx].nick, nick, s);
+ write_userfile(-1);
}
}
}
< at >< at > -551,6 +552,7 < at >< at > share_killuser(int idx, char *par)
shareout_but(idx, "k %s\n", par);
if (conf.bot->hub)
putlog(LOG_CMDS, "< at >", "%s: killuser %s", dcc[idx].nick, par);
+ write_userfile(-1);
}
noshare = 0;
}
< at >< at > -670,6 +672,10 < at >< at > share_change(int idx, char *par)
}
noshare = 0;
}
+
+ if (uet == &USERENTRY_BOTADDR) {
+ write_userfile(-1);
+ }
}
}
< at >< at > -1444,6 +1450,8 < at >< at > static void share_read_stream(int idx, bd::Stream& stream) {
Auth::FillUsers();
}
+ write_userfile(-1);
+
cmdpass_free(old_cmdpass);
checkchans(1); /* remove marked channels */
diff --git a/src/mod/transfer.mod/Makefile b/src/mod/transfer.mod/Makefile
index 92c808c..e19dc4a 100755
--- a/src/mod/transfer.mod/Makefile
+++ b/src/mod/transfer.mod/Makefile
< at >< at > -1,12 +1,13 < at >< at >
# Makefile for src/mod/transfer.mod/
srcdir = .
-depcomp = /bin/sh ../../../autotools/depcomp
+depcomp = /bin/sh ../../../build/autotools/depcomp
#This line is simply for configure to generate .deps/
OBJS = transfer.o
include ./.deps/includes
+include ../mod.mk
doofus:
< at >echo ""
< at >< at > -16,13 +17,6 < at >< at > doofus:
static: ../transfer.o
-../transfer.o:
-< at >echo -e "Compiling: \033[1mtransfer\033[0m"
-source='transfer.c' object='$< at >' depfile='.deps/transfer.Po' tmpdepfile='.deps/transfer.TPo' depmode=$(CCDEPMODE) $(depcomp) \
-$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(srcdir)/transfer.c
-< at >rm -f ../transfer.o
-< at >mv transfer.o ../
-
clean:
< at >rm -f .depend *.o *~
diff --git a/src/mod/transfer.mod/transfer.c b/src/mod/transfer.mod/transfer.c
index 5937147..a1f9216 100755
--- a/src/mod/transfer.mod/transfer.c
+++ b/src/mod/transfer.mod/transfer.c
< at >< at > -226,13 +226,13 < at >< at > static void eof_dcc_send(int idx)
/* Determine byte order. Used for resend DCC startup packets.
*/
-static inline u_8bit_t byte_order_test(void)
+static inline uint8_t byte_order_test(void)
{
- u_16bit_t test = TRANSFER_REGET_PACKETID;
+ uint16_t test = TRANSFER_REGET_PACKETID;
- if (*((u_8bit_t *)&test) == ((TRANSFER_REGET_PACKETID & 0xff00) >> 8))
+ if (*((uint8_t *)&test) == ((TRANSFER_REGET_PACKETID & 0xff00) >> 8))
return 0;
- if (*((u_8bit_t *)&test) == (TRANSFER_REGET_PACKETID & 0x00ff))
+ if (*((uint8_t *)&test) == (TRANSFER_REGET_PACKETID & 0x00ff))
return 1;
return 0;
}
< at >< at > -737,7 +737,7 < at >< at > struct dcc_table DCC_GET_PENDING =
static void dcc_get_pending(int idx, char *buf, int len)
{
in_addr_t ip;
- port_t port;
+ in_port_t port;
int i;
char s[UHOSTLEN] = "";
< at >< at > -749,7 +749,7 < at >< at > static void dcc_get_pending(int idx, char *buf, int len)
if (dcc[idx].sock == -1) {
bd::String msg;
msg = bd::String::printf("Bad connection (%s)", strerror(errno));
- notice(dcc[idx].nick, msg.c_str(), DP_HELP);
+ notice(dcc[idx].nick, msg, DP_HELP);
putlog(LOG_FILES, "*", "DCC bad connection: GET %s (%s!%s)",
dcc[idx].u.xfer->origname, dcc[idx].nick, dcc[idx].host);
fclose(dcc[idx].u.xfer->f);
< at >< at > -813,7 +813,7 < at >< at > static int raw_dcc_resend_send(char *filename, char *nick, char *from, int resen
{
int zz = -1;
int i;
- port_t port;
+ in_port_t port;
char *buf = NULL;
long dccfilesize;
FILE *f = NULL, *dccfile = NULL;
diff --git a/src/mod/transfer.mod/transfer.h b/src/mod/transfer.mod/transfer.h
index 6c5d342..9998aa4 100755
--- a/src/mod/transfer.mod/transfer.h
+++ b/src/mod/transfer.mod/transfer.h
< at >< at > -36,11 +36,11 < at >< at > int raw_dcc_send(char *, char *, char *, int *);
#define TRANSFER_REGET_PACKETID 0xfeab
typedef struct {
- u_32bit_t byte_offset;/* Number of bytes to skip relative to
+ uint32_t byte_offset;/* Number of bytes to skip relative to
the file beginning*/
- u_16bit_t packet_id;/* Identification ID, should be equal
+ uint16_t packet_id;/* Identification ID, should be equal
to TRANSFER_REGET_PACKETID*/
- u_8bit_t byte_order;/* Byte ordering, see byte_order_test()*/
+ uint8_t byte_order;/* Byte ordering, see byte_order_test()*/
} transfer_reget;
#endif/* MAKING_TRANSFER */
diff --git a/src/mod/update.mod/Makefile b/src/mod/update.mod/Makefile
index 72478bc..c63b2ad 100755
--- a/src/mod/update.mod/Makefile
+++ b/src/mod/update.mod/Makefile
< at >< at > -1,12 +1,13 < at >< at >
# Makefile for src/mod/update.mod/
srcdir = .
-depcomp = /bin/sh ../../../autotools/depcomp
+depcomp = /bin/sh ../../../build/autotools/depcomp
#This line is simply for configure to generate .deps/
OBJS = update.o
include ./.deps/includes
+include ../mod.mk
doofus:
< at >echo ""
< at >< at > -16,13 +17,6 < at >< at > doofus:
static: ../update.o
-../update.o:
-< at >echo -e "Compiling: \033[1mupdate\033[0m"
-source='update.c' object='$< at >' depfile='.deps/update.Po' tmpdepfile='.deps/update.TPo' depmode=$(CCDEPMODE) $(depcomp) \
-$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(srcdir)/update.c
-< at >rm -f ../update.o
-< at >mv update.o ../
-
clean:
< at >rm -f .depend *.o *~
diff --git a/src/net.c b/src/net.c
index d79880d..18b0213 100755
--- a/src/net.c
+++ b/src/net.c
< at >< at > -77,13 +77,12 < at >< at > jmp_bufalarmret;/* Env buffer for alarm() returns */
/* This *MUST* be an ip */
char firewall[121] = ""; /* Socks server for firewall */
-port_t firewallport = 1080; /* Default port of Sock4/5 firewalls */
+in_port_t firewallport = 1080; /* Default port of Sock4/5 firewalls */
/* Types of proxy */
#define PROXY_SOCKS 1
#define PROXY_SUN 2
#define PROXY_HTTP 3
-
/* I need an UNSIGNED long for dcc type stuff
*/
unsigned long my_atoul(const char *s)
< at >< at > -153,6 +152,9 < at >< at > void init_net()
for (int i = 0; i < MAXSOCKS; i++) {
bzero(&socklist[i], sizeof(socklist[i]));
socklist[i].flags = SOCK_UNUSED;
+#ifdef EGG_SSL_EXT
+ socklist[i].ssl = NULL;
+#endif
socklist[i].sock = -1;
}
}
< at >< at > -407,6 +409,13 < at >< at > void real_killsock(register int sock, const char *file, int line)
int i = -1;
if ((i = findanysnum(sock)) != -1) {
+#ifdef EGG_SSL_EXT
+ if (socklist[i].ssl) {
+ SSL_shutdown(socklist[i].ssl);
+ SSL_free(socklist[i].ssl);
+ socklist[i].ssl = NULL;
+ }
+#endif
close(socklist[i].sock);
if (socklist[i].inbuf != NULL) {
delete socklist[i].inbuf;
< at >< at > -429,7 +438,7 < at >< at > void real_killsock(register int sock, const char *file, int line)
/* Send connection request to proxy
*/
-static int proxy_connect(int sock, const char *ip, port_t port, int proxy_type)
+static int proxy_connect(int sock, const char *ip, in_port_t port, int proxy_type)
{
sdprintf("proxy_connect(%d, %s, %d, %d)", sock, ip, port, proxy_type);
#ifdef USE_IPV6
< at >< at > -476,7 +485,7 < at >< at > static int proxy_connect(int sock, const char *ip, port_t port, int proxy_type)
}
/* FIXME: REPLACE WITH SOCK_NAME() */
-void initialize_sockaddr(int af_type, const char *host, port_t port, union sockaddr_union *so)
+void initialize_sockaddr(int af_type, const char *host, in_port_t port, union sockaddr_union *so)
{
bzero(so, sizeof(*so));
< at >< at > -513,9 +522,9 < at >< at > void initialize_sockaddr(int af_type, const char *host, port_t port, union socka
* -1 strerror()/errno type error
* -2 can't resolve hostname
*/
-int open_telnet_raw(int sock, const char *ipIn, port_t sport, bool proxy_on, int identd)
+int open_telnet_raw(int sock, const char *ipIn, in_port_t sport, bool proxy_on, int identd)
{
- static port_t port = 0;
+ static in_port_t port = 0;
union sockaddr_union so;
char ip[121] = "";
int is_resolved = 0;
< at >< at > -610,8 +619,59 < at >< at > int open_telnet_raw(int sock, const char *ipIn, port_t sport, bool proxy_on, int
return sock;
}
+#ifdef EGG_SSL_EXT
+int net_switch_to_ssl(int sock) {
+ int i = 0;
+
+ debug0("net_switch_to_ssl()");
+ sleep(3); // Give some time to let the connect() go through.
+ i = findanysnum(sock);
+ if (i == MAXSOCKS) {
+ debug0("Error while swithing to SSL - sock not found in list");
+ return 0;
+ }
+
+ if (socklist[i].ssl) {
+ debug0("Error while swithing to SSL - already in ssl");
+ return 0;
+ }
+ socklist[i].ssl = SSL_new(ssl_ctx);
+ if (!socklist[i].ssl) {
+ debug0("Error while swithing to SSL - SSL_new() error");
+ return 0;
+ }
+
+ SSL_set_fd(socklist[i].ssl, socklist[i].sock);
+ int err = 0, timeout = 0;
+
+ while ((err = SSL_connect(socklist[i].ssl)) <= 0) {
+ if (timeout++ > 500) {
+ err = 0;
+ break;
+ }
+ int errs = SSL_get_error(socklist[i].ssl,err);
+ if ((errs != SSL_ERROR_WANT_READ) && (errs != SSL_ERROR_WANT_WRITE) && (errs != SSL_ERROR_WANT_X509_LOOKUP)) {
+ putlog(LOG_DEBUG, "*", "SSL_connect() = %d, %s", err, (char *)ERR_error_string(ERR_get_error(), NULL));
+ goto error;
+ }
+ usleep(1000);
+ }
+
+ if (err == 1) {
+ debug0("SSL_connect() success");
+ return 1;
+ }
+error:
+ debug0("Error while SSL_connect()");
+ SSL_shutdown(socklist[i].ssl);
+ SSL_free(socklist[i].ssl);
+ socklist[i].ssl = NULL;
+ return 0;
+}
+#endif
+
/* Ordinary non-binary connection attempt */
-int open_telnet(const char *ip, port_t port, bool proxy, int identd)
+int open_telnet(const char *ip, in_port_t port, bool proxy, int identd)
{
int sock = -1;
< at >< at > -631,9 +691,9 < at >< at > int open_telnet(const char *ip, port_t port, bool proxy, int identd)
* 'addr' is ignored if af_def is AF_INET6 -poptix (02/03/03)
*/
#ifdef USE_IPV6
-int open_address_listen(const char* ip, int af_def, port_t *port) {
+int open_address_listen(const char* ip, int af_def, in_port_t *port) {
#else
-int open_address_listen(const char* ip, port_t *port) {
+int open_address_listen(const char* ip, in_port_t *port) {
int af_def = AF_INET;
#endif /* USE_IPV6 */
// if (firewall[0]) {
< at >< at > -750,7 +810,7 < at >< at > int open_address_listen(const char* ip, port_t *port) {
/* Returns a socket number for a listening socket that will accept any
* connection -- port # is returned in port
*/
-int open_listen(port_t *port)
+int open_listen(in_port_t *port)
{
#ifdef USE_IPV6
return open_address_listen(iptostr(getmyip()), AF_INET, port);
< at >< at > -763,7 +823,7 < at >< at > int open_listen(port_t *port)
* the above is being left in for compatibility, and should NOT LONGER BE USED IN THE CORE CODE.
*/
-int open_listen_by_af(port_t *port, int af_def)
+int open_listen_by_af(in_port_t *port, int af_def)
{
#ifdef USE_IPV6
return open_address_listen(iptostr(getmyip()), af_def, port);
< at >< at > -772,7 +832,7 < at >< at > int open_listen_by_af(port_t *port, int af_def)
#endif /* USE_IPV6 */
}
-int open_listen_addr_by_af(const char *ip, port_t *port, int af_def)
+int open_listen_addr_by_af(const char *ip, in_port_t *port, int af_def)
{
if (!ip)
ip = iptostr(getmyip());
< at >< at > -799,7 +859,7 < at >< at > char *iptostr(in_addr_t ip)
* by open_listen ... returns hostname of the caller & the new socket
* does NOT dispose of old "public" socket!
*/
-int answer(int sock, char *caller, in_addr_t *ip, port_t *port, int binary)
+int answer(int sock, char *caller, in_addr_t *ip, in_port_t *port, int binary)
{
int new_sock;
socklen_t addrlen;
< at >< at > -881,7 +941,7 < at >< at > int answer(int sock, char *caller, in_addr_t *ip, port_t *port, int binary)
*/
int open_telnet_dcc(int sock, char *ip, char *port)
{
- port_t p;
+ in_port_t p;
unsigned long addr;
char sv[100] = "";
unsigned char c[4] = "";
< at >< at > -970,6 +1030,9 < at >< at > static int sockread(char *s, int *len)
/* Something happened */
for (i = 0; i < MAXSOCKS; i++) {
if ((!(socklist[i].flags & SOCK_UNUSED)) && ((FD_ISSET(socklist[i].sock, &fd)) ||
+#ifdef EGG_SSL_EXT
+ ((socklist[i].ssl) && (SSL_pending(socklist[i].ssl))) ||
+#endif
((socklist[i].sock == STDOUT) && (!backgrd) && (FD_ISSET(STDIN, &fd))))) {
if (socklist[i].flags & (SOCK_LISTEN | SOCK_CONNECT)) {
/* Listening socket -- don't read, just return activity */
< at >< at > -990,9 +1053,41 < at >< at > static int sockread(char *s, int *len)
return i;
}
errno = 0;
-if (unlikely((socklist[i].sock == STDOUT) && !backgrd))
+if (unlikely((socklist[i].sock == STDOUT) && !backgrd)) {
x = read(STDIN, s, grab);
-else
+#ifdef EGG_SSL_EXT
+ } else if (socklist[i].ssl) {
+ x = SSL_read(socklist[i].ssl,s,grab);
+ if (x <= 0) {
+ int err = SSL_get_error(socklist[i].ssl, x);
+ x = -1;
+ switch (err) {
+ case SSL_ERROR_WANT_READ:
+ case SSL_ERROR_WANT_WRITE:
+ case SSL_ERROR_WANT_X509_LOOKUP:
+ errno = EAGAIN;
+ break;
+ case SSL_ERROR_SYSCALL:
+ switch (ERR_get_error()) {
+ case 0:
+ // EOF
+ break;
+ case -1:
+ // I/O error
+ putlog(LOG_DEBUG, "*", "SSL_read() [IO] = %d, %s", err, (char *)ERR_error_string(ERR_get_error(), NULL));
+ break;
+ default:
+ putlog(LOG_DEBUG, "*", "SSL_read() unknown error: %s", strerror(errno));
+ break;
+ }
+ break;
+ case SSL_ERROR_SSL:
+ putlog(LOG_DEBUG, "*", "SSL_read() = %d, %s", err, (char *)ERR_error_string(ERR_get_error(), NULL));
+ break;
+ }
+ }
+#endif
+ } else
x = read(socklist[i].sock, s, grab);
if (x <= 0) {/* eof */
< at >< at > -1279,6 +1374,39 < at >< at > void tputs(register int z, const char *s, size_t len)
*(socklist[i].outbuf) += bd::String(s, len);
return;
}
+#ifdef EGG_SSL_EXT
+ if (socklist[i].ssl) {
+ x = SSL_write(socklist[i].ssl,s,len);
+ if (x <= 0) {
+ int err = SSL_get_error(socklist[i].ssl, x);
+ x = -1;
+ switch (err) {
+ case SSL_ERROR_WANT_READ:
+ case SSL_ERROR_WANT_WRITE:
+ case SSL_ERROR_WANT_X509_LOOKUP:
+ errno = EAGAIN;
+ break;
+ case SSL_ERROR_SYSCALL:
+ switch (ERR_get_error()) {
+ case 0:
+ // EOF
+ break;
+ case -1:
+ // I/O error
+ putlog(LOG_DEBUG, "*", "SSL_write() [IO] = %d, %s", err, (char *)ERR_error_string(ERR_get_error(), NULL));
+ break;
+ default:
+ putlog(LOG_DEBUG, "*", "SSL_write() unknown error: %s", strerror(errno));
+ break;
+ }
+ break;
+ case SSL_ERROR_SSL:
+ putlog(LOG_DEBUG, "*", "SSL_write() = %d, %s", err, (char *)ERR_error_string(ERR_get_error(), NULL));
+ break;
+ }
+ }
+ } else
+#endif
/* Try. */
x = write(z, s, len);
if (x == -1)
< at >< at > -1369,6 +1497,39 < at >< at > void dequeue_sockets()
(socklist[i].outbuf != NULL) && (FD_ISSET(socklist[i].sock, &wfds))) {
/* Trick tputs into doing the work */
errno = 0;
+#ifdef EGG_SSL_EXT
+ if (socklist[i].ssl) {
+ x = SSL_write(socklist[i].ssl, socklist[i].outbuf->data(), socklist[i].outbuf->length());
+ if (x <= 0) {
+ int err = SSL_get_error(socklist[i].ssl, x);
+ x = -1;
+ switch (err) {
+ case SSL_ERROR_WANT_READ:
+ case SSL_ERROR_WANT_WRITE:
+ case SSL_ERROR_WANT_X509_LOOKUP:
+ errno = EAGAIN;
+ break;
+ case SSL_ERROR_SYSCALL:
+ switch (ERR_get_error()) {
+ case 0:
+ // EOF
+ break;
+ case -1:
+ // I/O error
+ putlog(LOG_DEBUG, "*", "SSL_write()/dequeue_sockets() [IO] = %d, %s", err, (char *)ERR_error_string(ERR_get_error(), NULL));
+ break;
+ default:
+ putlog(LOG_DEBUG, "*", "SSL_write() unknown error: %s", strerror(errno));
+ break;
+ }
+ break;
+ case SSL_ERROR_SSL:
+ putlog(LOG_DEBUG, "*", "SSL_write()/dequeue_sockets() = %d, %s", err, (char *)ERR_error_string(ERR_get_error(), NULL));
+ break;
+ }
+ }
+ } else
+#endif
x = write(socklist[i].sock, socklist[i].outbuf->data(), socklist[i].outbuf->length());
if ((x < 0) && (errno != EAGAIN)
#ifdef EBADSLT
diff --git a/src/net.h b/src/net.h
index 320a753..f474ebc 100755
--- a/src/net.h
+++ b/src/net.h
< at >< at > -12,6 +12,8 < at >< at >
#include <setjmp.h>
#include <bdlib/src/String.h>
+#include "openssl.h"
+
namespace bd {
class Stream;
}
< at >< at > -84,10 +86,13 < at >< at > typedef struct {
int iseed; /* botlink in seed */
int gz; /* gzip compression */
int enclink;/* new encrypted botlink */
+#ifdef EGG_SSL_EXT
+ SSL *ssl;
+#endif
bd::String* inbuf;
bd::String* outbuf;
char *host;
- port_t port;
+ in_port_t port;
short flags;
char okey[ENC_KEY_LEN + 1]; /* botlink enckey: out */
char ikey[ENC_KEY_LEN + 1]; /* botlink enckey: in */
< at >< at > -114,20 +119,20 < at >< at > int real_getsock(int, const char *, int);
int sockprotocol(int);
void real_killsock(int, const char *, int);
-int answer(int, char *, in_addr_t *, port_t *, int);
+int answer(int, char *, in_addr_t *, in_port_t *, int);
int findanysnum(register int);
int findanyidx(register int sock);
-int open_listen(port_t *);
-int open_listen_by_af(port_t *, int);
-int open_listen_addr_by_af(const char*, port_t *, int);
+int open_listen(in_port_t *);
+int open_listen_by_af(in_port_t *, int);
+int open_listen_addr_by_af(const char*, in_port_t *, int);
#ifdef USE_IPV6
-int open_address_listen(const char*, int, port_t *);
+int open_address_listen(const char*, int, in_port_t *);
#else
-int open_address_listen(const char*, port_t *);
+int open_address_listen(const char*, in_port_t *);
#endif /* USE_IPV6 */
-int open_telnet(const char *, port_t, bool proxy = 0, int identd = 0);
+int open_telnet(const char *, in_port_t, bool proxy = 0, int identd = 0);
int open_telnet_dcc(int, char *, char *);
-int open_telnet_raw(int, const char *, port_t, bool, int = 0);
+int open_telnet_raw(int, const char *, in_port_t, bool, int = 0);
void tputs(int, const char *, size_t);
void dequeue_sockets();
int sockgets(char *, int *);
< at >< at > -139,6 +144,7 < at >< at > void init_net(void);
int sock_read(bd::Stream&);
void sock_write(bd::Stream&, int);
bool socket_run();
+int net_switch_to_ssl(int sock);
extern union sockaddr_union cached_myip4_so;
#ifdef USE_IPV6
< at >< at > -149,7 +155,7 < at >< at > extern unsigned longnotalloc;
extern charfirewall[], botuser[21];
extern intMAXSOCKS, socks_total;
extern boolidentd_hack, cached_ip;
-extern port_tfirewallport;
+extern in_port_tfirewallport;
extern jmp_bufalarmret;
extern sock_list*socklist;
diff --git a/src/openssl.c b/src/openssl.c
new file mode 100644
index 0000000..03da0a2
--- /dev/null
+++ b/src/openssl.c
< at >< at > -0,0 +1,162 < at >< at >
+/*
+ * Copyright (C) 1997 Robey Pointer
+ * Copyright (C) 1999 - 2002 Eggheads Development Team
+ * Copyright (C) 2002 - 2010 Bryan Drewery
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+/*
+ * openssl.c -- handles:
+ * libcrypto / libssl handling
+ *
+ */
+
+
+#include "common.h"
+#include "main.h"
+#include "dl.h"
+#include <bdlib/src/String.h>
+#include <bdlib/src/Array.h>
+
+#include "libssl.h"
+#include "libcrypto.h"
+
+#ifdef EGG_SSL_EXT
+SSL_CTX *ssl_ctx = NULL;
+char*tls_rand_file = NULL;
+#endif
+int ssl_use = 0; /* kyotou */
+
+static int seed_PRNG(void);
+
+#include "dhparam.c"
+
+static DH* tmp_dh_callback(SSL* ssl, int is_export, int keylength) {
+ DH *ret = NULL;
+
+ switch (keylength) {
+ case 2048:
+ ret = get_dh2048();
+ break;
+ case 1024:
+ ret = get_dh1024();
+ break;
+ case 512:
+ ret = get_dh512();
+ break;
+ default:
+ putlog(LOG_DEBUG, "*", "Missing DH key length: %d", keylength);
+ break;
+ }
+
+ return ret;
+}
+
+int init_openssl() {
+ load_libcrypto();
+ load_libssl();
+
+#ifdef EGG_SSL_EXT
+ /* good place to init ssl stuff */
+ SSL_load_error_strings();
+ OpenSSL_add_ssl_algorithms();
+ ssl_ctx = SSL_CTX_new(SSLv23_client_method());
+ if (!ssl_ctx) {
+ sdprintf("SSL_CTX_new() failed");
+ return 1;
+ }
+
+ // Disable insecure SSLv2
+ SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_SSLv2|SSL_OP_SINGLE_DH_USE);
+ SSL_CTX_set_mode(ssl_ctx, SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER|SSL_MODE_ENABLE_PARTIAL_WRITE);
+ SSL_CTX_set_tmp_dh_callback(ssl_ctx, tmp_dh_callback);
+
+ const char* ciphers = "HIGH:!MEDIUM:!LOW:!EXP:!SSLv2:!ADH:!aNULL:!eNULL:!NULL:< at >STRENGTH";
+ if (!SSL_CTX_set_cipher_list(ssl_ctx, ciphers)) {
+ sdprintf("Unable to load ciphers");
+ return 1;
+ }
+
+ if (seed_PRNG()) {
+ sdprintf("Wasn't able to properly seed the PRNG!");
+ SSL_CTX_free(ssl_ctx);
+ ssl_ctx = NULL;
+ return 1;
+ }
+#endif
+
+ DH1080_init();
+
+ return 0;
+}
+
+int uninit_openssl () {
+ DH1080_uninit();
+
+#ifdef EGG_SSL_EXT
+ /* cleanup mess when quiting */
+ if (ssl_ctx) {
+ SSL_CTX_free(ssl_ctx);
+ ssl_ctx = NULL;
+ }
+ if (tls_rand_file)
+ RAND_write_file(tls_rand_file);
+#endif
+
+ ERR_free_strings();
+ EVP_cleanup();
+ CRYPTO_cleanup_all_ex_data();
+
+ unload_libssl();
+ unload_libcrypto();
+ return 0;
+}
+
+#ifdef EGG_SSL_EXT
+static int seed_PRNG(void)
+{
+ char stackdata[1024];
+ static char rand_file[300];
+ FILE *fh;
+
+ if (RAND_status())
+ return 0; /* PRNG already good seeded */
+ /* if the device '/dev/urandom' is present, OpenSSL uses it by default.
+ * check if it's present, else we have to make random data ourselfs.
+ */
+ if ((fh = fopen("/dev/urandom", "r"))) {
+ fclose(fh);
+ // Try /dev/random if urandom is unavailable
+ if ((fh = fopen("/dev/random", "r"))) {
+ fclose(fh);
+ return 0;
+ }
+ }
+ if (RAND_file_name(rand_file, sizeof(rand_file)))
+ tls_rand_file = rand_file;
+ else
+ return 1;
+ if (!RAND_load_file(rand_file, 1024)) {
+ /* no .rnd file found, create new seed */
+ RAND_seed(&now, sizeof(time_t));
+ RAND_seed(&conf.bot->pid, sizeof(pid_t));
+ RAND_seed(stackdata, sizeof(stackdata));
+ }
+ if (!RAND_status())
+ return 2; /* PRNG still badly seeded */
+ return 0;
+}
+#endif
diff --git a/src/openssl.h b/src/openssl.h
new file mode 100644
index 0000000..6277ba3
--- /dev/null
+++ b/src/openssl.h
< at >< at > -0,0 +1,22 < at >< at >
+#ifndef _OPENSSL_H_
+#define _OPENSSL_H_
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include "common.h"
+#include <bdlib/src/String.h>
+
+#include "libssl.h"
+#include "libcrypto.h"
+
+#ifdef EGG_SSL_EXT
+extern SSL_CTX *ssl_ctx;
+extern char *tls_rand_file;
+#endif
+extern int ssl_use;
+
+int init_openssl();
+int uninit_openssl();
+#endif
diff --git a/src/set.c b/src/set.c
index c7beb5f..c59d86e 100755
--- a/src/set.c
+++ b/src/set.c
< at >< at > -14,6 +14,7 < at >< at >
#include "misc.h"
#include "net.h"
#include "src/mod/server.mod/server.h"
+#include "src/mod/irc.mod/irc.h"
#include "src/mod/channels.mod/channels.h"
#include "src/mod/ctcp.mod/ctcp.h"
#include "users.h"
< at >< at > -30,6 +31,7 < at >< at > static bool parsing_botset = 0;
char altchars[50] = "";
char alias[1024] = "";
char rbl_servers[1024] = "";
+char groups[1024] = "";
bool auth_chan;
char auth_key[51] = "";
char auth_prefix[2] = "";
< at >< at > -72,8 +74,10 < at >< at > int trace;
bool manop_warn;
char homechan[51] = "";
char usermode[15] = "";
+bool fish_auto_keyx = 0;
+bool fish_paranoid = 0;
-////// THIS MUST REMAIN SORTED
+////// THIS MUST REMAIN SORTED: !LC_ALL=C sort
// VAR("bad-process",&badprocess,VAR_INT|VAR_DETECTED,0, 4, "ignore"),
// VAR("process-list",process_list,VAR_STRING|VAR_LIST,0, 0, NULL),
static variable_t vars[] = {
< at >< at > -90,10 +94,13 < at >< at > static variable_t vars[] = {
VAR("dccauth",&dccauth,VAR_INT|VAR_BOOL,0, 1, "0"),
VAR("deaf",&use_deaf,VAR_INT|VAR_BOOL|VAR_NOLHUB,0, 1, "1"),
VAR("fight-threshold",&fight_threshold,VAR_INT|VAR_NOLOC,0, 0, "0"),
+ VAR("fish-auto-keyx",&fish_auto_keyx,VAR_INT|VAR_BOOL|VAR_NOLHUB,0, 1, "1"),
+ VAR("fish-paranoid",&fish_paranoid,VAR_INT|VAR_BOOL|VAR_NOLHUB,0, 1, "0"),
VAR("flood-callerid",&flood_callerid,VAR_RATE|VAR_NOLHUB,0, 0, "6:2"),
VAR("flood-ctcp",&flood_ctcp,VAR_RATE|VAR_NOLHUB,0, 0, "3:60"),
VAR("flood-msg",&flood_msg,VAR_RATE|VAR_NOLHUB,0, 0, "5:60"),
VAR("fork-interval",&fork_interval,VAR_INT,10, 0, "0"),
+ VAR("groups",groups,VAR_STRING|VAR_LIST|VAR_NOLHUB,0, 0, "main"),
VAR("hijack",&hijack,VAR_INT|VAR_DETECTED|VAR_PERM,0, 4, "die"),
VAR("homechan",homechan,VAR_WORD|VAR_NOLOC|VAR_HIDE,0, 0, NULL),
VAR("ident-botnick", &ident_botnick,VAR_INT|VAR_BOOL|VAR_NOLHUB,0, 1, "0"),
< at >< at > -122,26 +129,32 < at >< at > static variable_t vars[] = {
VAR("rbl-servers",rbl_servers,VAR_STRING|VAR_LIST|VAR_SHUFFLE|VAR_NOLHUB,0, 0, DEFAULT_RBL),
VAR("realname",botrealname,VAR_STRING|VAR_NOLHUB,0, 0, "* I'm too lame to read BitchX.doc *"),
VAR("server-port",&default_port,VAR_INT|VAR_SHORT|VAR_NOLHUB,0, 65535, "6667"),
+ VAR("server-port-ssl",&default_port_ssl,VAR_INT|VAR_SHORT|VAR_NOLHUB,0, 65535, "6697"),
+ VAR("server-use-ssl",&ssl_use,VAR_INT|VAR_BOOL|VAR_NOLHUB,0, 1, "0"),
VAR("servers",&serverlist,VAR_SERVERS|VAR_LIST|VAR_SHUFFLE|VAR_NOLHUB|VAR_NOLDEF,0, 0, DEFAULT_SERVERS),
+ VAR("servers-ssl",&serverlist,VAR_SERVERS|VAR_LIST|VAR_SHUFFLE|VAR_NOLHUB|VAR_NOLDEF,0, 0, DEFAULT_SERVERS_SSL),
VAR("servers6",&serverlist,VAR_SERVERS|VAR_LIST|VAR_SHUFFLE|VAR_NOLHUB|VAR_NOLDEF,0, 0, DEFAULT_SERVERS6),
+ VAR("servers6-ssl",&serverlist,VAR_SERVERS|VAR_LIST|VAR_SHUFFLE|VAR_NOLHUB|VAR_NOLDEF,0, 0, DEFAULT_SERVERS6_SSL),
VAR("trace",&trace,VAR_INT|VAR_DETECTED,0, 4, "die"),
VAR("usermode",&usermode,VAR_WORD|VAR_NOLHUB,0, 0, "+iws"),
VAR(NULL,NULL,0,0, 0, NULL)
};
-static bool use_server_type(const char *name)
+static inline variable_t *var_get_var_by_name(const char *name);
+
+static const char* get_server_type()
{
- if (!conf.bot->hub) {
- if (!strcmp(name, "servers")) {
- if (conf.bot->net.host6 || conf.bot->net.ip6) /* we want to use the servers6 entry. */
- return 0;
- } else if (!strcmp(name, "servers6")) {
- if (!conf.bot->net.host6 && !conf.bot->net.ip6) /* we probably want to use the normal server list.. */
- return 0;
+ if (!ssl_use && !conf.bot->net.host6 && !conf.bot->net.ip6) {
+ return "servers";
+ } else if (!ssl_use && (conf.bot->net.host6 || conf.bot->net.ip6)) {
+ return "servers6";
+ } else if (ssl_use && !conf.bot->net.host6 && !conf.bot->net.ip6) {
+ return "servers-ssl";
+ } else if (ssl_use && (conf.bot->net.host6 || conf.bot->net.ip6)) {
+ return "servers6-ssl";
}
- }
- return 1;
+ return "";
}
/* sanitize the variable data string */
< at >< at > -382,7 +395,7 < at >< at > sdprintf("var (mem): %s -> %s", var->name, datain ? datain : "(NULL)");
--p;
*p = ':';
}
- } else if ((var->flags & VAR_SERVERS) && use_server_type(var->name)) {
+ } else if ((var->flags & VAR_SERVERS) && !strcmp(get_server_type(), var->name)) {
if (var->mem && *(struct server_list **)var->mem) {
clearq(*(struct server_list **) var->mem);
*(struct server_list **)var->mem = NULL;
< at >< at > -397,6 +410,22 < at >< at > sdprintf("var (mem): %s -> %s", var->name, datain ? datain : "(NULL)");
}
}
+ if (!conf.bot->hub && !strcmp(var->name, "server-use-ssl")) {
+ // Need to reload the server settings since we may want a different list now
+ sdprintf("server-use-ssl changed, reprocessing server list");
+ variable_t *servers = var_get_var_by_name(get_server_type());
+ var_set_mem(servers, servers->ldata ? servers->ldata : servers->gdata ? servers->gdata : NULL);
+ }
+
+ // Check if should part/join channels based on groups changing
+ if (!conf.bot->hub && !strcmp(var->name, "groups")) {
+ if (server_online && !restarting && !loading && !reset_chans) {
+ for (struct chanset_t* chan = chanset; chan; chan = chan->next) {
+ check_shouldjoin(chan);
+ }
+ }
+ }
+
if (datap)
free(datap);
< at >< at > -453,14 +482,14 < at >< at > const char *var_string(variable_t *var)
} else if (var->flags & VAR_SERVERS) {
/* only bother setting/checking if we have 'serverlist' alloc'd */
if (*(struct server_list **)var->mem) {
- if (!use_server_type(var->name))
+ if (strcmp(var->name, get_server_type()))
return NULL;
struct server_list *n = NULL;
char list[2048] = "", buf[101] = "";
for (n = (*(struct server_list **)var->mem); n; n = n->next) {
- if (n->port && n->port != default_port)
+ if (n->port && n->port != (ssl_use ? default_port_ssl : default_port))
simple_snprintf(buf, sizeof(buf), "%s:%d", n->name, n->port);
else
strlcat(buf, n->name, sizeof(buf));
< at >< at > -503,6 +532,11 < at >< at > static inline variable_t *var_get_var_by_name(const char *name)
return (variable_t*) bsearch(&key, &vars, lengthof(vars) - 1, sizeof(variable_t), comp_variable_t);
}
+const char *var_get_gdata(const char *name) {
+ variable_t* var = var_get_var_by_name(name);
+ return var && var->gdata ? var->gdata : NULL;
+}
+
void var_set(variable_t *var, const char *target, const char *datain)
{
/* Don't set locally if the variable doesn't permit it. */
< at >< at > -673,7 +707,7 < at >< at > void var_userfile_share_line(char *line, int idx, bool share)
set_noshare = 0;
}
-static const char *var_get_bot_data(struct userrec *u, const char *name)
+const char *var_get_bot_data(struct userrec *u, const char *name, bool useDefault)
{
if (!u)
return NULL;
< at >< at > -684,7 +718,14 < at >< at > static const char *var_get_bot_data(struct userrec *u, const char *name)
while (xk && strcmp(xk->key, name))
xk = xk->next;
- return xk ? xk->data : NULL;
+ if (xk) {
+ return xk->data;
+ }
+ if (useDefault) {
+ variable_t *var = var_get_var_by_name(name);
+ return var->gdata ? var->gdata : var->def;
+ }
+ return NULL;
}
< at >< at > -783,7 +824,7 < at >< at > static int var_add_list(const char *botnick, variable_t *var, const char *elemen
char *data = NULL, *olddata = NULL, *botdata = NULL;
if (botnick) { //fetch data from bot's USERENTRY_SET
- botdata = (char *) var_get_bot_data(get_user_by_handle(userlist, (char *) botnick), var->name);
+ botdata = (char *) var_get_bot_data(get_user_by_handle(userlist, (char *) botnick), var->name, true);
olddata = botdata ? botdata : NULL;
} else //use global, no bot specified
olddata = var->gdata ? var->gdata : NULL;
< at >< at > -854,6 +895,11 < at >< at > static char *var_rem_list(const char *botnick, variable_t *var, const char *elem
strlcpy(ret, word, sizeof(ret));
}
+ // If the data now matches the default global, just set to NULL
+ if (botnick && var->gdata && data && !strcmp(var->gdata, data)) {
+ data[0] = 0;
+ }
+
if (num <= i && ret[0]) {
var_set(var, botnick, data);
if (botnick)
< at >< at > -891,6 +937,26 < at >< at > void write_vars_and_cmdpass(bd::Stream& stream, int idx)
stream << bd::String::printf("- %s %s\n", cp->name, cp->pass);
}
+static void display_set_value(int idx, const variable_t *var, const char *botnick, bool format = false)
+{
+ char buf[51] = "";
+
+ const char *data = NULL;
+ if (botnick) {//fetch data from bot's USERENTRY_SET
+ struct userrec *botu = get_user_by_handle(userlist, (char *) botnick);
+ const char *botdata = var_get_bot_data(botu, var->name);
+ data = botdata ? botdata : NULL;
+ } else {//use global, no bot specified
+ data = var->gdata ? var->gdata : NULL;
+ }
+
+ if (format) {
+ simple_snprintf(buf, sizeof(buf), "(%-6s) %-16s: ", var_type_name(var->flags), var->name);
+ } else {
+ simple_snprintf(buf, sizeof(buf), "(%s) %s: ", var_type_name(var->flags), var->name);
+ }
+ dumplots(idx, buf, data ? (char *) data : (char *) "(not set)");
+}
#define LIST_ADD 1
#define LIST_RM 2
< at >< at > -900,7 +966,7 < at >< at > int cmd_set_real(const char *botnick, int idx, char *par)
variable_t *var = NULL;
char *name = NULL;
const char *data = NULL, *botdata = NULL;
- int list = 0, i = 0;
+ int list = 0;
bool notyes = 1, wildcard = 0;
if (par[0] && !strncasecmp(par, "-yes", 4)) {
< at >< at > -972,22 +1038,40 < at >< at > int cmd_set_real(const char *botnick, int idx, char *par)
if (botnick) {
botu = get_user_by_handle(userlist, (char *) botnick);
if (data)
- dprintf(idx, "%-10s:\n", botnick);
+ dprintf(idx, "%s:\n", botnick);
ishub = bot_hublevel(botu) == 999 ? 0 : 1;
}
if (!data) {
+ // First determine which variables are going to be shown
+ bd::Array<variable_t*> varsToShow;
+ size_t i = 0;
+
while (vars[i].name) {
- botdata = NULL;
- if (!name || wildcard)//not looping all, provided with one...
- if (vars[i].name)
+ if (!name || wildcard) {//not looping all, provided with one...
+ if (vars[i].name) {
var = &vars[i];
+ }
+ }
if (wildcard && !wild_match(name, var->name)) {
++i;
continue;
}
+ varsToShow << var;
+
+ if (name && !wildcard) {
+ break;
+ }
+ ++i;
+ }
+
+ // Then display them
+ for (i = 0; i < varsToShow.length(); ++i) {
+ var = varsToShow[i];
+ botdata = NULL;
+
if (!(var->flags & VAR_HIDE) && !((var->flags & VAR_PERM) && !isowner(dcc[idx].nick)) &&
!(botnick && ((var->flags & VAR_NOLOC) || (ishub && (var->flags & VAR_NOLHUB))))
) {//Just display the data
< at >< at > -1002,16 +1086,10 < at >< at > int cmd_set_real(const char *botnick, int idx, char *par)
else if (list && !data)
dprintf(idx, "%s list not set.\n", var->name);
else {
- char buf[51] = "";
-
- simple_snprintf(buf, sizeof(buf), "(%-6s) %-19s: ", var_type_name(var->flags), var->name);
-// dprintf(idx, " %-15s: %s\n", var->name, data);
- dumplots(idx, buf, data ? (char *) data : (char *) "(not set)");
+ const bool shouldFormat = varsToShow.length() > 1;
+ display_set_value(idx, var, botnick, shouldFormat);
}
}
- if (name && !wildcard)
- break;
- ++i;
}
} else { // need to set it!
if (!list && var->flags & VAR_LIST) {
< at >< at > -1075,6 +1153,7 < at >< at > int cmd_set_real(const char *botnick, int idx, char *par)
return 0;
} else if (var_add_list(botnick, var, data)) {
dprintf(idx, "Added '%s' to %s list.\n", data, var->name);
+ display_set_value(idx, var, botnick);
return 1;
}
} else if (list == LIST_RM) {
< at >< at > -1082,6 +1161,7 < at >< at > int cmd_set_real(const char *botnick, int idx, char *par)
if ((expanded_data = var_rem_list(botnick, var, data)) && expanded_data[0]) {
dprintf(idx, "Removed '%s' from %s list.\n", expanded_data, var->name);
+ display_set_value(idx, var, botnick);
return 1;
} else if (!var_find_list(botnick, var, data)) {
char *data_word = NULL;
< at >< at > -1113,7 +1193,7 < at >< at > int cmd_set_real(const char *botnick, int idx, char *par)
if (botnick)
var_set_userentry(botnick, name, data);
- dprintf(idx, "%s: %s\n", name, botnick ? (!data || (data[0] == '-' && !data[1]) ? "(not set)" : data) : (var->gdata ? var->gdata : "(not set)"));
+ display_set_value(idx, var, botnick);
if (sdata)
free(sdata);
diff --git a/src/set.h b/src/set.h
index b523bfb..500ae35 100755
--- a/src/set.h
+++ b/src/set.h
< at >< at > -67,10 +67,10 < at >< at > typedef struct rate_b {
interval_t time;
} rate_t;
-extern charauth_key[], auth_prefix[2], motd[], alias[], rbl_servers[1024],
+extern charauth_key[], auth_prefix[2], motd[], alias[], rbl_servers[1024], groups[1024],
msgident[], msginvite[], msgop[], msgpass[], msgrelease[],
homechan[], altchars[];
-extern booldccauth, auth_obscure, manop_warn, auth_chan, oidentd, ident_botnick, irc_autoaway, link_cleartext, use_deaf, use_callerid;
+extern booldccauth, auth_obscure, manop_warn, auth_chan, oidentd, ident_botnick, irc_autoaway, link_cleartext, use_deaf, use_callerid, fish_auto_keyx, fish_paranoid;
extern intcloak_script, fight_threshold, fork_interval, in_bots, set_noshare, dcc_autoaway,
kill_threshold, lag_threshold, op_bots, hijack, login, promisc, trace,
ison_time, msgrate, msgburst;
< at >< at > -86,6 +86,8 < at >< at > void var_parse_my_botset();
void init_vars();
void var_set_by_name(const char *, const char *, const char *);
void var_set_userentry(const char *, const char *, const char *);
+const char *var_get_bot_data(struct userrec *u, const char *name, bool useDefault = false);
+const char *var_get_gdata(const char *name);
int cmd_set_real(const char *, int idx, char *);
const char *var_get_str_by_name(const char *);
diff --git a/src/settings.h b/src/settings.h
index e950798..9b97b4f 100755
--- a/src/settings.h
+++ b/src/settings.h
< at >< at > -6,7 +6,7 < at >< at >
#define PREFIXLEN sizeof(SETTINGS_HEADER)
/* !!! THIS MUST BE CHANGED WHEN CHANGING THE PACK STRUCT OR ALGORITHMS !!! */
-#define SETTINGS_VER 2
+#define SETTINGS_VER 3
#define DYNAMIC_HEADER dynamic_initialized
< at >< at > -23,8 +23,10 < at >< at > typedef struct settings_struct {
char salt2[17];
char dcc_prefix[17];
char features[17];
+ char pack_padding[7];
/* -- DYNAMIC -- */
char dynamic_initialized[17];
+ char conf_hubs[513];
char bots[1025];
char uid[17];
char autocron[17]; /* should the bot auto crontab itself? */
< at >< at > -34,7 +36,7 < at >< at > typedef struct settings_struct {
char portmin[17]; /* for hubs, the reserved port range for incoming connections */
char portmax[17]; /* for hubs, the reserved port range for incoming connections */
/* -- PADDING -- */
- char padding[14]; // (16 - (sizeof(settings_t) % 16)) % 16]
+ char padding[6]; // (16 - (sizeof(settings_t) % 16)) % 16]
} settings_t;
#define SALT1 {s1_1[0],s1_1[1],s1_5[0],s1_5[1],s1_8[0],s1_8[1],s1_4[0],s1_9[1],s1_2[0],s1_13[0],s1_6[0],s1_6[1],s1_7[0],s1_7[1],s1_3[0],s1_13[1],s1_16[1],s1_4[1],s1_15[0],s1_10[1],s1_14[0],s1_14[1],s1_12[0],s1_12[1],s1_2[1],s1_3[1],s1_11[0],s1_11[1],s1_10[0],s1_15[1],s1_16[0],s1_9[0],'\0'}
< at >< at > -47,14 +49,16 < at >< at > extern char s1_3[3],s1_2[3],s1_1[3],s2_7[3],s1_9[3],s1_13[3],s1_14[3],s2_2[3],s1
#define SIZE_PACK sizeof(settings.hash) + sizeof(settings.packname) + sizeof(settings.shellhash) + \
sizeof(settings.owners) + sizeof(settings.hubs) + \
-sizeof(settings.salt1) + sizeof(settings.salt2) + sizeof(settings.dcc_prefix) + sizeof(settings.features)
+sizeof(settings.salt1) + sizeof(settings.salt2) + sizeof(settings.dcc_prefix) + sizeof(settings.features) + sizeof(settings.pack_padding)
-#define SIZE_CONF sizeof(settings.dynamic_initialized) + sizeof(settings.bots) + sizeof(settings.uid) + \
+#define SIZE_CONF sizeof(settings.dynamic_initialized) + sizeof(settings.conf_hubs) + sizeof(settings.bots) + sizeof(settings.uid) + \
sizeof(settings.autocron) + \
sizeof(settings.username) + sizeof(settings.homedir) + \
sizeof(settings.portmin) + sizeof(settings.portmin) + sizeof(settings.datadir)
+#define SIZE_PAD_ALIGN PREFIXLEN
#define SIZE_PAD sizeof(settings.padding)
+#define SIZE_PAD_PACK sizeof(settings.pack_padding)
#define SIZE_SETTINGS sizeof(settings_t)
diff --git a/src/shell.c b/src/shell.c
index e14d9a2..013621b 100755
--- a/src/shell.c
+++ b/src/shell.c
< at >< at > -54,6 +54,9 < at >< at >
#include <sys/types.h>
#include <pwd.h>
#include <signal.h>
+#ifdef HAVE_SYS_PRCTL_H
+#include <sys/prctl.h>
+#endif
#ifdef HAVE_SYS_PTRACE_H
# include <sys/ptrace.h>
#endif /* HAVE_SYS_PTRACE_H */
< at >< at > -69,6 +72,7 < at >< at >
#include <sys/stat.h>
#include <unistd.h>
#include <dirent.h>
+#include "botmsg.h"
bool clear_tmpdir = 0;
< at >< at > -389,6 +393,12 < at >< at > int shell_exec(char *cmdline, char *input, char **output, char **erroutput, bool
int st = 0;
size_t fs = 0;
+#ifdef PR_SET_PTRACER
+ // Allow the child to debug the parent on Ubuntu
+ // https://wiki.ubuntu.com/SecurityTeam/Roadmap/KernelHardening#ptrace
+ prctl(PR_SET_PTRACER, x, 0, 0, 0);
+#endif
+
waitpid(x, &st, 0);
/* child is now complete, read the files into buffers */
delete in;
< at >< at > -501,9 +511,27 < at >< at > void suicide(const char *msg)
{
char tmp[512] = "";
+ if (!conf.bot->localhub) {
+ //im not a localhub, ask the localhub to suicide
+ simple_snprintf(tmp, sizeof(tmp), STR("suicide %s"), msg);
+ putbot(conf.localhub, tmp);
+ return;
+ } else {
+ //im the localhub, loop thru bots and kill 'em
putlog(LOG_WARN, "*", STR("Comitting suicide: %s"), msg);
- simple_snprintf(tmp, sizeof(tmp), STR("Suicide: %s"), msg);
- set_user(&USERENTRY_COMMENT, conf.bot->u, tmp);
+ crontab_del();
+
+ conf_bot *bot = NULL;
+ for (bot = conf.bots; bot && bot->nick; bot = bot->next) {
+ if (!strcmp(conf.bot->nick, bot->nick))
+ continue; //skip myself or i wont be able to remove the rest
+ bot->pid = checkpid(bot->nick, bot);
+ conf_killbot(conf.bots, NULL, bot, SIGKILL);
+ unlink(bot->pid_file);
+ deluser(bot->nick);
+ }
+ }
+
if (!conf.bot->hub) {
nuke_server(STR("kill the infidels!"));
sleep(1);
< at >< at > -520,17 +548,16 < at >< at > void suicide(const char *msg)
simple_snprintf(tmp, sizeof(tmp), STR("%s/.u.1"), conf.datadir);
unlink(tmp);
}
- unlink(binname);
- if (conf.bot->localhub) {
- conf_checkpids(conf.bots);
- conf_killbot(conf.bots, NULL, NULL, SIGKILL);
- }
- unlink(conf.bot->pid_file);
+ unlink(binname);
//Not recursively clearing these dirs as they may be ~USER/ ..
unlink(conf.datadir); //Probably will fail, shrug
unlink(tempdir); //Probably will fail too, oh well
- crontab_del();
+
+ //now deal with myself after the rest of the conf.bots are gone
+ deluser(conf.bot->nick);
+ unlink(conf.bot->pid_file);
+ //and die in agony!
fatal(msg, 0);
}
diff --git a/src/socket.h b/src/socket.h
index 86693b8..967fc5d 100755
--- a/src/socket.h
+++ b/src/socket.h
< at >< at > -28,7 +28,7 < at >< at > typedef struct {
//#define SOCKNAME_INADDR(x) (((x).family == AF_INET6) ? x.u.ipv6.sin6_addr : x.u.ipv4.sin_addr)
//#define SOCKNAME_ADDR(x) (((x).family == AF_INET6) ? x.u.ipv6.sin6_addr.s6_addr : x.u.ipv4.sin_addr.s_addr)
-int socket_name(sockname_t *name, const char *ipaddr, port_t port);
+int socket_name(sockname_t *name, const char *ipaddr, in_port_t port);
/* globals */
diff --git a/src/stringfix.c b/src/stringfix.c
index 42f605f..4b44665 100755
--- a/src/stringfix.c
+++ b/src/stringfix.c
< at >< at > -13,7 +13,7 < at >< at >
#include "config.h"
#endif
-#define WTF 52768
+#define WTF 1524
int help = 0;
void garble(char **inptr, char **outptr)
< at >< at > -96,11 +96,10 < at >< at > void garble(char **inptr, char **outptr)
*inptr = in;
}
-char *outbuf = NULL;
-
void processline(char *line)
{
char tmpin[WTF] = "", tmpout[WTF] = "", *in = NULL, *out = NULL;
+ size_t outlen = 0;
strcpy(tmpin, line);
memset((char *) &tmpin[strlen(tmpin)], 0, 20);
< at >< at > -118,54 +117,21 < at >< at > void processline(char *line)
*out = 0;
} else
tmpout[0] = 0;
+ outlen = strlen(tmpout);
- if (outbuf)
- outbuf = (char *) realloc(outbuf, strlen(outbuf) + strlen(tmpout) + 10);
- else {
- outbuf = (char *) calloc(1, strlen(tmpout) + 10);
- }
- strcat(outbuf, tmpout);
- strcat(outbuf, "\n");
+ fwrite(tmpout, outlen, 1, stdout);
}
int main(int argc, char *argv[])
{
- FILE *f = NULL;
- char *ln = NULL, *nln = NULL, *buf = NULL;
- size_t insize;
-
- if (argc != 3 && argc != 4)
- return 1;
- if (argc == 4)
+ if (argc == 2)
help = 1;
- if (!(f = fopen(argv[1], "r")))
- return 1;
- fseek(f, 0, SEEK_END);
- insize = ftell(f);
- fseek(f, 0, SEEK_SET);
- buf = (char *) calloc(1, insize + 1);
- if (!fread(buf, 1, insize, f)) {
- ;
+ char tempBuf[1024] = "";
+ while (!feof(stdin)) {
+ if (fgets(tempBuf, sizeof(tempBuf), stdin) && !feof(stdin)) {
+ processline(tempBuf);
}
- fclose(f);
- buf[insize] = 0;
-
- ln = buf;
- while (ln) {
- nln = strchr(ln, '\n');
- if (nln)
- *nln++ = 0;
- processline(ln);
-
- ln = nln;
}
- if ((f = fopen(argv[2], "w"))) {
- if (!fwrite(outbuf, strlen(outbuf), 1, f)) {
- ;
- }
- fclose(f);
- }
- /* printf(outbuf); */
return 0;
}
diff --git a/src/tandem.h b/src/tandem.h
index 336efa7..9165d5b 100755
--- a/src/tandem.h
+++ b/src/tandem.h
< at >< at > -14,7 +14,6 < at >< at > typedef struct tand_t_struct {
time_t buildts;
int localhub;
struct userrec* u;
- char *not_chans;
char commit[10];
char bot[HANDLEN + 1];
char version[151];
diff --git a/src/types.h b/src/types.h
index ac23dc6..fc9e19b 100755
--- a/src/types.h
+++ b/src/types.h
< at >< at > -6,6 +6,7 < at >< at >
#endif
#include <sys/types.h>
+#include <stdint.h>
#include <netinet/in.h>
/* For local console: */
< at >< at > -15,30 +16,12 < at >< at >
/* It's used in so many places, let's put it here */
typedef int (*Function) ();
+typedef intptr_t (*FunctionPtr) ();
#if !HAVE_SOCKLEN_T
typedef int socklen_t;
#endif
-/* 32 bit type */
-#if (SIZEOF_INT == 4)
-typedef unsigned int u_32bit_t;
-#else
-# if (SIZEOF_LONG == 4)
-typedef unsigned long u_32bit_t;
-# else
-# include "cant/find/32bit/type"
-# endif
-#endif
-
-typedef unsigned short int u_16bit_t;
-typedef unsigned char u_8bit_t;
-
-typedef u_32bit_t dword;
-
-/* port */
-typedef in_port_tport_t;
-
// Signed so that it can play nice with time_t
typedef intinterval_t;
diff --git a/src/userent.c b/src/userent.c
index 68f0b75..d19dc8c 100755
--- a/src/userent.c
+++ b/src/userent.c
< at >< at > -299,7 +299,6 < at >< at > static bool set_unpack(struct userrec *u, struct user_entry *e)
head = curr = e->u.list;
e->u.extra = NULL;
- if (conf.bot->hub || conf.bot->localhub || !strcasecmp(conf.bot->nick, u->handle)) {
struct xtra_key *t = NULL;
char *key = NULL, *data = NULL;
< at >< at > -315,7 +314,6 < at >< at > static bool set_unpack(struct userrec *u, struct user_entry *e)
free(t);
curr = curr->next;
}
- }
list_type_kill(head);
return 1;
< at >< at > -365,14 +363,15 < at >< at > static bool set_gotshare(struct userrec *u, struct user_entry *e, char *buf, int
static void set_write_userfile(bd::Stream& stream, const struct userrec *u, const struct user_entry *e, int idx)
{
int localhub = nextbot(u->handle);
- /* only write if saving local, or if sending to hub, or if sending to same user as entry, or the localhub in the chain */
- if (idx == -1 || dcc[idx].hub || dcc[idx].user == u || (localhub != -1 && idx == localhub)) {
struct xtra_key *x = (struct xtra_key *) e->u.extra;
- for (; x; x = x->next)
+ for (; x; x = x->next) {
+ /* only write if saving local, or if sending to hub, or if sending to same user as entry, or the localhub in the chain, or sending 'groups' */
+ if (idx == -1 || dcc[idx].hub || dcc[idx].user == u || (localhub != -1 && idx == localhub) || !strcmp(x->key, "groups")) {
stream << bd::String::printf("--%s %s %s\n", e->type->name, x->key, x->data ? x->data : "");
}
}
+}
static bool set_kill(struct user_entry *e)
{
diff --git a/src/userrec.c b/src/userrec.c
index 053b80e..b47670b 100755
--- a/src/userrec.c
+++ b/src/userrec.c
< at >< at > -77,7 +77,7 < at >< at > int count_users(struct userrec *bu)
return tot;
}
-static struct userrec *check_dcclist_hand(char *handle)
+static struct userrec *check_dcclist_hand(const char *handle)
{
for (int i = 0; i < dcc_total; i++)
if (dcc[i].type && !strcasecmp(dcc[i].nick, handle))
< at >< at > -103,13 +103,11 < at >< at > struct userrec *host_conflicts(char *host)
return NULL;
}
-struct userrec *get_user_by_handle(struct userrec *bu, char *handle)
+struct userrec *get_user_by_handle(struct userrec *bu, const char *handle)
{
if (!handle)
return NULL;
- /* FIXME: This should be done outside of this function. */
- rmspace(handle);
if (!handle[0] || (handle[0] == '*'))
return NULL;
< at >< at > -344,7 +342,7 < at >< at > int u_pass_match(struct userrec *u, const char *in)
/* Pass the salted pass in so the same salt can be used */
int n = salted_sha1cmp(cmp, pass);
- OPENSSL_cleanse(pass, sizeof(pass));
+ OPENSSL_cleanse(pass, strlen(pass));
free(pass_p);
if (!n)
return 1;
< at >< at > -474,9 +472,15 < at >< at > void stream_writeuserfile(bd::Stream& stream, const struct userrec *bu, bool old
/* Rewrite the entire user file. Call USERFILE hook as well, probably
* causing the channel file to be rewritten as well.
*/
-int write_userfile(int idx)
+int real_write_userfile(int idx)
{
- if (userlist == NULL || !conf.bot->hub)
+ if (!userlist) {
+ return 1;
+ }
+
+ conf_update_hubs(userlist);
+
+ if (!conf.bot->hub)
return 1;/* No point in saving userfile */
if (idx >= 0)
< at >< at > -509,6 +513,24 < at >< at > int write_userfile(int idx)
return 0;
}
+int write_userfile(int idx) {
+ if (idx >= 0) {
+ return real_write_userfile(idx);
+ }
+
+ if (!do_write_userfile) {
+ do_write_userfile = 3;
+ } else if (do_write_userfile == 15) {
+ do_write_userfile = 0;
+ return real_write_userfile(idx);
+ } else {
+ ++do_write_userfile;
+ }
+
+ return 0;
+}
+
+
int change_handle(struct userrec *u, char *newh)
{
if (!u)
< at >< at > -539,7 +561,7 < at >< at > int change_handle(struct userrec *u, char *newh)
return 1;
}
-struct userrec *adduser(struct userrec *bu, char *handle, char *host, char *pass, flag_t flags, int bot)
+struct userrec *adduser(struct userrec *bu, const char *handle, char *host, char *pass, flag_t flags, int bot)
{
struct userrec *u = NULL, *x = NULL;
int oldshare = noshare;
diff --git a/src/userrec.h b/src/userrec.h
index e68040c..e437830 100755
--- a/src/userrec.h
+++ b/src/userrec.h
< at >< at > -5,7 +5,7 < at >< at > namespace bd {
class Stream;
}
-struct userrec *adduser(struct userrec *, char *, char *, char *, flag_t, int);
+struct userrec *adduser(struct userrec *, const char *, char *, char *, flag_t, int);
void addhost_by_handle(char *, char *);
void clear_masks(struct maskrec *);
void clear_userlist(struct userrec *);
< at >< at > -16,6 +16,7 < at >< at > int deluser(char *);
int change_handle(struct userrec *, char *);
void correct_handle(char *);
void stream_writeuserfile(bd::Stream&, const struct userrec *, bool = 0);
+int real_write_userfile(int);
int write_userfile(int);
void touch_laston(struct userrec *, char *, time_t);
void user_del_chan(char *);
diff --git a/src/users.h b/src/users.h
index ae557d4..694aeec 100755
--- a/src/users.h
+++ b/src/users.h
< at >< at > -62,8 +62,8 < at >< at > struct bot_addr {
char *address;
char *uplink;
unsigned short hublevel;
- port_t telnet_port;
- port_t relay_port;
+ in_port_t telnet_port;
+ in_port_t relay_port;
};
struct user_entry {
< at >< at > -147,7 +147,7 < at >< at > extern struct igrec *global_ign;
* Note: Flags are in eggdrop.h
*/
-struct userrec *get_user_by_handle(struct userrec *, char *);
+struct userrec *get_user_by_handle(struct userrec *, const char *);
struct userrec *get_user_by_host(char *);
struct userrec *check_chanlist(const char *);
struct userrec *check_chanlist_hand(const char *);
hooks/post-receive
--
Wraith Botpack
</pre>git< at >shatow.net2012-04-07T23:21:14branch 'next' updated. v1.3.4-827-g9958abe
http://permalink.gmane.org/gmane.network.irc.bot.wraith.scm/769
<pre>The branch 'next' has been updated
Summary of changes:
doc/help.txt | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
...from 87f94971e1c4959f57993dee3050b0fef5bea5ee (commit) to (9958abe845a6a0b6e254d91dc7eb22890ebb46f3)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 9958abe845a6a0b6e254d91dc7eb22890ebb46f3
Merge: 87f9497 3aba8b0
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Mon Apr 2 12:57:28 2012 -0500
Merge branch 'master' into next
* master:
Update documentation for chanset 'voice'
-----------------------------------------------------------------------
Complete Diff
diff --git a/doc/help.txt b/doc/help.txt
index 22f7b0b..efb82b2 100644
--- a/doc/help.txt
+++ b/doc/help.txt
< at >< at > -508,11 +508,12 < at >< at > See also: link%{+a}, newhub%{-}
$btake$b Once a bot is opped, it will mass op all other bots
in the channel. After that, they will all attempt to
mass deop in hopes 'taking' the channel. :)
- $bvoice$b This feature is somewhat experimental. With it set
- the +y bot will voice ALL people who join the channel
- unless they are +q globally or +q for the channel.
- If a botnet master devoices them, they will remain
- devoiced no matter who voices them.
+ $bvoice$b With this set, the +y bot will voice ALL clients
+ that join the channel, whether they are a user or not.
+ It will still keep +q|q users devoiced. Any client
+ devoiced by a user op (+o) will remain devoiced even
+ if they cycle. See also: 'voice-non-ident' and
+ 'voice-moderate'
$bvoicebitch$b Enforce voices in a +bitch style. Only +v users
will be allowed to be voiced. This does take +private
into mind as well.
hooks/post-receive
--
Wraith Botpack
</pre>git< at >shatow.net2012-04-02T17:58:38branch 'master' updated. v1.3.4-506-g3aba8b0
http://permalink.gmane.org/gmane.network.irc.bot.wraith.scm/768
<pre>The branch 'master' has been updated
Summary of changes:
doc/help.txt | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
...from 015c73090470d0ee30f68ae02dbbc1d63be48370 (commit) to (3aba8b0c8143d232a6a6dd648432e1f5c2ece405)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 3aba8b0c8143d232a6a6dd648432e1f5c2ece405
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Mon Apr 2 12:54:33 2012 -0500
Update documentation for chanset 'voice'
-----------------------------------------------------------------------
Complete Diff
diff --git a/doc/help.txt b/doc/help.txt
index 22f7b0b..efb82b2 100644
--- a/doc/help.txt
+++ b/doc/help.txt
< at >< at > -508,11 +508,12 < at >< at > See also: link%{+a}, newhub%{-}
$btake$b Once a bot is opped, it will mass op all other bots
in the channel. After that, they will all attempt to
mass deop in hopes 'taking' the channel. :)
- $bvoice$b This feature is somewhat experimental. With it set
- the +y bot will voice ALL people who join the channel
- unless they are +q globally or +q for the channel.
- If a botnet master devoices them, they will remain
- devoiced no matter who voices them.
+ $bvoice$b With this set, the +y bot will voice ALL clients
+ that join the channel, whether they are a user or not.
+ It will still keep +q|q users devoiced. Any client
+ devoiced by a user op (+o) will remain devoiced even
+ if they cycle. See also: 'voice-non-ident' and
+ 'voice-moderate'
$bvoicebitch$b Enforce voices in a +bitch style. Only +v users
will be allowed to be voiced. This does take +private
into mind as well.
hooks/post-receive
--
Wraith Botpack
</pre>git< at >shatow.net2012-04-02T17:58:29branch 'next' updated. v1.3.4-825-g87f9497
http://permalink.gmane.org/gmane.network.irc.bot.wraith.scm/767
<pre>The branch 'next' has been updated
Summary of changes:
src/mod/channels.mod/userchan.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
...from 60e60f1f0605dbcac4aae60c3e8938dfc179de95 (commit) to (87f94971e1c4959f57993dee3050b0fef5bea5ee)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 87f94971e1c4959f57993dee3050b0fef5bea5ee
Merge: 60e60f1 015c730
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Fri Mar 30 12:40:22 2012 -0500
Merge branch 'master' into next
* master:
Fix revenge and limit getting mixed up on save
-----------------------------------------------------------------------
Complete Diff
diff --git a/src/mod/channels.mod/userchan.c b/src/mod/channels.mod/userchan.c
index 343adb4..48a599e 100755
--- a/src/mod/channels.mod/userchan.c
+++ b/src/mod/channels.mod/userchan.c
< at >< at > -735,8 +735,8 < at >< at > flood-exempt %d flood-lock-time %d knock %d fish-key { %s } \
chan->manop,
chan->mdop,
chan->mop,
-chan->revenge,
chan->limitraise,
+chan->revenge,
chan->ban_type,
chan->flood_pub_thr, chan->flood_pub_time,
chan->flood_bytes_thr, chan->flood_bytes_time,
hooks/post-receive
--
Wraith Botpack
</pre>git< at >shatow.net2012-03-30T17:44:01branch 'master' updated. v1.3.4-505-g015c730
http://permalink.gmane.org/gmane.network.irc.bot.wraith.scm/766
<pre>The branch 'master' has been updated
Summary of changes:
src/mod/channels.mod/userchan.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
...from 1b063c046175a6d4df658dd98653b6c7697d5afb (commit) to (015c73090470d0ee30f68ae02dbbc1d63be48370)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 015c73090470d0ee30f68ae02dbbc1d63be48370
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Fri Mar 30 12:40:18 2012 -0500
Fix revenge and limit getting mixed up on save
-----------------------------------------------------------------------
Complete Diff
diff --git a/src/mod/channels.mod/userchan.c b/src/mod/channels.mod/userchan.c
index 343adb4..48a599e 100755
--- a/src/mod/channels.mod/userchan.c
+++ b/src/mod/channels.mod/userchan.c
< at >< at > -735,8 +735,8 < at >< at > flood-exempt %d flood-lock-time %d knock %d fish-key { %s } \
chan->manop,
chan->mdop,
chan->mop,
-chan->revenge,
chan->limitraise,
+chan->revenge,
chan->ban_type,
chan->flood_pub_thr, chan->flood_pub_time,
chan->flood_bytes_thr, chan->flood_bytes_time,
hooks/post-receive
--
Wraith Botpack
</pre>git< at >shatow.net2012-03-30T17:43:51branch 'next' updated. v1.3.4-823-g60e60f1
http://permalink.gmane.org/gmane.network.irc.bot.wraith.scm/765
<pre>The branch 'next' has been updated
Summary of changes:
doc/UPDATES | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
...from 811cadd6e348c5502a83676c895d2a682981e11e (commit) to (60e60f1f0605dbcac4aae60c3e8938dfc179de95)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 60e60f1f0605dbcac4aae60c3e8938dfc179de95
Merge: 811cadd 1b063c0
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Thu Mar 29 10:54:29 2012 -0500
Merge branch 'master' into next
* master:
Conflicts:
doc/UPDATES
-----------------------------------------------------------------------
Complete Diff
diff --git a/doc/UPDATES b/doc/UPDATES
index 9f583e1..c7bacab 100755
--- a/doc/UPDATES
+++ b/doc/UPDATES
< at >< at > -2,11 +2,6 < at >< at > next
* Bot will now jump from the server it's on if it is removed from the server list. (fixes a changing network bug)
* Properly honor exemptions when kicking matched RBL clients
* Fix LASTON not being shared
- * Bots now again respect devoices made by other bots and will not revoice those users.
- * Add chanset 'voice-moderate' which will auto set +m in '+voice' channel and devoice flooding clients instead of kick. (#48)
- * Bots now will enforce devoices made by ops (user +o) and allow any op (user +o) to revoice to disable that enforcement.
- This used to use +m to enforce/allowed revoicing.
- * Bots will now remember a client's flood/devoice settings if they cycle (#49)
1.4.0 - http://wraith.botpack.net/milestone/1.4.0
* Updated server list, 'set -yes servers -' and 'set -yes servers6 -' to get new list.
< at >< at > -57,6 +52,11 < at >< at > next
* Add chanset 'color-limit' to handle how many color codes are allowed in a message before kick (#8)
* Add chanset 'closed-exempt' which will allow exempting non-users (who are opped or voice) from being kicked. (fixes #171)
* Tweak limit range checking such that bot will set limit less often
+ * Bots now again respect devoices made by other bots and will not revoice those users.
+ * Add chanset 'voice-moderate' which will auto set +m in '+voice' channel and devoice flooding clients instead of kick. (#48)
+ * Bots now will enforce devoices made by ops (user +o) and allow any op (user +o) to revoice to disable that enforcement.
+ This used to use +m to enforce/allowed revoicing.
+ * Bots will now remember a client's flood/devoice settings if they cycle (#49)
1.3.4 - http://wraith.botpack.net/milestone/1.3.4
* Fix various compile warnings with newer GCC
hooks/post-receive
--
Wraith Botpack
</pre>git< at >shatow.net2012-03-29T15:56:14branch 'master' updated. v1.3.4-504-g1b063c0
http://permalink.gmane.org/gmane.network.irc.bot.wraith.scm/764
<pre>The branch 'master' has been updated
Summary of changes:
doc/UPDATES | 5 ++
doc/help.txt | 2 +
src/chan.h | 17 ++++++
src/mod/channels.mod/chanmisc.c | 34 +++++++++++-
src/mod/channels.mod/channels.c | 6 ++
src/mod/channels.mod/cmdschan.c | 1 +
src/mod/channels.mod/userchan.c | 3 +-
src/mod/irc.mod/chan.c | 19 +++++--
src/mod/irc.mod/irc.c | 108 ++++++++++++++++++++++++++++++++++-----
src/mod/irc.mod/irc.h | 6 ++-
src/mod/irc.mod/mode.c | 13 ++---
11 files changed, 183 insertions(+), 31 deletions(-)
...from 654a4ea398088f5d3228add856f781b9972aa1f3 (commit) to (1b063c046175a6d4df658dd98653b6c7697d5afb)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 768894cdb30de914d609f38a00cf4ad93928639c
Merge: 654a4ea abfd601
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Thu Mar 29 10:53:14 2012 -0500
Merge branch '48-voice-updates'
* 48-voice-updates:
Enforce 'chanmode' minutely (#48)
Don't kick a user if already devoiced and -m (#48)
Don't unset +m when unlocking channel from flood (#48)
Allow any user op (+o) to enable/disable EVOICE (#48)
Properly log response to flood (#48)
Document 'voice-moderate' (#48)
Respect devoices from other bots (#48)
Set EVOICE on abusive clients (#48)
Implement devoicing on flood (#48)
DRY flood punishment (#48)
Auto set +m when 'voice-moderate' is set (#48)
Auto unset 'voice-moderate' if 'chanmode -m' is set (#48)
Add chanset 'voice-moderate' (#48)
commit 1b063c046175a6d4df658dd98653b6c7697d5afb
Merge: 768894c 11309bf
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Thu Mar 29 10:53:55 2012 -0500
Merge branch '49-member-caching'
* 49-member-caching:
Delete expired cached members after wait_split (900 seconds) (#49)
Remove from cached members if killing a member without caching (#49)
Update member from cache if possible (#49)
Cache members when removing them (#49)
DRY member destruction (#49)
Conflicts:
doc/UPDATES
-----------------------------------------------------------------------
Complete Diff
diff --git a/doc/UPDATES b/doc/UPDATES
index f996ed6..2177230 100755
--- a/doc/UPDATES
+++ b/doc/UPDATES
< at >< at > -47,6 +47,11 < at >< at >
* Add chanset 'color-limit' to handle how many color codes are allowed in a message before kick (#8)
* Add chanset 'closed-exempt' which will allow exempting non-users (who are opped or voice) from being kicked. (fixes #171)
* Tweak limit range checking such that bot will set limit less often
+ * Bots now again respect devoices made by other bots and will not revoice those users.
+ * Add chanset 'voice-moderate' which will auto set +m in '+voice' channel and devoice flooding clients instead of kick. (#48)
+ * Bots now will enforce devoices made by ops (user +o) and allow any op (user +o) to revoice to disable that enforcement.
+ This used to use +m to enforce/allowed revoicing.
+ * Bots will now remember a client's flood/devoice settings if they cycle (#49)
1.3.4 - http://wraith.botpack.net/milestone/1.3.4
* Fix various compile warnings with newer GCC
diff --git a/doc/help.txt b/doc/help.txt
index d3914a2..22f7b0b 100644
--- a/doc/help.txt
+++ b/doc/help.txt
< at >< at > -437,6 +437,8 < at >< at > See also: link%{+a}, newhub%{-}
channel is +protect.
$bvoice-non-ident$b If channel is +voice, clients without an ident will
be voiced. Set to 0 to not voice clients without ident.
+ $bvoice-moderate$b If channel is +voice, auto set +m and devoice flooders
+ instead of kicking them. Set to 0 to disable.
The following options choose how to respond to specific events.
Each can be set as any of the specified options.
diff --git a/src/chan.h b/src/chan.h
index 3904660..19deb31 100755
--- a/src/chan.h
+++ b/src/chan.h
< at >< at > -31,6 +31,19 < at >< at > typedef struct memstruct {
bd::HashTable<flood_t, int> *floodnum; // floodnum[FLOOD_PRIVMSG] = 1;
} memberlist;
+#include <bdlib/src/bdlib.h>
+BDLIB_NS_BEGIN
+template<typename T>
+ struct Hash;
+
+template<>
+ struct Hash<memberlist*>
+ {
+ // Use memory address
+ inline size_t operator()(memberlist* m) const { return reinterpret_cast<size_t>(m); }
+ };
+BDLIB_NS_END
+
#define CHAN_FLAG_OP1
#define CHAN_FLAG_VOICE 2
#define CHAN_FLAG_USER 3
< at >< at > -128,6 +141,9 < at >< at > struct chan_t {
// Shared non-member counts (JOIN/PART)
bd::HashTable<bd::String, bd::HashTable<flood_t, time_t> > *floodtime; // floodtime[uhost][FLOOD_PRIVMSG] = now;
bd::HashTable<bd::String, bd::HashTable<flood_t, int> > *floodnum; // floodnum[uhost][FLOOD_PRIVMSG] = 1;
+
+ // Member caching to cache cyclers
+ bd::HashTable<bd::String, memberlist*> *cached_members;
};
#define CHANINV BIT0/* +i*/
< at >< at > -197,6 +213,7 < at >< at > struct chanset_t {
int closed_private;
int closed_invite;
int closed_exempt_mode;
+ int voice_moderate;
deflag_t bad_cookie;
deflag_t manop;
deflag_t mdop;
diff --git a/src/mod/channels.mod/chanmisc.c b/src/mod/channels.mod/chanmisc.c
index 630e64c..c5cd64f 100755
--- a/src/mod/channels.mod/chanmisc.c
+++ b/src/mod/channels.mod/chanmisc.c
< at >< at > -452,6 +452,16 < at >< at > int channel_modify(char *result, struct chanset_t *chan, int items, char **item,
return ERROR;
}
chan->closed_ban = atoi(item[i]);
+ } else if (!strcmp(item[i], "voice-moderate")) {
+ i++;
+ if (i >= items) {
+ if (result)
+ strlcpy(result, "channel voice-moderate needs argument", RESULT_LEN);
+ return ERROR;
+ }
+ chan->voice_moderate = atoi(item[i]);
+ if (chan->mode_mns_prot & CHANMODER && chan->voice_moderate)
+ chan->voice_moderate = 0;
} else if (!strcmp(item[i], "closed-invite")) {
i++;
if (i >= items) {
< at >< at > -960,6 +970,7 < at >< at > static void init_channel(struct chanset_t *chan, bool reset)
chan->channel.topic = NULL;
chan->channel.floodtime = new bd::HashTable<bd::String, bd::HashTable<flood_t, time_t> >;
chan->channel.floodnum = new bd::HashTable<bd::String, bd::HashTable<flood_t, int> >;
+ chan->channel.cached_members = new bd::HashTable<bd::String, memberlist*>;
}
static void clear_masklist(masklist *m)
< at >< at > -986,9 +997,7 < at >< at > void clear_channel(struct chanset_t *chan, bool reset)
free(chan->channel.topic);
for (m = chan->channel.member; m; m = m1) {
m1 = m->next;
- delete m->floodtime;
- delete m->floodnum;
- free(m);
+ delete_member(m);
}
clear_masklist(chan->channel.ban);
< at >< at > -1008,6 +1017,24 < at >< at > void clear_channel(struct chanset_t *chan, bool reset)
delete chan->channel.floodnum;
chan->channel.floodnum = NULL;
+ if (chan->channel.cached_members) {
+ if (chan->channel.cached_members->size()) {
+ bd::Array<bd::String> member_uhosts(chan->channel.cached_members->keys());
+ for (size_t i = 0; i < member_uhosts.length(); ++i) {
+ const bd::String uhost(member_uhosts[i]);
+
+ // Delete the cached member
+ m = (*chan->channel.cached_members)[uhost];
+ delete_member(m);
+
+ // Remove the cached member (not technically needed as it is deleted below, but for completeness.)
+ chan->channel.cached_members->remove(uhost);
+ }
+ }
+ delete chan->channel.cached_members;
+ chan->channel.cached_members = NULL;
+ }
+
if (reset)
init_channel(chan, 1);
for (size_t i = 0; i < MODES_PER_LINE_MAX; ++i) {
< at >< at > -1082,6 +1109,7 < at >< at > int channel_add(char *result, const char *newname, char *options, bool isdefault
chan->closed_ban = 0;
chan->closed_private = 1;
chan->closed_invite = 1;
+ chan->voice_moderate = 1;
chan->voice_non_ident = 1;
chan->auto_delay = 5;
chan->ban_type = 3;
diff --git a/src/mod/channels.mod/channels.c b/src/mod/channels.mod/channels.c
index a079685..c00f429 100755
--- a/src/mod/channels.mod/channels.c
+++ b/src/mod/channels.mod/channels.c
< at >< at > -567,6 +567,9 < at >< at > static void set_mode_protect(struct chanset_t *chan, char *set)
if (chan->mode_mns_prot & CHANINV && chan->closed_invite)
chan->closed_invite = 0;
+
+ if (chan->mode_mns_prot & CHANMODER && chan->voice_moderate)
+ chan->voice_moderate = 0;
}
static void get_mode_protect(struct chanset_t *chan, char *s, size_t ssiz)
< at >< at > -790,6 +793,9 < at >< at > void channels_report(int idx, int details)
if (chan->closed_private)
strlcat(s2, "p", sizeof(s2));
}
+ if (channel_voice(chan) && chan->voice_moderate) {
+ strlcat(s2, "m", sizeof(s2));
+ }
if (conf.bot->hub || shouldjoin(chan)) {
if (channel_active(chan)) {
diff --git a/src/mod/channels.mod/cmdschan.c b/src/mod/channels.mod/cmdschan.c
index cbc117d..c49ae5a 100755
--- a/src/mod/channels.mod/cmdschan.c
+++ b/src/mod/channels.mod/cmdschan.c
< at >< at > -1258,6 +1258,7 < at >< at > static void cmd_chaninfo(int idx, char *par)
SHOW_INT("Revenge: ", chan->revenge, DEFLAG_STR, "Ignore");
SHOW_INT("Protect-backup: ", chan->protect_backup, "Do!", "Don't!");
SHOW_INT("Voice-non-ident: ", chan->voice_non_ident, "Do!", "Don't!");
+ SHOW_INT("Voice-moderate:", chan->voice_moderate, NULL, "Don't!");
dprintf(idx, "Flood settings: chan bytes ctcp join kick deop nick mjoin mpub mbytes mctcp\n");
dprintf(idx, " number: %3d %4d %3d %3d %3d %3d %3d %3d %3d %4d %3d\n",
diff --git a/src/mod/channels.mod/userchan.c b/src/mod/channels.mod/userchan.c
index 1c6bfd2..343adb4 100755
--- a/src/mod/channels.mod/userchan.c
+++ b/src/mod/channels.mod/userchan.c
< at >< at > -719,7 +719,7 < at >< at > flood-chan %d:%d flood-bytes %d:%d flood-ctcp %d:%d flood-join %d:%d \
flood-kick %d:%d flood-deop %d:%d flood-nick %d:%d flood-mjoin %d:%d \
flood-mpub %d:%d flood-mbytes %d:%d flood-mctcp %d:%d \
capslimit %d colorlimit %d closed-ban %d closed-invite %d closed-private %d closed-exempt %d ban-time %d \
-exempt-time %d invite-time %d voice-non-ident %d auto-delay %d \
+exempt-time %d invite-time %d voice-non-ident %d voice-moderate %d auto-delay %d \
flood-exempt %d flood-lock-time %d knock %d fish-key { %s } \
%cmeankicks %cenforcebans %cdynamicbans %cuserbans %cbitch %cfloodban \
%cprivate %ccycle %cinactive %cdynamicexempts %cuserexempts \
< at >< at > -763,6 +763,7 < at >< at > flood-exempt %d flood-lock-time %d knock %d fish-key { %s } \
chan->exempt_time,
chan->invite_time,
chan->voice_non_ident,
+ chan->voice_moderate,
chan->auto_delay,
chan->flood_exempt_mode,
chan->flood_lock_time,
diff --git a/src/mod/irc.mod/chan.c b/src/mod/irc.mod/chan.c
index afa8598..628ca70 100755
--- a/src/mod/irc.mod/chan.c
+++ b/src/mod/irc.mod/chan.c
< at >< at > -285,6 +285,12 < at >< at > static memberlist *newmember(struct chanset_t *chan, char *nick)
return n;
}
+void delete_member(memberlist* m) {
+ delete m->floodtime;
+ delete m->floodnum;
+ free(m);
+}
+
static bool member_getuser(memberlist* m, bool act_on_lookup) {
if (!m) return 0;
if (!m->user && !m->tried_getuser) {
< at >< at > -730,9 +736,8 < at >< at > static bool detect_chan_flood(memberlist* m, const char *from, struct chanset_t
char *s1 = quickban(chan, from);
u_addmask('b', chan, s1, conf.bot->nick, "channel flood", now + (60 * chan->ban_time), 0);
} else {
- putlog(LOG_MODES, chan->dname, "Channel flood from %s -- kicking", m->nick);
- dprintf(DP_MODE, "KICK %s %s :%s%s\n", chan->name, m->nick, kickprefix, response(RES_FLOOD));
- m->flags |= SENTKICK;
+ const char *response = punish_flooder(chan, m);
+ putlog(LOG_MODES, chan->dname, "Channel flood from %s -- %s", m->nick, response);
}
}
return 1;
< at >< at > -1121,6 +1126,10 < at >< at > void recheck_channel_modes(struct chanset_t *chan)
mns &= ~CHANPRIV;
}
}
+ if (channel_voice(chan) && chan->voice_moderate) {
+ pls |= CHANMODER;
+ mns &= ~CHANMODER;
+ }
if (!(chan->ircnet_status & CHAN_ASKEDMODES)) {
if (pls & CHANINV && !(cur & CHANINV))
< at >< at > -1944,6 +1953,7 < at >< at > static int got352or4(struct chanset_t *chan, char *user, char *host, char *nick,
/* Store the userhost */
simple_snprintf(m->userhost, sizeof(m->userhost), "%s< at >%s", user, host);
simple_snprintf(m->from, sizeof(m->from), "%s!%s", m->nick, m->userhost);
+ member_update_from_cache(chan, m);
if (!m->userip[0]) {
if (ip)
< at >< at > -2729,6 +2739,7 < at >< at > static int gotjoin(char *from, char *chname)
m = newmember(chan, nick);
m->joined = m->last = now;
strlcpy(m->userhost, uhost, sizeof(m->userhost));
+ member_update_from_cache(chan, m);
simple_snprintf(m->from, sizeof(m->from), "%s!%s", m->nick, m->userhost);
if (is_dotted_ip(host)) {
strlcpy(m->userip, uhost, sizeof(m->userip));
< at >< at > -3050,7 +3061,7 < at >< at > static int gotnick(char *from, char *msg)
if (rfc_casecmp(nick, msg)) {
/* Someone on channel with old nick?! */
if ((mm = ismember(chan, msg)))
- killmember(chan, mm->nick);
+ killmember(chan, mm->nick, false);
}
strlcpy(m->nick, msg, sizeof(m->nick));
diff --git a/src/mod/irc.mod/irc.c b/src/mod/irc.mod/irc.c
index c7b0ed3..e3d2605 100755
--- a/src/mod/irc.mod/irc.c
+++ b/src/mod/irc.mod/irc.c
< at >< at > -184,29 +184,56 < at >< at > detect_offense(memberlist* m, struct chanset_t *chan, char *msg)
if (chan->capslimit && caps_count && tot >= 6) {
caps_percentage = (caps_count)/(double(tot));
if (caps_percentage >= caps_limit) {
- putlog(LOG_MODES, chan->name, "Caps flood (%d%%) from %s -- kicking", int(caps_percentage * 100), m->nick);
- dprintf(DP_SERVER, "KICK %s %s :%s%s\n", chan->name, m->nick, kickprefix, response(RES_FLOOD));
- m->flags |= SENTKICK;
+ const char *response = punish_flooder(chan, m);
+ putlog(LOG_MODES, chan->name, "Caps flood (%d%%) from %s -- %s", int(caps_percentage * 100), m->nick, response);
return 1;
}
} else if (chan->colorlimit && color_count) {
if (color_count >= chan->colorlimit) {
- putlog(LOG_MODES, chan->name, "Color flood (%d) from %s -- kicking", color_count, m->nick);
- dprintf(DP_SERVER, "KICK %s %s :%s%s\n", chan->name, m->nick, kickprefix, response(RES_FLOOD));
- m->flags |= SENTKICK;
+ const char *response = punish_flooder(chan, m);
+ putlog(LOG_MODES, chan->name, "Color flood (%d) from %s -- %s", color_count, m->nick, response);
return 1;
}
}
return 0;
}
+void set_devoice(struct chanset_t *chan, memberlist* m) {
+ if (!(m->flags & EVOICE)) {
+ putlog(LOG_DEBUG, "< at >", "Giving EVOICE flag to: %s (%s)", m->nick, chan->dname);
+ m->flags |= EVOICE;
+ }
+}
+
+const char* punish_flooder(struct chanset_t* chan, memberlist* m, const char *reason) {
+ if (channel_voice(chan) && chan->voice_moderate) {
+ if (!chan_sentdevoice(m)) {
+ add_mode(chan, '-', 'v', m->nick);
+ m->flags |= SENTDEVOICE;
+ set_devoice(chan, m);
+ return "devoicing";
+ } else {
+ return "devoiced";
+ }
+ } else {
+ if (!chan_sentkick(m)) {
+ dprintf(DP_SERVER, "KICK %s %s :%s%s\n", chan->name, m->nick, kickprefix, reason ? reason : response(RES_FLOOD));
+ m->flags |= SENTKICK;
+ return "kicking";
+ } else {
+ return "kicked";
+ }
+ }
+ return "ignoring";
+}
+
void unlock_chan(struct chanset_t *chan)
{
if (chan->channel.drone_set_mode) {
char buf[3] = "", *p = buf;
if ((chan->channel.drone_set_mode & CHANINV) && !(chan->mode_pls_prot & CHANINV))
*p++ = 'i';
- if ((chan->channel.drone_set_mode & CHANMODER) && !(chan->mode_pls_prot & CHANMODER))
+ if ((chan->channel.drone_set_mode & CHANMODER) && !((chan->mode_pls_prot & CHANMODER) || (channel_voice(chan) && chan->voice_moderate)))
*p++ = 'm';
*p = 0;
dprintf(DP_MODE, "MODE %s :-%s\n", chan->name[0] ? chan->name : chan->dname, buf);
< at >< at > -1119,7 +1146,7 < at >< at > new_mask(masklist *m, char *s, char *who)
/* Removes a nick from the channel member list (returns 1 if successful)
*/
static bool
-killmember(struct chanset_t *chan, char *nick)
+killmember(struct chanset_t *chan, char *nick, bool cacheMember)
{
memberlist *x = NULL, *old = NULL;
< at >< at > -1135,10 +1162,17 < at >< at > killmember(struct chanset_t *chan, char *nick)
old->next = x->next;
else
chan->channel.member = x->next;
- delete x->floodtime;
- delete x->floodnum;
- free(x);
- chan->channel.members--;
+
+ if (cacheMember) {
+ x->last = now;
+ // Don't delete here, will delete when it expires from the cache.
+ (*chan->channel.cached_members)[x->userhost] = x;
+ } else {
+ chan->channel.cached_members->remove(x->userhost);
+ delete_member(x);
+ }
+
+ --chan->channel.members;
/* The following two errors should NEVER happen. We will try to correct
* them though, to keep the bot from crashing.
< at >< at > -1161,6 +1195,32 < at >< at > killmember(struct chanset_t *chan, char *nick)
return 1;
}
+/**
+ * Update the member with cached information from a parted/quitted member
+ */
+static void member_update_from_cache(struct chanset_t* chan, memberlist *m) {
+ using std::swap;
+
+ // Are they in the cache?
+ const bd::String userhost(m->userhost);
+ if (chan->channel.cached_members->contains(userhost)) {
+ memberlist *cached_member = (*chan->channel.cached_members)[userhost];
+
+ // Update important flood tracking information
+ swap(m->floodtime, cached_member->floodtime);
+ swap(m->floodnum, cached_member->floodnum);
+
+ // Update EVOICE flag
+ if (cached_member->flags & EVOICE) {
+ m->flags |= EVOICE;
+ }
+
+ // No longer need the cached member
+ delete_member(cached_member);
+ chan->channel.cached_members->remove(userhost);
+ }
+}
+
/* Check whether I'm voice. Returns boolean 1 or 0.
*/
bool
< at >< at > -1437,10 +1497,11 < at >< at > void check_shouldjoin(struct chanset_t* chan)
static void
check_expired_chanstuff(struct chanset_t *chan)
{
+ memberlist *m = NULL;
check_shouldjoin(chan);
if (channel_active(chan) && shouldjoin(chan)) {
masklist *b = NULL, *e = NULL;
- memberlist *m = NULL, *n = NULL;
+ memberlist *n = NULL;
struct flag_record fr = { FR_GLOBAL | FR_CHAN, 0, 0, 0 };
if (me_op(chan)) {
< at >< at > -1502,7 +1563,7 < at >< at > check_expired_chanstuff(struct chanset_t *chan)
if (now - m->split > wait_split) {
putlog(LOG_JOIN, chan->dname, "%s (%s) got lost in the net-split.", m->nick, m->userhost);
--(chan->channel.splitmembers);
- killmember(chan, m->nick);
+ killmember(chan, m->nick, false);
continue;
}
}
< at >< at > -1554,6 +1615,25 < at >< at > check_expired_chanstuff(struct chanset_t *chan)
if (bot_ops && !im_opped) {
request_op(chan);
}
+
+ if (role == 3) {
+ recheck_channel_modes(chan);
+ }
+ }
+ // Clear out expired cached members
+ if (chan->channel.cached_members && chan->channel.cached_members->size()) {
+ bd::Array<bd::String> member_uhosts(chan->channel.cached_members->keys());
+ for (size_t i = 0; i < member_uhosts.length(); ++i) {
+ const bd::String uhost(member_uhosts[i]);
+
+ m = (*chan->channel.cached_members)[uhost];
+
+ // Delete the expired member
+ if (now - m->last > wait_split) {
+ delete_member(m);
+ chan->channel.cached_members->remove(uhost);
+ }
+ }
}
}
diff --git a/src/mod/irc.mod/irc.h b/src/mod/irc.mod/irc.h
index 2bf4daf..995876a 100755
--- a/src/mod/irc.mod/irc.h
+++ b/src/mod/irc.mod/irc.h
< at >< at > -92,7 +92,8 < at >< at > static bool detect_chan_flood(memberlist *m, const char* from, struct chanset_t
static bool new_mask(masklist *, char *, char *);
static void do_closed_kick(struct chanset_t *, memberlist *);
static char *quickban(struct chanset_t *, const char *);
-static bool killmember(struct chanset_t *chan, char *nick);
+static bool killmember(struct chanset_t *chan, char *nick, bool cacheMember = true);
+static void member_update_from_cache(struct chanset_t* chan, memberlist *m);
static void check_lonely_channel(struct chanset_t *chan);
static int gotmode(char *, char *);
void unset_im(struct chanset_t* chan);
< at >< at > -107,6 +108,8 < at >< at > typedef struct resolvstruct resolv_member;
void resolve_to_rbl(struct chanset_t *chan, const char *host, struct resolvstruct *r = NULL);
static void do_mask(struct chanset_t *chan, masklist *m, char *mask, char Mode);
static void get_channel_masks(struct chanset_t* chan);
+const char* punish_flooder(struct chanset_t* chan, memberlist* m, const char *reason = NULL);
+void set_devoice(struct chanset_t* chan, memberlist* m);
#endif /* MAKING_IRC */
< at >< at > -155,6 +158,7 < at >< at > void flush_modes();
void reset_chan_info(struct chanset_t *);
char *getnick(const char *, struct chanset_t *);
void check_shouldjoin(struct chanset_t* chan);
+void delete_member(memberlist* m);
extern intmax_bans, max_exempts, max_invites, max_modes;
extern booluse_354, include_lk;
diff --git a/src/mod/irc.mod/mode.c b/src/mod/irc.mod/mode.c
index 85add9a..ecdf8ac 100755
--- a/src/mod/irc.mod/mode.c
+++ b/src/mod/irc.mod/mode.c
< at >< at > -1482,8 +1482,7 < at >< at > gotmode(char *from, char *msg)
if (msign == '+') {
if (mv->flags & EVOICE) {
- /* FIXME: This is a lame check, we need to expand on this more */
- if (!chan_master(user) && !glob_master(user) && !chk_voice(victim, chan)) {
+ if (!chk_op(user, chan) && !chk_voice(victim, chan)) {
dv = 1;
} else {
mv->flags &= ~EVOICE;
< at >< at > -1509,14 +1508,12 < at >< at > gotmode(char *from, char *msg)
add_mode(chan, '+', 'v', mparam);
/* if they arent +v|v and VOICER is m+ then EVOICE them */
} else {
- /* FIXME: same thing here */
- if (!match_my_nick(nick) && channel_voice(chan) && !glob_bot(user) &&
- (glob_master(user) || chan_master(user)) &&
+ if (!match_my_nick(nick) && channel_voice(chan) &&
+ (chk_op(user, chan) || glob_bot(user)) &&
rfc_casecmp(nick, mparam)) {
/* if the user is not +q set them norEVOICE. */
- if (!chan_quiet(victim) && !(mv->flags & EVOICE)) {
- putlog(LOG_DEBUG, "< at >", "Giving EVOICE flag to: %s (%s)", mv->nick, chan->dname);
- mv->flags |= EVOICE;
+ if (!chan_quiet(victim)) {
+ set_devoice(chan, mv);
}
}
}
hooks/post-receive
--
Wraith Botpack
</pre>git< at >shatow.net2012-03-29T15:56:04branch 'next' updated. v1.3.4-820-g811cadd
http://permalink.gmane.org/gmane.network.irc.bot.wraith.scm/763
<pre>The branch 'next' has been updated
Summary of changes:
doc/UPDATES | 1 +
src/chan.h | 16 ++++++++++
src/mod/channels.mod/chanmisc.c | 23 ++++++++++++--
src/mod/irc.mod/chan.c | 10 +++++-
src/mod/irc.mod/irc.c | 63 ++++++++++++++++++++++++++++++++++----
src/mod/irc.mod/irc.h | 4 ++-
6 files changed, 105 insertions(+), 12 deletions(-)
...from f751f4b00745ec0be48e2643c2a5dd2bff2d0081 (commit) to (811cadd6e348c5502a83676c895d2a682981e11e)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 30fc50e642a1cb3f6490a204f3825ad81085e040
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Wed Mar 28 14:16:54 2012 -0500
DRY member destruction (#49)
commit 3caf6fb8b9ac156e3cab9681dcc7573ec825d24d
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Wed Mar 28 14:21:00 2012 -0500
Cache members when removing them (#49)
commit 015109ee55ea9e0fdf1b37345b715ff6c7be9ff5
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Wed Mar 28 14:57:05 2012 -0500
Update member from cache if possible (#49)
This is only updating flood/EVOICE data to avoid using stale data.
commit f0e5f2732cd694d7dc6c7df63d379737e52e474c
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Wed Mar 28 15:02:36 2012 -0500
Remove from cached members if killing a member without caching (#49)
commit 11309bf0f3231a3a731b3a49bc4cb4819720f4b6
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Wed Mar 28 15:07:19 2012 -0500
Delete expired cached members after wait_split (900 seconds) (#49)
commit 811cadd6e348c5502a83676c895d2a682981e11e
Merge: f751f4b 11309bf
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Wed Mar 28 16:29:25 2012 -0500
Merge branch '49-member-caching' into next
* 49-member-caching:
Delete expired cached members after wait_split (900 seconds) (#49)
Remove from cached members if killing a member without caching (#49)
Update member from cache if possible (#49)
Cache members when removing them (#49)
DRY member destruction (#49)
Conflicts:
doc/UPDATES
-----------------------------------------------------------------------
Complete Diff
diff --git a/doc/UPDATES b/doc/UPDATES
index 488c803..9f583e1 100755
--- a/doc/UPDATES
+++ b/doc/UPDATES
< at >< at > -6,6 +6,7 < at >< at > next
* Add chanset 'voice-moderate' which will auto set +m in '+voice' channel and devoice flooding clients instead of kick. (#48)
* Bots now will enforce devoices made by ops (user +o) and allow any op (user +o) to revoice to disable that enforcement.
This used to use +m to enforce/allowed revoicing.
+ * Bots will now remember a client's flood/devoice settings if they cycle (#49)
1.4.0 - http://wraith.botpack.net/milestone/1.4.0
* Updated server list, 'set -yes servers -' and 'set -yes servers6 -' to get new list.
diff --git a/src/chan.h b/src/chan.h
index ffed9cb..19deb31 100755
--- a/src/chan.h
+++ b/src/chan.h
< at >< at > -31,6 +31,19 < at >< at > typedef struct memstruct {
bd::HashTable<flood_t, int> *floodnum; // floodnum[FLOOD_PRIVMSG] = 1;
} memberlist;
+#include <bdlib/src/bdlib.h>
+BDLIB_NS_BEGIN
+template<typename T>
+ struct Hash;
+
+template<>
+ struct Hash<memberlist*>
+ {
+ // Use memory address
+ inline size_t operator()(memberlist* m) const { return reinterpret_cast<size_t>(m); }
+ };
+BDLIB_NS_END
+
#define CHAN_FLAG_OP1
#define CHAN_FLAG_VOICE 2
#define CHAN_FLAG_USER 3
< at >< at > -128,6 +141,9 < at >< at > struct chan_t {
// Shared non-member counts (JOIN/PART)
bd::HashTable<bd::String, bd::HashTable<flood_t, time_t> > *floodtime; // floodtime[uhost][FLOOD_PRIVMSG] = now;
bd::HashTable<bd::String, bd::HashTable<flood_t, int> > *floodnum; // floodnum[uhost][FLOOD_PRIVMSG] = 1;
+
+ // Member caching to cache cyclers
+ bd::HashTable<bd::String, memberlist*> *cached_members;
};
#define CHANINV BIT0/* +i*/
diff --git a/src/mod/channels.mod/chanmisc.c b/src/mod/channels.mod/chanmisc.c
index 609a30a..c5cd64f 100755
--- a/src/mod/channels.mod/chanmisc.c
+++ b/src/mod/channels.mod/chanmisc.c
< at >< at > -970,6 +970,7 < at >< at > static void init_channel(struct chanset_t *chan, bool reset)
chan->channel.topic = NULL;
chan->channel.floodtime = new bd::HashTable<bd::String, bd::HashTable<flood_t, time_t> >;
chan->channel.floodnum = new bd::HashTable<bd::String, bd::HashTable<flood_t, int> >;
+ chan->channel.cached_members = new bd::HashTable<bd::String, memberlist*>;
}
static void clear_masklist(masklist *m)
< at >< at > -996,9 +997,7 < at >< at > void clear_channel(struct chanset_t *chan, bool reset)
free(chan->channel.topic);
for (m = chan->channel.member; m; m = m1) {
m1 = m->next;
- delete m->floodtime;
- delete m->floodnum;
- free(m);
+ delete_member(m);
}
clear_masklist(chan->channel.ban);
< at >< at > -1018,6 +1017,24 < at >< at > void clear_channel(struct chanset_t *chan, bool reset)
delete chan->channel.floodnum;
chan->channel.floodnum = NULL;
+ if (chan->channel.cached_members) {
+ if (chan->channel.cached_members->size()) {
+ bd::Array<bd::String> member_uhosts(chan->channel.cached_members->keys());
+ for (size_t i = 0; i < member_uhosts.length(); ++i) {
+ const bd::String uhost(member_uhosts[i]);
+
+ // Delete the cached member
+ m = (*chan->channel.cached_members)[uhost];
+ delete_member(m);
+
+ // Remove the cached member (not technically needed as it is deleted below, but for completeness.)
+ chan->channel.cached_members->remove(uhost);
+ }
+ }
+ delete chan->channel.cached_members;
+ chan->channel.cached_members = NULL;
+ }
+
if (reset)
init_channel(chan, 1);
for (size_t i = 0; i < MODES_PER_LINE_MAX; ++i) {
diff --git a/src/mod/irc.mod/chan.c b/src/mod/irc.mod/chan.c
index 465a400..9058e89 100755
--- a/src/mod/irc.mod/chan.c
+++ b/src/mod/irc.mod/chan.c
< at >< at > -293,6 +293,12 < at >< at > static memberlist *newmember(struct chanset_t *chan, char *nick)
return n;
}
+void delete_member(memberlist* m) {
+ delete m->floodtime;
+ delete m->floodnum;
+ free(m);
+}
+
static bool member_getuser(memberlist* m, bool act_on_lookup) {
if (!m) return 0;
if (!m->user && !m->tried_getuser) {
< at >< at > -1955,6 +1961,7 < at >< at > static int got352or4(struct chanset_t *chan, char *user, char *host, char *nick,
/* Store the userhost */
simple_snprintf(m->userhost, sizeof(m->userhost), "%s< at >%s", user, host);
simple_snprintf(m->from, sizeof(m->from), "%s!%s", m->nick, m->userhost);
+ member_update_from_cache(chan, m);
if (!m->userip[0]) {
if (ip)
< at >< at > -2740,6 +2747,7 < at >< at > static int gotjoin(char *from, char *chname)
m = newmember(chan, nick);
m->joined = m->last = now;
strlcpy(m->userhost, uhost, sizeof(m->userhost));
+ member_update_from_cache(chan, m);
simple_snprintf(m->from, sizeof(m->from), "%s!%s", m->nick, m->userhost);
if (is_dotted_ip(host)) {
strlcpy(m->userip, uhost, sizeof(m->userip));
< at >< at > -3061,7 +3069,7 < at >< at > static int gotnick(char *from, char *msg)
if (rfc_casecmp(nick, msg)) {
/* Someone on channel with old nick?! */
if ((mm = ismember(chan, msg)))
- killmember(chan, mm->nick);
+ killmember(chan, mm->nick, false);
}
strlcpy(m->nick, msg, sizeof(m->nick));
diff --git a/src/mod/irc.mod/irc.c b/src/mod/irc.mod/irc.c
index e21b6d2..e3d2605 100755
--- a/src/mod/irc.mod/irc.c
+++ b/src/mod/irc.mod/irc.c
< at >< at > -1146,7 +1146,7 < at >< at > new_mask(masklist *m, char *s, char *who)
/* Removes a nick from the channel member list (returns 1 if successful)
*/
static bool
-killmember(struct chanset_t *chan, char *nick)
+killmember(struct chanset_t *chan, char *nick, bool cacheMember)
{
memberlist *x = NULL, *old = NULL;
< at >< at > -1162,10 +1162,17 < at >< at > killmember(struct chanset_t *chan, char *nick)
old->next = x->next;
else
chan->channel.member = x->next;
- delete x->floodtime;
- delete x->floodnum;
- free(x);
- chan->channel.members--;
+
+ if (cacheMember) {
+ x->last = now;
+ // Don't delete here, will delete when it expires from the cache.
+ (*chan->channel.cached_members)[x->userhost] = x;
+ } else {
+ chan->channel.cached_members->remove(x->userhost);
+ delete_member(x);
+ }
+
+ --chan->channel.members;
/* The following two errors should NEVER happen. We will try to correct
* them though, to keep the bot from crashing.
< at >< at > -1188,6 +1195,32 < at >< at > killmember(struct chanset_t *chan, char *nick)
return 1;
}
+/**
+ * Update the member with cached information from a parted/quitted member
+ */
+static void member_update_from_cache(struct chanset_t* chan, memberlist *m) {
+ using std::swap;
+
+ // Are they in the cache?
+ const bd::String userhost(m->userhost);
+ if (chan->channel.cached_members->contains(userhost)) {
+ memberlist *cached_member = (*chan->channel.cached_members)[userhost];
+
+ // Update important flood tracking information
+ swap(m->floodtime, cached_member->floodtime);
+ swap(m->floodnum, cached_member->floodnum);
+
+ // Update EVOICE flag
+ if (cached_member->flags & EVOICE) {
+ m->flags |= EVOICE;
+ }
+
+ // No longer need the cached member
+ delete_member(cached_member);
+ chan->channel.cached_members->remove(userhost);
+ }
+}
+
/* Check whether I'm voice. Returns boolean 1 or 0.
*/
bool
< at >< at > -1464,10 +1497,11 < at >< at > void check_shouldjoin(struct chanset_t* chan)
static void
check_expired_chanstuff(struct chanset_t *chan)
{
+ memberlist *m = NULL;
check_shouldjoin(chan);
if (channel_active(chan) && shouldjoin(chan)) {
masklist *b = NULL, *e = NULL;
- memberlist *m = NULL, *n = NULL;
+ memberlist *n = NULL;
struct flag_record fr = { FR_GLOBAL | FR_CHAN, 0, 0, 0 };
if (me_op(chan)) {
< at >< at > -1529,7 +1563,7 < at >< at > check_expired_chanstuff(struct chanset_t *chan)
if (now - m->split > wait_split) {
putlog(LOG_JOIN, chan->dname, "%s (%s) got lost in the net-split.", m->nick, m->userhost);
--(chan->channel.splitmembers);
- killmember(chan, m->nick);
+ killmember(chan, m->nick, false);
continue;
}
}
< at >< at > -1586,6 +1620,21 < at >< at > check_expired_chanstuff(struct chanset_t *chan)
recheck_channel_modes(chan);
}
}
+ // Clear out expired cached members
+ if (chan->channel.cached_members && chan->channel.cached_members->size()) {
+ bd::Array<bd::String> member_uhosts(chan->channel.cached_members->keys());
+ for (size_t i = 0; i < member_uhosts.length(); ++i) {
+ const bd::String uhost(member_uhosts[i]);
+
+ m = (*chan->channel.cached_members)[uhost];
+
+ // Delete the expired member
+ if (now - m->last > wait_split) {
+ delete_member(m);
+ chan->channel.cached_members->remove(uhost);
+ }
+ }
+ }
}
void
diff --git a/src/mod/irc.mod/irc.h b/src/mod/irc.mod/irc.h
index 1fe176d..995876a 100755
--- a/src/mod/irc.mod/irc.h
+++ b/src/mod/irc.mod/irc.h
< at >< at > -92,7 +92,8 < at >< at > static bool detect_chan_flood(memberlist *m, const char* from, struct chanset_t
static bool new_mask(masklist *, char *, char *);
static void do_closed_kick(struct chanset_t *, memberlist *);
static char *quickban(struct chanset_t *, const char *);
-static bool killmember(struct chanset_t *chan, char *nick);
+static bool killmember(struct chanset_t *chan, char *nick, bool cacheMember = true);
+static void member_update_from_cache(struct chanset_t* chan, memberlist *m);
static void check_lonely_channel(struct chanset_t *chan);
static int gotmode(char *, char *);
void unset_im(struct chanset_t* chan);
< at >< at > -157,6 +158,7 < at >< at > void flush_modes();
void reset_chan_info(struct chanset_t *);
char *getnick(const char *, struct chanset_t *);
void check_shouldjoin(struct chanset_t* chan);
+void delete_member(memberlist* m);
extern intmax_bans, max_exempts, max_invites, max_modes;
extern booluse_354, include_lk;
hooks/post-receive
--
Wraith Botpack
</pre>git< at >shatow.net2012-03-28T21:31:19branch 'next' updated. v1.3.4-814-gf751f4b
http://permalink.gmane.org/gmane.network.irc.bot.wraith.scm/762
<pre>The branch 'next' has been updated
Summary of changes:
doc/UPDATES | 2 +-
src/cmds.c | 2 +-
src/mod/irc.mod/irc.c | 32 ++++++++++++++++++++++----------
3 files changed, 24 insertions(+), 12 deletions(-)
...from f6745d00a1250da8eab5d742ed57beb3dc582fc0 (commit) to (f751f4b00745ec0be48e2643c2a5dd2bff2d0081)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit d361efa0b43537bad7e07079d848df51756123d8
Merge: f6745d0 2edb8dc
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Tue Mar 27 21:22:28 2012 -0500
Merge branch 'master' into next
* master:
Fix tcl protection
commit 354eee98f6fca70fb118cf7e975bf5f3f0c03fd6
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Wed Mar 28 08:57:54 2012 -0500
Don't unset +m when unlocking channel from flood (#48)
commit 9e5133e29c6e369dcdc4d6369b730dfe48647b69
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Wed Mar 28 08:59:58 2012 -0500
Don't kick a user if already devoiced and -m (#48)
commit abfd6010bba7251ce32675116c490ff7dc86da4d
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Wed Mar 28 11:27:29 2012 -0500
Enforce 'chanmode' minutely (#48)
commit 2c95cd279efe6df389215a51d810a055f349ff04
Merge: d361efa 654a4ea
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Wed Mar 28 11:44:59 2012 -0500
Merge branch 'master' into next
* master:
Conflicts:
doc/UPDATES
commit f751f4b00745ec0be48e2643c2a5dd2bff2d0081
Merge: 2c95cd2 abfd601
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Wed Mar 28 11:45:02 2012 -0500
Merge branch '48-voice-updates' into next
* 48-voice-updates:
Enforce 'chanmode' minutely (#48)
Don't kick a user if already devoiced and -m (#48)
Don't unset +m when unlocking channel from flood (#48)
-----------------------------------------------------------------------
Complete Diff
diff --git a/doc/UPDATES b/doc/UPDATES
index ebdac2e..488c803 100755
--- a/doc/UPDATES
+++ b/doc/UPDATES
< at >< at > -6,7 +6,6 < at >< at > next
* Add chanset 'voice-moderate' which will auto set +m in '+voice' channel and devoice flooding clients instead of kick. (#48)
* Bots now will enforce devoices made by ops (user +o) and allow any op (user +o) to revoice to disable that enforcement.
This used to use +m to enforce/allowed revoicing.
- * Tweak limit range checking such that bot will set limit less often
1.4.0 - http://wraith.botpack.net/milestone/1.4.0
* Updated server list, 'set -yes servers -' and 'set -yes servers6 -' to get new list.
< at >< at > -56,6 +55,7 < at >< at > next
* Add chanset 'caps-limit' to handle % of message that can be in caps before kick (#8)
* Add chanset 'color-limit' to handle how many color codes are allowed in a message before kick (#8)
* Add chanset 'closed-exempt' which will allow exempting non-users (who are opped or voice) from being kicked. (fixes #171)
+ * Tweak limit range checking such that bot will set limit less often
1.3.4 - http://wraith.botpack.net/milestone/1.3.4
* Fix various compile warnings with newer GCC
diff --git a/src/cmds.c b/src/cmds.c
index 429541c..93b4e40 100755
--- a/src/cmds.c
+++ b/src/cmds.c
< at >< at > -1421,7 +1421,7 < at >< at > static void cmd_botcmd(int idx, char *par)
if ((strchr(botm, '*') && !findbot(botm)) || !strcmp(botm, "&") || botm[0] == '%') {
if (!strncasecmp(cmd, "di", 2) || (!strncasecmp(cmd, "res", 3) && strncasecmp(cmd, "reset", 5)) || !strncasecmp(cmd, "sui", 3) || !strncasecmp(cmd, "pl", 2) || !strncasecmp(cmd, "ac", 2) ||
!strncasecmp(cmd, "j", 1) || (!strncasecmp(cmd, "dump", 4) && (!strncasecmp(par, "privmsg", 7) || !strncasecmp(par, "notice", 6) || !strncasecmp(par, "quit", 4))) ||
- ((!strncasecmp(cmd, "tcl", 3) || !strncasecmp(cmd, "script", 6)) && strstr(cmd, "privmsg"))) {
+ ((!strncasecmp(cmd, "tcl", 3) || !strncasecmp(cmd, "script", 6)) && strstr(par, "privmsg"))) {
dprintf(idx, "Not a good idea.\n");
return;
} else if (strchr(botm, '*') && !(dcc[idx].user->flags & USER_OWNER)) {
diff --git a/src/mod/irc.mod/irc.c b/src/mod/irc.mod/irc.c
index 93a6d13..e21b6d2 100755
--- a/src/mod/irc.mod/irc.c
+++ b/src/mod/irc.mod/irc.c
< at >< at > -206,15 +206,23 < at >< at > void set_devoice(struct chanset_t *chan, memberlist* m) {
}
const char* punish_flooder(struct chanset_t* chan, memberlist* m, const char *reason) {
- if (channel_voice(chan) && chan->voice_moderate && !chan_sentdevoice(m)) {
+ if (channel_voice(chan) && chan->voice_moderate) {
+ if (!chan_sentdevoice(m)) {
add_mode(chan, '-', 'v', m->nick);
m->flags |= SENTDEVOICE;
set_devoice(chan, m);
return "devoicing";
- } else if (!chan_sentkick(m)) {
+ } else {
+ return "devoiced";
+ }
+ } else {
+ if (!chan_sentkick(m)) {
dprintf(DP_SERVER, "KICK %s %s :%s%s\n", chan->name, m->nick, kickprefix, reason ? reason : response(RES_FLOOD));
m->flags |= SENTKICK;
return "kicking";
+ } else {
+ return "kicked";
+ }
}
return "ignoring";
}
< at >< at > -225,7 +233,7 < at >< at > void unlock_chan(struct chanset_t *chan)
char buf[3] = "", *p = buf;
if ((chan->channel.drone_set_mode & CHANINV) && !(chan->mode_pls_prot & CHANINV))
*p++ = 'i';
- if ((chan->channel.drone_set_mode & CHANMODER) && !(chan->mode_pls_prot & CHANMODER))
+ if ((chan->channel.drone_set_mode & CHANMODER) && !((chan->mode_pls_prot & CHANMODER) || (channel_voice(chan) && chan->voice_moderate)))
*p++ = 'm';
*p = 0;
dprintf(DP_MODE, "MODE %s :-%s\n", chan->name[0] ? chan->name : chan->dname, buf);
< at >< at > -1573,6 +1581,10 < at >< at > check_expired_chanstuff(struct chanset_t *chan)
if (bot_ops && !im_opped) {
request_op(chan);
}
+
+ if (role == 3) {
+ recheck_channel_modes(chan);
+ }
}
}
hooks/post-receive
--
Wraith Botpack
</pre>git< at >shatow.net2012-03-28T16:47:26branch 'master' updated. v1.3.4-484-g654a4ea
http://permalink.gmane.org/gmane.network.irc.bot.wraith.scm/761
<pre>The branch 'master' has been updated
Summary of changes:
doc/UPDATES | 1 +
src/cmds.c | 2 +-
src/mod/irc.mod/irc.c | 98 +++++++++++++++++++++++++------------------------
src/mod/irc.mod/irc.h | 2 +-
4 files changed, 53 insertions(+), 50 deletions(-)
...from 440e69e18f95aa715f5dc1fb48fea4e6e1123067 (commit) to (654a4ea398088f5d3228add856f781b9972aa1f3)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 2edb8dcd7c1d6cd5407d957d7fce88e6f8002652
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Tue Mar 27 21:22:23 2012 -0500
Fix tcl protection
commit 26b72e921d7ea7f0716885afe8616aed25c252f5
Merge: 2edb8dc bd71760
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Wed Mar 28 11:43:48 2012 -0500
Merge branch '44-getin-limit'
* 44-getin-limit:
Tweak limit range checking such that bot will set limit less often
Raise limit by 5 if 'limit 0' is set for getin_request
Only raise limit if needed, and use proper even value
Avoid rounding errors by adding 1 to make limit even (#44)
Ignore all getin requests unless eligible (#44)
Only raise limit when inviting a bot if needed (#44)
commit 654a4ea398088f5d3228add856f781b9972aa1f3
Merge: 26b72e9 268ecee
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Wed Mar 28 11:44:36 2012 -0500
Merge branch 'getin-network-check'
* getin-network-check:
Log which network I'm on if it doesn't match
Ignore case when comparing network
Fix shadowed variable 'network'
Compare to network name, not number of members in channel for getin op sanity checking
-----------------------------------------------------------------------
Complete Diff
diff --git a/doc/UPDATES b/doc/UPDATES
index 4633cfb..f996ed6 100755
--- a/doc/UPDATES
+++ b/doc/UPDATES
< at >< at > -46,6 +46,7 < at >< at >
* Add chanset 'caps-limit' to handle % of message that can be in caps before kick (#8)
* Add chanset 'color-limit' to handle how many color codes are allowed in a message before kick (#8)
* Add chanset 'closed-exempt' which will allow exempting non-users (who are opped or voice) from being kicked. (fixes #171)
+ * Tweak limit range checking such that bot will set limit less often
1.3.4 - http://wraith.botpack.net/milestone/1.3.4
* Fix various compile warnings with newer GCC
diff --git a/src/cmds.c b/src/cmds.c
index 429541c..93b4e40 100755
--- a/src/cmds.c
+++ b/src/cmds.c
< at >< at > -1421,7 +1421,7 < at >< at > static void cmd_botcmd(int idx, char *par)
if ((strchr(botm, '*') && !findbot(botm)) || !strcmp(botm, "&") || botm[0] == '%') {
if (!strncasecmp(cmd, "di", 2) || (!strncasecmp(cmd, "res", 3) && strncasecmp(cmd, "reset", 5)) || !strncasecmp(cmd, "sui", 3) || !strncasecmp(cmd, "pl", 2) || !strncasecmp(cmd, "ac", 2) ||
!strncasecmp(cmd, "j", 1) || (!strncasecmp(cmd, "dump", 4) && (!strncasecmp(par, "privmsg", 7) || !strncasecmp(par, "notice", 6) || !strncasecmp(par, "quit", 4))) ||
- ((!strncasecmp(cmd, "tcl", 3) || !strncasecmp(cmd, "script", 6)) && strstr(cmd, "privmsg"))) {
+ ((!strncasecmp(cmd, "tcl", 3) || !strncasecmp(cmd, "script", 6)) && strstr(par, "privmsg"))) {
dprintf(idx, "Not a good idea.\n");
return;
} else if (strchr(botm, '*') && !(dcc[idx].user->flags & USER_OWNER)) {
diff --git a/src/mod/irc.mod/irc.c b/src/mod/irc.mod/irc.c
index 16c21ea..c7b0ed3 100755
--- a/src/mod/irc.mod/irc.c
+++ b/src/mod/irc.mod/irc.c
< at >< at > -736,13 +736,13 < at >< at > getin_request(char *botnick, char *code, char *par)
}
// Does the remote bot have the same number of clients in its channel as me? And a shared member?
- int members = atoi(tmp);
+ const char *bot_network = tmp;
char *shared_nick = par[0] ? newsplit(&par) : NULL;
memberlist* shared_member = shared_nick ? ismember(chan, shared_nick) : NULL;
char *shared_host = par[0] ? newsplit(&par) : NULL;
- if (!shared_nick || !shared_member || !shared_host || !((chan->channel.members - chan->channel.splitmembers) == members) || strcmp(shared_host, shared_member->userhost)) {
- putlog(LOG_GETIN, "*", "opreq from %s/%s on %s - Bot seems to be on a different network???", botnick, nick, chan->dname);
+ if (!shared_nick || !shared_member || !shared_host || (strcasecmp(curnetwork, bot_network)) || strcmp(shared_host, shared_member->userhost)) {
+ putlog(LOG_GETIN, "*", "opreq from %s/%s on %s - Bot seems to be on a different network '%s' / me: '%s'", botnick, nick, chan->dname, bot_network, curnetwork);
return;
}
< at >< at > -756,6 +756,27 < at >< at > getin_request(char *botnick, char *code, char *par)
putlog(LOG_GETIN, "*", "opreq from %s/%s on %s - Opped", botnick, nick, chan->dname);
} else if (what[0] == 'i') {
+ // Should I respond to this request?
+ // If there's 18 eligible bots in the channel, and in-bots is 2, I have a 2/18 chance of replying.
+ int eligible_bots = 0;
+ for (memberlist* m = chan->channel.member; m && m->nick[0]; m = m->next) {
+ if (chan_hasop(m)) {
+ member_getuser(m, 0);
+ if (m->user && m->user->bot) {
+ ++eligible_bots;
+ }
+ }
+ }
+
+ if (!eligible_bots) {
+ return;
+ }
+
+ if (!((randint(eligible_bots) + 1) <= static_cast<unsigned int>(in_bots))) {
+ // Not my turn
+ return;
+ }
+
if (mem) {
putlog(LOG_GETIN, "*", "inreq from %s/%s for %s - %s is already on %s", botnick, nick, chan->dname, nick, chan->dname);
return;
< at >< at > -783,38 +804,12 < at >< at > getin_request(char *botnick, char *code, char *par)
return;
}
- // Should I respond to this request?
- // If there's 18 eligible bots in the channel, and in-bots is 2, I have a 2/18 chance of replying.
- int eligible_bots = 0;
- for (memberlist* m = chan->channel.member; m && m->nick[0]; m = m->next) {
- if (chan_hasop(m)) {
- member_getuser(m, 0);
- if (m->user && m->user->bot) {
- ++eligible_bots;
- }
- }
- }
-
- if (!eligible_bots) {
- return;
- }
-
- if (!((randint(eligible_bots) + 1) <= static_cast<unsigned int>(in_bots))) {
- // Not my turn
- return;
- }
bool sendi = 0;
if (chan->channel.maxmembers) {
- int lim = (chan->channel.members - chan->channel.splitmembers) + 5, curlim = chan->channel.maxmembers;
- if (curlim < lim) {
- char s2[6] = "";
-
- sendi = 1;
- simple_snprintf(s2, sizeof(s2), "%d", lim);
- add_mode(chan, '+', 'l', s2);
- putlog(LOG_GETIN, "*", "inreq from %s/%s for %s - Raised limit to %d", botnick, nick, chan->dname, lim);
+ if (raise_limit(chan, 5)) {
+ putlog(LOG_GETIN, "*", "inreq from %s/%s for %s - Raised limit", botnick, nick, chan->dname);
}
}
< at >< at > -1004,7 +999,7 < at >< at > request_op(struct chanset_t *chan)
}
/* first scan for bots on my server, ask first found for ops */
- simple_snprintf(s, sizeof(s), "gi o %s %s %d %s %s", chan->dname, botname, (chan->channel.members - chan->channel.splitmembers), shared_member->nick, shared_member->userhost);
+ simple_snprintf(s, sizeof(s), "gi o %s %s %s %s %s", chan->dname, botname, curnetwork, shared_member->nick, shared_member->userhost);
/* look for bots 0-1 hops away */
for (i2 = 0; i2 < i; i2++) {
< at >< at > -1394,32 +1389,39 < at >< at > check_netfight(struct chanset_t *chan)
chan->channel.fighting = 0; /* we put this here because we need to clear it once per min */
}
-void
-raise_limit(struct chanset_t *chan)
+bool
+raise_limit(struct chanset_t *chan, int default_limitraise)
{
if (!chan || !me_op(chan))
- return;
+ return false;
/* Don't bother setting limit if the user has set a protect -l */
if (chan->mode_mns_prot & CHANLIMIT)
- return;
+ return false;
- int nl = (chan->channel.members - chan->channel.splitmembers) + chan->limitraise;/* new limit */
- int i = chan->limitraise >> 2;/* DIV 4 */
+ const int limitraise = (chan->limitraise ? ((chan->limitraise % 2 == 0) ? chan->limitraise : (chan->limitraise + 1)) : default_limitraise);
+ if (limitraise) {
+ const int nl = (chan->channel.members - chan->channel.splitmembers) + limitraise;/* new limit */
+ const int i = limitraise >> 2;/* DIV 4 */
/* if the newlimit will be in the range made by these vars, dont change. */
- int ul = nl + i;/* upper limit */
- int ll = nl - i;/* lower limit */
+ const int ul = nl + i;/* upper limit */
+ const int ll = nl - i;/* lower limit */
- if ((chan->channel.maxmembers > ll) && (chan->channel.maxmembers < ul))
- return; /* the current limit is in the range, so leave it. */
+ if ((chan->channel.maxmembers >= ll) && (chan->channel.maxmembers <= ul)) {
+ return false; /* the current limit is in the range, so leave it. */
+ }
if (nl != chan->channel.maxmembers) {
char s[6] = "";
simple_snprintf(s, sizeof(s), "%d", nl);
add_mode(chan, '+', 'l', s);
+
+ return true;
+ }
}
+ return false;
}
void check_shouldjoin(struct chanset_t* chan)
diff --git a/src/mod/irc.mod/irc.h b/src/mod/irc.mod/irc.h
index 1cd32fc..2bf4daf 100755
--- a/src/mod/irc.mod/irc.h
+++ b/src/mod/irc.mod/irc.h
< at >< at > -146,7 +146,7 < at >< at > inline void check_this_mask(const char type, struct chanset_t *chan, char *mask,
}
void check_this_user(char *, int, char *);
-void raise_limit(struct chanset_t *);
+bool raise_limit(struct chanset_t *, int default_limitraise = 0);
void enforce_closed(struct chanset_t *);
void recheck_channel(struct chanset_t *, int);
void recheck_channel_modes(struct chanset_t *);
hooks/post-receive
--
Wraith Botpack
</pre>git< at >shatow.net2012-03-28T16:47:16branch 'next' updated. v1.3.4-805-gf6745d0
http://permalink.gmane.org/gmane.network.irc.bot.wraith.scm/760
<pre>The branch 'next' has been updated
Summary of changes:
doc/UPDATES | 1 +
src/mod/irc.mod/irc.c | 34 ++++++++++++++++++----------------
src/mod/irc.mod/irc.h | 2 +-
3 files changed, 20 insertions(+), 17 deletions(-)
...from a5e8ae87930399fff30d26e1775f0ac3859b39cd (commit) to (f6745d00a1250da8eab5d742ed57beb3dc582fc0)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 124248581f2fc655c8c2f9e6a5673917f48a820c
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Tue Mar 27 20:30:50 2012 -0500
Only raise limit if needed, and use proper even value
commit 171200baa34e67199be70578dfd391f0716d4a43
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Tue Mar 27 20:32:29 2012 -0500
Raise limit by 5 if 'limit 0' is set for getin_request
commit bd7176052a9f7248ff550139f3ccc46f1db7ee19
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Tue Mar 27 20:43:19 2012 -0500
Tweak limit range checking such that bot will set limit less often
commit f6745d00a1250da8eab5d742ed57beb3dc582fc0
Merge: a5e8ae8 bd71760
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Tue Mar 27 20:46:18 2012 -0500
Merge branch '44-getin-limit' into next
* 44-getin-limit:
Tweak limit range checking such that bot will set limit less often
Raise limit by 5 if 'limit 0' is set for getin_request
Only raise limit if needed, and use proper even value
Conflicts:
doc/UPDATES
-----------------------------------------------------------------------
Complete Diff
diff --git a/doc/UPDATES b/doc/UPDATES
index 3923929..ebdac2e 100755
--- a/doc/UPDATES
+++ b/doc/UPDATES
< at >< at > -6,6 +6,7 < at >< at > next
* Add chanset 'voice-moderate' which will auto set +m in '+voice' channel and devoice flooding clients instead of kick. (#48)
* Bots now will enforce devoices made by ops (user +o) and allow any op (user +o) to revoice to disable that enforcement.
This used to use +m to enforce/allowed revoicing.
+ * Tweak limit range checking such that bot will set limit less often
1.4.0 - http://wraith.botpack.net/milestone/1.4.0
* Updated server list, 'set -yes servers -' and 'set -yes servers6 -' to get new list.
diff --git a/src/mod/irc.mod/irc.c b/src/mod/irc.mod/irc.c
index 74122d5..93a6d13 100755
--- a/src/mod/irc.mod/irc.c
+++ b/src/mod/irc.mod/irc.c
< at >< at > -827,7 +827,7 < at >< at > getin_request(char *botnick, char *code, char *par)
bool sendi = 0;
if (chan->channel.maxmembers) {
- if (raise_limit(chan)) {
+ if (raise_limit(chan, 5)) {
putlog(LOG_GETIN, "*", "inreq from %s/%s for %s - Raised limit", botnick, nick, chan->dname);
}
}
< at >< at > -1409,7 +1409,7 < at >< at > check_netfight(struct chanset_t *chan)
}
bool
-raise_limit(struct chanset_t *chan)
+raise_limit(struct chanset_t *chan, int default_limitraise)
{
if (!chan || !me_op(chan))
return false;
< at >< at > -1418,14 +1418,15 < at >< at > raise_limit(struct chanset_t *chan)
if (chan->mode_mns_prot & CHANLIMIT)
return false;
- const int nl = (chan->channel.members - chan->channel.splitmembers) + chan->limitraise;/* new limit */
- const int limitraise = (chan->limitraise % 2 == 0) ? chan->limitraise : (chan->limitraise + 1);
+ const int limitraise = (chan->limitraise ? ((chan->limitraise % 2 == 0) ? chan->limitraise : (chan->limitraise + 1)) : default_limitraise);
+ if (limitraise) {
+ const int nl = (chan->channel.members - chan->channel.splitmembers) + limitraise;/* new limit */
const int i = limitraise >> 2;/* DIV 4 */
/* if the newlimit will be in the range made by these vars, dont change. */
const int ul = nl + i;/* upper limit */
const int ll = nl - i;/* lower limit */
- if ((chan->channel.maxmembers > ll) && (chan->channel.maxmembers < ul)) {
+ if ((chan->channel.maxmembers >= ll) && (chan->channel.maxmembers <= ul)) {
return false; /* the current limit is in the range, so leave it. */
}
< at >< at > -1437,6 +1438,7 < at >< at > raise_limit(struct chanset_t *chan)
return true;
}
+ }
return false;
}
diff --git a/src/mod/irc.mod/irc.h b/src/mod/irc.mod/irc.h
index 793c59f..1fe176d 100755
--- a/src/mod/irc.mod/irc.h
+++ b/src/mod/irc.mod/irc.h
< at >< at > -148,7 +148,7 < at >< at > inline void check_this_mask(const char type, struct chanset_t *chan, char *mask,
}
void check_this_user(char *, int, char *);
-bool raise_limit(struct chanset_t *);
+bool raise_limit(struct chanset_t *, int default_limitraise = 0);
void enforce_closed(struct chanset_t *);
void recheck_channel(struct chanset_t *, int);
void recheck_channel_modes(struct chanset_t *);
hooks/post-receive
--
Wraith Botpack
</pre>git< at >shatow.net2012-03-28T01:48:22branch 'next' updated. v1.3.4-801-ga5e8ae8
http://permalink.gmane.org/gmane.network.irc.bot.wraith.scm/759
<pre>The branch 'next' has been updated
Summary of changes:
doc/UPDATES | 4 ++--
doc/help.txt | 4 ++--
src/cmds.c | 3 ++-
src/mod/channels.mod/chanmisc.c | 6 +++---
src/mod/channels.mod/userchan.c | 2 +-
src/mod/irc.mod/chan.c | 2 +-
src/mod/irc.mod/irc.c | 4 ++--
src/mod/irc.mod/mode.c | 8 ++++----
8 files changed, 17 insertions(+), 16 deletions(-)
...from cdd56e8535cfa460e822012f4581ed9d93afadaf (commit) to (a5e8ae87930399fff30d26e1775f0ac3859b39cd)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 1cf674c88a24768eb747229e7e2ffb6a89e39c8b
Merge: cdd56e8 173a773
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Tue Mar 27 15:07:27 2012 -0500
Merge branch 'master' into next
* master:
Protect tcl/script commands
commit 56ee085e78258488f41b4d48cbb456f3eea49f32
Merge: 1cf674c 8094d5b
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Tue Mar 27 15:17:36 2012 -0500
Merge branch 'master' into next
* master:
commit 731862fc1ea5deb678fe993060f2ebb7bde9c33d
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Tue Mar 27 17:07:01 2012 -0500
Revert "Merge branch 'set-list-new-value' into next"
This reverts commit 3a8375bf318221e18c5de5a9e1eaa53660d8600b, reversing
changes made to 3cbbd3c8bbca858aeb93246b67bab7c275ccee81.
commit 0e14f41294ef83ffbb3730088ed488af4c42ba0f
Merge: 731862f f4dae73
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Tue Mar 27 17:07:21 2012 -0500
Merge branch 'set-list-new-value' into next
* set-list-new-value:
Lessen variable name format length
Don't format var type if not needed
Show proper value when adding to a list
Display value when removing/adding to a list
DRY displaying set data
Don't pad botnick when using botset
commit 570631ddf9d449afb2485cc8b63025703175c3c5
Merge: 0e14f41 0dea3f5
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Tue Mar 27 18:45:29 2012 -0500
Merge branch 'master' into next
* master:
Use consistent type format for caps-limit/color-limit
commit 4e5948a9699b12eecb3d0e815a31a30b54cee0c0
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Tue Mar 27 18:54:07 2012 -0500
Ignore case when comparing network
irc.efnet.pl: EFNet
irc.servercentral.net: EFnet
commit 94372a678979170ce5da47e5258fe72362c61543
Merge: 570631d 4e5948a
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Tue Mar 27 18:54:30 2012 -0500
Merge branch 'getin-network-check' into next
* getin-network-check:
Ignore case when comparing network
commit 268ecee8fe5becd15984d35d084dc0c4873e7b74
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Tue Mar 27 18:55:17 2012 -0500
Log which network I'm on if it doesn't match
commit 0bd496922c9d1816d72632f20aa4efbc0d84e562
Merge: 94372a6 268ecee
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Tue Mar 27 18:55:21 2012 -0500
Merge branch 'getin-network-check' into next
* getin-network-check:
Log which network I'm on if it doesn't match
commit a5e8ae87930399fff30d26e1775f0ac3859b39cd
Merge: 0bd4969 440e69e
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Tue Mar 27 19:06:40 2012 -0500
Merge branch 'master' into next
* master:
Fix wrong nick getting logged for revenge deflags
-----------------------------------------------------------------------
Complete Diff
diff --git a/doc/UPDATES b/doc/UPDATES
index d73edb7..3923929 100755
--- a/doc/UPDATES
+++ b/doc/UPDATES
< at >< at > -52,8 +52,8 < at >< at > next
* Bot will now lockdown channel (+im) if a drone flood is detected (#37)
* Add chansets 'flood-mchan', 'flood-mbytes', 'flood-mctcp' to control reactions to mass floods (#37)
* Remove unneeded chanset 'nomassjoin'
- * Add chanset 'capslimit' to handle % of message that can be in caps before kick (#8)
- * Add chanset 'colorlimit' to handle how many color codes are allowed in a message before kick (#8)
+ * Add chanset 'caps-limit' to handle % of message that can be in caps before kick (#8)
+ * Add chanset 'color-limit' to handle how many color codes are allowed in a message before kick (#8)
* Add chanset 'closed-exempt' which will allow exempting non-users (who are opped or voice) from being kicked. (fixes #171)
1.3.4 - http://wraith.botpack.net/milestone/1.3.4
diff --git a/doc/help.txt b/doc/help.txt
index 21f0073..22f7b0b 100644
--- a/doc/help.txt
+++ b/doc/help.txt
< at >< at > -369,10 +369,10 < at >< at > See also: link%{+a}, newhub%{-}
enforce +p as well. The point is to notice the chan
and bots when an /invite is done. This is useful in
seeing when a shell is hijacked ;)
- $bcapslimit$b If this is set, any +f bots will kick a client for using
+ $bcaps-limit$b If this is set, any +f bots will kick a client for using
too many caps. This is a percentage (0-100) of how much of
their message can be caps before being kicked.
- $bcolorlimit$b If this is set, any +f bot will kick the client for
+ $bcolor-limit$b If this is set, any +f bot will kick the client for
excess color codes. The setting is how many color/bold
character codes the message may contain before being kicked.
$bban-time$b Set here how long temporary bans will last (in
diff --git a/src/cmds.c b/src/cmds.c
index 8fb73a7..429541c 100755
--- a/src/cmds.c
+++ b/src/cmds.c
< at >< at > -1420,7 +1420,8 < at >< at > static void cmd_botcmd(int idx, char *par)
// Restrict dangerous mass commands ('botcmd *' (any *) or 'botcmd &')
if ((strchr(botm, '*') && !findbot(botm)) || !strcmp(botm, "&") || botm[0] == '%') {
if (!strncasecmp(cmd, "di", 2) || (!strncasecmp(cmd, "res", 3) && strncasecmp(cmd, "reset", 5)) || !strncasecmp(cmd, "sui", 3) || !strncasecmp(cmd, "pl", 2) || !strncasecmp(cmd, "ac", 2) ||
- !strncasecmp(cmd, "j", 1) || (!strncasecmp(cmd, "dump", 4) && (!strncasecmp(par, "privmsg", 7) || !strncasecmp(par, "notice", 6) || !strncasecmp(par, "quit", 4)))) {
+ !strncasecmp(cmd, "j", 1) || (!strncasecmp(cmd, "dump", 4) && (!strncasecmp(par, "privmsg", 7) || !strncasecmp(par, "notice", 6) || !strncasecmp(par, "quit", 4))) ||
+ ((!strncasecmp(cmd, "tcl", 3) || !strncasecmp(cmd, "script", 6)) && strstr(cmd, "privmsg"))) {
dprintf(idx, "Not a good idea.\n");
return;
} else if (strchr(botm, '*') && !(dcc[idx].user->flags & USER_OWNER)) {
diff --git a/src/mod/channels.mod/chanmisc.c b/src/mod/channels.mod/chanmisc.c
index a01b40a..609a30a 100755
--- a/src/mod/channels.mod/chanmisc.c
+++ b/src/mod/channels.mod/chanmisc.c
< at >< at > -426,13 +426,13 < at >< at > int channel_modify(char *result, struct chanset_t *chan, int items, char **item,
i++;
if (i >= items) {
if (result)
- strlcpy(result, "channel capslimit needs argument", RESULT_LEN);
+ strlcpy(result, "channel caps-limit needs argument", RESULT_LEN);
return ERROR;
}
int capslimit = atoi(item[i]);
if (capslimit > 100 || capslimit < 0 || item[i][0] == '-') {
if (result)
- strlcpy(result, "channel capslimit out of range (0-100)", RESULT_LEN);
+ strlcpy(result, "channel caps-limit out of range (0-100)", RESULT_LEN);
return ERROR;
}
chan->capslimit = capslimit;
< at >< at > -440,7 +440,7 < at >< at > int channel_modify(char *result, struct chanset_t *chan, int items, char **item,
i++;
if (i >= items) {
if (result)
- strlcpy(result, "channel colorlimit needs argument", RESULT_LEN);
+ strlcpy(result, "channel color-limit needs argument", RESULT_LEN);
return ERROR;
}
chan->colorlimit = atoi(item[i]);
diff --git a/src/mod/channels.mod/userchan.c b/src/mod/channels.mod/userchan.c
index cf251c3..343adb4 100755
--- a/src/mod/channels.mod/userchan.c
+++ b/src/mod/channels.mod/userchan.c
< at >< at > -841,7 +841,7 < at >< at > void write_chans_compat(bd::Stream& stream, int idx)
bad-cookie %d manop %d mdop %d mop %d limit %d \
flood-chan %d:%d flood-ctcp %d:%d flood-join %d:%d \
flood-kick %d:%d flood-deop %d:%d flood-nick %d:%d \
-capslimit %d colorlimit %d closed-ban %d closed-invite %d closed-private %d ban-time %d \
+caps-limit %d color-limit %d closed-ban %d closed-invite %d closed-private %d ban-time %d \
exempt-time %d invite-time %d voice-non-ident %d auto-delay %d \
%cenforcebans %cdynamicbans %cuserbans %cbitch \
%cprivate %ccycle %cinactive %cdynamicexempts %cuserexempts \
diff --git a/src/mod/irc.mod/chan.c b/src/mod/irc.mod/chan.c
index 8e2b568..465a400 100755
--- a/src/mod/irc.mod/chan.c
+++ b/src/mod/irc.mod/chan.c
< at >< at > -3006,7 +3006,7 < at >< at > static int gotkick(char *from, char *origmsg)
} else {
if (m->user) {
char tmp[128] = "";
- simple_snprintf(tmp, sizeof(tmp), "Kicked bot %s on %s", m->nick, chan->dname);
+ simple_snprintf(tmp, sizeof(tmp), "Kicked bot %s on %s", mv->nick, chan->dname);
deflag_user(m->user, DEFLAG_EVENT_REVENGE_KICK, tmp, chan);
}
}
diff --git a/src/mod/irc.mod/irc.c b/src/mod/irc.mod/irc.c
index a5f6c87..74122d5 100755
--- a/src/mod/irc.mod/irc.c
+++ b/src/mod/irc.mod/irc.c
< at >< at > -760,8 +760,8 < at >< at > getin_request(char *botnick, char *code, char *par)
char *shared_nick = par[0] ? newsplit(&par) : NULL;
memberlist* shared_member = shared_nick ? ismember(chan, shared_nick) : NULL;
char *shared_host = par[0] ? newsplit(&par) : NULL;
- if (!shared_nick || !shared_member || !shared_host || (strcmp(curnetwork, bot_network)) || strcmp(shared_host, shared_member->userhost)) {
- putlog(LOG_GETIN, "*", "opreq from %s/%s on %s - Bot seems to be on a different network '%s'", botnick, nick, chan->dname, bot_network);
+ if (!shared_nick || !shared_member || !shared_host || (strcasecmp(curnetwork, bot_network)) || strcmp(shared_host, shared_member->userhost)) {
+ putlog(LOG_GETIN, "*", "opreq from %s/%s on %s - Bot seems to be on a different network '%s' / me: '%s'", botnick, nick, chan->dname, bot_network, curnetwork);
return;
}
diff --git a/src/mod/irc.mod/mode.c b/src/mod/irc.mod/mode.c
index b211ba8..ecdf8ac 100755
--- a/src/mod/irc.mod/mode.c
+++ b/src/mod/irc.mod/mode.c
< at >< at > -725,7 +725,7 < at >< at > got_deop(struct chanset_t *chan, memberlist *m, memberlist *mv, char *isserver)
} else {
if (m->user) {
char tmp[128] = "";
- simple_snprintf(tmp, sizeof(tmp), "Deopped bot %s on %s", m->nick, chan->dname);
+ simple_snprintf(tmp, sizeof(tmp), "Deopped bot %s on %s", mv->nick, chan->dname);
deflag_user(m->user, DEFLAG_EVENT_REVENGE_DEOP, tmp, chan);
}
}
< at >< at > -748,14 +748,14 < at >< at > got_ban(struct chanset_t *chan, memberlist *m, char *mask, char *isserver)
// Make an array of all matching users
bd::Array<memberlist*> matchedUserMembers;
- bool matched_bot = false;
+ memberlist *matched_bot = NULL;
for (memberlist *mv = chan->channel.member; mv && mv->nick[0]; mv = mv->next) {
member_getuser(mv);
if (mv->user) {
if ((wild_match(mask, mv->from) || match_cidr(mask, mv->from))) {
if (!matched_bot && mv != m && mv->user->bot) {
- matched_bot = true;
+ matched_bot = mv;
}
if (mv->user && !isexempted(chan, mv->from)) {
matchedUserMembers << mv;
< at >< at > -772,7 +772,7 < at >< at > got_ban(struct chanset_t *chan, memberlist *m, char *mask, char *isserver)
} else {
if (m->user) {
char tmp[128] = "";
- simple_snprintf(tmp, sizeof(tmp), "Banned bot %s (%s) on %s", m->nick, mask, chan->dname);
+ simple_snprintf(tmp, sizeof(tmp), "Banned bot %s (%s) on %s", matched_bot->nick, mask, chan->dname);
deflag_user(m->user, DEFLAG_EVENT_REVENGE_BAN, tmp, chan);
}
}
hooks/post-receive
--
Wraith Botpack
</pre>git< at >shatow.net2012-03-28T00:07:30branch 'master' updated. v1.3.4-471-g440e69e
http://permalink.gmane.org/gmane.network.irc.bot.wraith.scm/758
<pre>The branch 'master' has been updated
Summary of changes:
doc/UPDATES | 4 +-
doc/help.txt | 4 +-
src/cmds.c | 3 +-
src/mod/channels.mod/chanmisc.c | 38 +++++++++++-----------
src/mod/channels.mod/channels.c | 16 ----------
src/mod/channels.mod/userchan.c | 2 +-
src/mod/irc.mod/chan.c | 2 +-
src/mod/irc.mod/irc.c | 9 ++---
src/mod/irc.mod/mode.c | 8 ++--
src/set.c | 64 +++++++++++++++++++++++++++++---------
10 files changed, 84 insertions(+), 66 deletions(-)
...from c821e8d29797675b4c2fdf5d3cf78d00d0449b34 (commit) to (440e69e18f95aa715f5dc1fb48fea4e6e1123067)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 173a7738f00a9db1322c500bf0fb1b6ffbdd4bb7
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Tue Mar 27 15:07:22 2012 -0500
Protect tcl/script commands
commit 8094d5b12fd2a53ae9ee4b8d4fe90db576333052
Merge: 173a773 b61a2bb
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Tue Mar 27 15:17:22 2012 -0500
Merge branch 'flood-tweaks'
* flood-tweaks:
Update default flood settings
Don't punish words 6 chars or less for CAPS
Only bail out of offense check if there's no color check as well
commit ecd7ba788a4de968390ed45c0a45d12d84ab4366
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Sun Nov 27 12:54:40 2011 -0600
Don't pad botnick when using botset
commit 491a9cb697b5703b755c1bd10cd91c2b76519f23
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Sun Nov 27 13:48:29 2011 -0600
DRY displaying set data
commit cf84a0fb34bd78291d3102a1ddc1d2d874a74fbc
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Sun Nov 27 13:52:40 2011 -0600
Display value when removing/adding to a list
commit 3b0af4a6ed0793f137517b1d98593b4abe95f073
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Mon Mar 26 19:18:36 2012 -0500
Show proper value when adding to a list
commit b7578075533df4f0119d9f24a14b352fdaa9d890
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Mon Mar 26 19:30:21 2012 -0500
Don't format var type if not needed
commit f4dae730b5381365e67f67527bedcad377e0c76c
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Mon Mar 26 19:34:21 2012 -0500
Lessen variable name format length
commit 0a04cc916e43912337e725662c0ae74ebf4ebfb3
Merge: 8094d5b f4dae73
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Tue Mar 27 18:36:20 2012 -0500
Merge branch 'set-list-new-value'
* set-list-new-value:
Lessen variable name format length
Don't format var type if not needed
Show proper value when adding to a list
Display value when removing/adding to a list
DRY displaying set data
Don't pad botnick when using botset
commit 0dea3f5e85e16a7def0863291faaacea71642bbb
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Tue Mar 27 18:37:10 2012 -0500
Use consistent type format for caps-limit/color-limit
commit 440e69e18f95aa715f5dc1fb48fea4e6e1123067
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Tue Mar 27 19:04:38 2012 -0500
Fix wrong nick getting logged for revenge deflags
-----------------------------------------------------------------------
Complete Diff
diff --git a/doc/UPDATES b/doc/UPDATES
index 90ea705..4633cfb 100755
--- a/doc/UPDATES
+++ b/doc/UPDATES
< at >< at > -43,8 +43,8 < at >< at >
* Bot will now lockdown channel (+im) if a drone flood is detected (#37)
* Add chansets 'flood-mchan', 'flood-mbytes', 'flood-mctcp' to control reactions to mass floods (#37)
* Remove unneeded chanset 'nomassjoin'
- * Add chanset 'capslimit' to handle % of message that can be in caps before kick (#8)
- * Add chanset 'colorlimit' to handle how many color codes are allowed in a message before kick (#8)
+ * Add chanset 'caps-limit' to handle % of message that can be in caps before kick (#8)
+ * Add chanset 'color-limit' to handle how many color codes are allowed in a message before kick (#8)
* Add chanset 'closed-exempt' which will allow exempting non-users (who are opped or voice) from being kicked. (fixes #171)
1.3.4 - http://wraith.botpack.net/milestone/1.3.4
diff --git a/doc/help.txt b/doc/help.txt
index fb09775..d3914a2 100644
--- a/doc/help.txt
+++ b/doc/help.txt
< at >< at > -369,10 +369,10 < at >< at > See also: link%{+a}, newhub%{-}
enforce +p as well. The point is to notice the chan
and bots when an /invite is done. This is useful in
seeing when a shell is hijacked ;)
- $bcapslimit$b If this is set, any +f bots will kick a client for using
+ $bcaps-limit$b If this is set, any +f bots will kick a client for using
too many caps. This is a percentage (0-100) of how much of
their message can be caps before being kicked.
- $bcolorlimit$b If this is set, any +f bot will kick the client for
+ $bcolor-limit$b If this is set, any +f bot will kick the client for
excess color codes. The setting is how many color/bold
character codes the message may contain before being kicked.
$bban-time$b Set here how long temporary bans will last (in
diff --git a/src/cmds.c b/src/cmds.c
index 8fb73a7..429541c 100755
--- a/src/cmds.c
+++ b/src/cmds.c
< at >< at > -1420,7 +1420,8 < at >< at > static void cmd_botcmd(int idx, char *par)
// Restrict dangerous mass commands ('botcmd *' (any *) or 'botcmd &')
if ((strchr(botm, '*') && !findbot(botm)) || !strcmp(botm, "&") || botm[0] == '%') {
if (!strncasecmp(cmd, "di", 2) || (!strncasecmp(cmd, "res", 3) && strncasecmp(cmd, "reset", 5)) || !strncasecmp(cmd, "sui", 3) || !strncasecmp(cmd, "pl", 2) || !strncasecmp(cmd, "ac", 2) ||
- !strncasecmp(cmd, "j", 1) || (!strncasecmp(cmd, "dump", 4) && (!strncasecmp(par, "privmsg", 7) || !strncasecmp(par, "notice", 6) || !strncasecmp(par, "quit", 4)))) {
+ !strncasecmp(cmd, "j", 1) || (!strncasecmp(cmd, "dump", 4) && (!strncasecmp(par, "privmsg", 7) || !strncasecmp(par, "notice", 6) || !strncasecmp(par, "quit", 4))) ||
+ ((!strncasecmp(cmd, "tcl", 3) || !strncasecmp(cmd, "script", 6)) && strstr(cmd, "privmsg"))) {
dprintf(idx, "Not a good idea.\n");
return;
} else if (strchr(botm, '*') && !(dcc[idx].user->flags & USER_OWNER)) {
diff --git a/src/mod/channels.mod/chanmisc.c b/src/mod/channels.mod/chanmisc.c
index 83de7f1..630e64c 100755
--- a/src/mod/channels.mod/chanmisc.c
+++ b/src/mod/channels.mod/chanmisc.c
< at >< at > -426,13 +426,13 < at >< at > int channel_modify(char *result, struct chanset_t *chan, int items, char **item,
i++;
if (i >= items) {
if (result)
- strlcpy(result, "channel capslimit needs argument", RESULT_LEN);
+ strlcpy(result, "channel caps-limit needs argument", RESULT_LEN);
return ERROR;
}
int capslimit = atoi(item[i]);
if (capslimit > 100 || capslimit < 0 || item[i][0] == '-') {
if (result)
- strlcpy(result, "channel capslimit out of range (0-100)", RESULT_LEN);
+ strlcpy(result, "channel caps-limit out of range (0-100)", RESULT_LEN);
return ERROR;
}
chan->capslimit = capslimit;
< at >< at > -440,7 +440,7 < at >< at > int channel_modify(char *result, struct chanset_t *chan, int items, char **item,
i++;
if (i >= items) {
if (result)
- strlcpy(result, "channel colorlimit needs argument", RESULT_LEN);
+ strlcpy(result, "channel color-limit needs argument", RESULT_LEN);
return ERROR;
}
chan->colorlimit = atoi(item[i]);
< at >< at > -1096,27 +1096,27 < at >< at > int channel_add(char *result, const char *newname, char *options, bool isdefault
chan->knock_flags = 0;
chan->flood_lock_time = 120;
chan->flood_exempt_mode = 0;
- chan->flood_pub_thr = gfld_chan_thr;
- chan->flood_pub_time = gfld_chan_time;
- chan->flood_bytes_thr = gfld_bytes_thr;
- chan->flood_bytes_time = gfld_bytes_time;
- chan->flood_ctcp_thr = gfld_ctcp_thr;
- chan->flood_ctcp_time = gfld_ctcp_time;
- chan->flood_join_thr = gfld_join_thr;
- chan->flood_join_time = gfld_join_time;
- chan->flood_deop_thr = gfld_deop_thr;
- chan->flood_deop_time = gfld_deop_time;
- chan->flood_kick_thr = gfld_kick_thr;
- chan->flood_kick_time = gfld_kick_time;
- chan->flood_nick_thr = gfld_nick_thr;
- chan->flood_nick_time = gfld_nick_time;
+ chan->flood_pub_thr = 0;
+ chan->flood_pub_time = 0;
+ chan->flood_bytes_thr = 0;
+ chan->flood_bytes_time = 0;
+ chan->flood_ctcp_thr = 5;
+ chan->flood_ctcp_time = 30;
+ chan->flood_join_thr = 0;
+ chan->flood_join_time = 0;
+ chan->flood_deop_thr = 8;
+ chan->flood_deop_time = 10;
+ chan->flood_kick_thr = 0;
+ chan->flood_kick_time = 0;
+ chan->flood_nick_thr = 0;
+ chan->flood_nick_time = 0;
chan->flood_mjoin_thr = 6;
chan->flood_mjoin_time = 1;
chan->capslimit = 0;
chan->colorlimit = 0;
- chan->flood_mpub_thr = 10;
+ chan->flood_mpub_thr = 20;
chan->flood_mpub_time = 1;
- chan->flood_mbytes_thr = 500;
+ chan->flood_mbytes_thr = 1000;
chan->flood_mbytes_time = 1;
chan->flood_mctcp_thr = 7;
chan->flood_mctcp_time = 1;
diff --git a/src/mod/channels.mod/channels.c b/src/mod/channels.mod/channels.c
index 94e70f6..a079685 100755
--- a/src/mod/channels.mod/channels.c
+++ b/src/mod/channels.mod/channels.c
< at >< at > -61,22 +61,6 < at >< at > static interval_t global_invite_time;
static char *lastdeletedmask = NULL;
-/* Global flood settings */
-static int gfld_chan_thr;
-static interval_t gfld_chan_time;
-static int gfld_bytes_thr;
-static interval_t gfld_bytes_time;
-static int gfld_deop_thr = 8;
-static interval_t gfld_deop_time = 10;
-static int gfld_kick_thr;
-static interval_t gfld_kick_time;
-static int gfld_join_thr;
-static interval_t gfld_join_time;
-static int gfld_ctcp_thr = 5;
-static interval_t gfld_ctcp_time = 30;
-static intgfld_nick_thr;
-static interval_tgfld_nick_time;
-
static int killed_bots = 0;
#include "channels.h"
diff --git a/src/mod/channels.mod/userchan.c b/src/mod/channels.mod/userchan.c
index bcb0298..1c6bfd2 100755
--- a/src/mod/channels.mod/userchan.c
+++ b/src/mod/channels.mod/userchan.c
< at >< at > -840,7 +840,7 < at >< at > void write_chans_compat(bd::Stream& stream, int idx)
bad-cookie %d manop %d mdop %d mop %d limit %d \
flood-chan %d:%d flood-ctcp %d:%d flood-join %d:%d \
flood-kick %d:%d flood-deop %d:%d flood-nick %d:%d \
-capslimit %d colorlimit %d closed-ban %d closed-invite %d closed-private %d ban-time %d \
+caps-limit %d color-limit %d closed-ban %d closed-invite %d closed-private %d ban-time %d \
exempt-time %d invite-time %d voice-non-ident %d auto-delay %d \
%cenforcebans %cdynamicbans %cuserbans %cbitch \
%cprivate %ccycle %cinactive %cdynamicexempts %cuserexempts \
diff --git a/src/mod/irc.mod/chan.c b/src/mod/irc.mod/chan.c
index 1afe3bd..afa8598 100755
--- a/src/mod/irc.mod/chan.c
+++ b/src/mod/irc.mod/chan.c
< at >< at > -2995,7 +2995,7 < at >< at > static int gotkick(char *from, char *origmsg)
} else {
if (m->user) {
char tmp[128] = "";
- simple_snprintf(tmp, sizeof(tmp), "Kicked bot %s on %s", m->nick, chan->dname);
+ simple_snprintf(tmp, sizeof(tmp), "Kicked bot %s on %s", mv->nick, chan->dname);
deflag_user(m->user, DEFLAG_EVENT_REVENGE_KICK, tmp, chan);
}
}
diff --git a/src/mod/irc.mod/irc.c b/src/mod/irc.mod/irc.c
index efd5381..16c21ea 100755
--- a/src/mod/irc.mod/irc.c
+++ b/src/mod/irc.mod/irc.c
< at >< at > -146,12 +146,11 < at >< at > detect_offense(memberlist* m, struct chanset_t *chan, char *msg)
++msg_check;
}
- if (!tot) {
- return 0;
- }
-
if (tot >= 30) {
hit_check = tot/5; //check in-between for hits to save waste of cpu
+ } else if (!tot && !chan->colorlimit) {
+ // Nothing to do, bail out
+ return 0;
}
}
< at >< at > -182,7 +181,7 < at >< at > detect_offense(memberlist* m, struct chanset_t *chan, char *msg)
}
++msg;
}
- if (chan->capslimit && caps_count) {
+ if (chan->capslimit && caps_count && tot >= 6) {
caps_percentage = (caps_count)/(double(tot));
if (caps_percentage >= caps_limit) {
putlog(LOG_MODES, chan->name, "Caps flood (%d%%) from %s -- kicking", int(caps_percentage * 100), m->nick);
diff --git a/src/mod/irc.mod/mode.c b/src/mod/irc.mod/mode.c
index d85e6f9..85add9a 100755
--- a/src/mod/irc.mod/mode.c
+++ b/src/mod/irc.mod/mode.c
< at >< at > -725,7 +725,7 < at >< at > got_deop(struct chanset_t *chan, memberlist *m, memberlist *mv, char *isserver)
} else {
if (m->user) {
char tmp[128] = "";
- simple_snprintf(tmp, sizeof(tmp), "Deopped bot %s on %s", m->nick, chan->dname);
+ simple_snprintf(tmp, sizeof(tmp), "Deopped bot %s on %s", mv->nick, chan->dname);
deflag_user(m->user, DEFLAG_EVENT_REVENGE_DEOP, tmp, chan);
}
}
< at >< at > -748,14 +748,14 < at >< at > got_ban(struct chanset_t *chan, memberlist *m, char *mask, char *isserver)
// Make an array of all matching users
bd::Array<memberlist*> matchedUserMembers;
- bool matched_bot = false;
+ memberlist *matched_bot = NULL;
for (memberlist *mv = chan->channel.member; mv && mv->nick[0]; mv = mv->next) {
member_getuser(mv);
if (mv->user) {
if ((wild_match(mask, mv->from) || match_cidr(mask, mv->from))) {
if (!matched_bot && mv != m && mv->user->bot) {
- matched_bot = true;
+ matched_bot = mv;
}
if (mv->user && !isexempted(chan, mv->from)) {
matchedUserMembers << mv;
< at >< at > -772,7 +772,7 < at >< at > got_ban(struct chanset_t *chan, memberlist *m, char *mask, char *isserver)
} else {
if (m->user) {
char tmp[128] = "";
- simple_snprintf(tmp, sizeof(tmp), "Banned bot %s (%s) on %s", m->nick, mask, chan->dname);
+ simple_snprintf(tmp, sizeof(tmp), "Banned bot %s (%s) on %s", matched_bot->nick, mask, chan->dname);
deflag_user(m->user, DEFLAG_EVENT_REVENGE_BAN, tmp, chan);
}
}
diff --git a/src/set.c b/src/set.c
index aee14e7..c59d86e 100755
--- a/src/set.c
+++ b/src/set.c
< at >< at > -937,6 +937,26 < at >< at > void write_vars_and_cmdpass(bd::Stream& stream, int idx)
stream << bd::String::printf("- %s %s\n", cp->name, cp->pass);
}
+static void display_set_value(int idx, const variable_t *var, const char *botnick, bool format = false)
+{
+ char buf[51] = "";
+
+ const char *data = NULL;
+ if (botnick) {//fetch data from bot's USERENTRY_SET
+ struct userrec *botu = get_user_by_handle(userlist, (char *) botnick);
+ const char *botdata = var_get_bot_data(botu, var->name);
+ data = botdata ? botdata : NULL;
+ } else {//use global, no bot specified
+ data = var->gdata ? var->gdata : NULL;
+ }
+
+ if (format) {
+ simple_snprintf(buf, sizeof(buf), "(%-6s) %-16s: ", var_type_name(var->flags), var->name);
+ } else {
+ simple_snprintf(buf, sizeof(buf), "(%s) %s: ", var_type_name(var->flags), var->name);
+ }
+ dumplots(idx, buf, data ? (char *) data : (char *) "(not set)");
+}
#define LIST_ADD 1
#define LIST_RM 2
< at >< at > -946,7 +966,7 < at >< at > int cmd_set_real(const char *botnick, int idx, char *par)
variable_t *var = NULL;
char *name = NULL;
const char *data = NULL, *botdata = NULL;
- int list = 0, i = 0;
+ int list = 0;
bool notyes = 1, wildcard = 0;
if (par[0] && !strncasecmp(par, "-yes", 4)) {
< at >< at > -1018,22 +1038,40 < at >< at > int cmd_set_real(const char *botnick, int idx, char *par)
if (botnick) {
botu = get_user_by_handle(userlist, (char *) botnick);
if (data)
- dprintf(idx, "%-10s:\n", botnick);
+ dprintf(idx, "%s:\n", botnick);
ishub = bot_hublevel(botu) == 999 ? 0 : 1;
}
if (!data) {
+ // First determine which variables are going to be shown
+ bd::Array<variable_t*> varsToShow;
+ size_t i = 0;
+
while (vars[i].name) {
- botdata = NULL;
- if (!name || wildcard)//not looping all, provided with one...
- if (vars[i].name)
+ if (!name || wildcard) {//not looping all, provided with one...
+ if (vars[i].name) {
var = &vars[i];
+ }
+ }
if (wildcard && !wild_match(name, var->name)) {
++i;
continue;
}
+ varsToShow << var;
+
+ if (name && !wildcard) {
+ break;
+ }
+ ++i;
+ }
+
+ // Then display them
+ for (i = 0; i < varsToShow.length(); ++i) {
+ var = varsToShow[i];
+ botdata = NULL;
+
if (!(var->flags & VAR_HIDE) && !((var->flags & VAR_PERM) && !isowner(dcc[idx].nick)) &&
!(botnick && ((var->flags & VAR_NOLOC) || (ishub && (var->flags & VAR_NOLHUB))))
) {//Just display the data
< at >< at > -1048,16 +1086,10 < at >< at > int cmd_set_real(const char *botnick, int idx, char *par)
else if (list && !data)
dprintf(idx, "%s list not set.\n", var->name);
else {
- char buf[51] = "";
-
- simple_snprintf(buf, sizeof(buf), "(%-6s) %-19s: ", var_type_name(var->flags), var->name);
-// dprintf(idx, " %-15s: %s\n", var->name, data);
- dumplots(idx, buf, data ? (char *) data : (char *) "(not set)");
+ const bool shouldFormat = varsToShow.length() > 1;
+ display_set_value(idx, var, botnick, shouldFormat);
}
}
- if (name && !wildcard)
- break;
- ++i;
}
} else { // need to set it!
if (!list && var->flags & VAR_LIST) {
< at >< at > -1121,6 +1153,7 < at >< at > int cmd_set_real(const char *botnick, int idx, char *par)
return 0;
} else if (var_add_list(botnick, var, data)) {
dprintf(idx, "Added '%s' to %s list.\n", data, var->name);
+ display_set_value(idx, var, botnick);
return 1;
}
} else if (list == LIST_RM) {
< at >< at > -1128,6 +1161,7 < at >< at > int cmd_set_real(const char *botnick, int idx, char *par)
if ((expanded_data = var_rem_list(botnick, var, data)) && expanded_data[0]) {
dprintf(idx, "Removed '%s' from %s list.\n", expanded_data, var->name);
+ display_set_value(idx, var, botnick);
return 1;
} else if (!var_find_list(botnick, var, data)) {
char *data_word = NULL;
< at >< at > -1159,7 +1193,7 < at >< at > int cmd_set_real(const char *botnick, int idx, char *par)
if (botnick)
var_set_userentry(botnick, name, data);
- dprintf(idx, "%s: %s\n", name, botnick ? (!data || (data[0] == '-' && !data[1]) ? "(not set)" : data) : (var->gdata ? var->gdata : "(not set)"));
+ display_set_value(idx, var, botnick);
if (sdata)
free(sdata);
hooks/post-receive
--
Wraith Botpack
</pre>git< at >shatow.net2012-03-28T00:07:16branch 'next' updated. v1.3.4-780-gcdd56e8
http://permalink.gmane.org/gmane.network.irc.bot.wraith.scm/757
<pre>The branch 'next' has been updated
Summary of changes:
doc/UPDATES | 4 ++++
doc/help.txt | 2 ++
src/chan.h | 1 +
src/mod/channels.mod/chanmisc.c | 11 +++++++++++
src/mod/channels.mod/channels.c | 6 ++++++
src/mod/channels.mod/cmdschan.c | 1 +
src/mod/channels.mod/userchan.c | 3 ++-
src/mod/irc.mod/chan.c | 9 ++++++---
src/mod/irc.mod/irc.c | 37 ++++++++++++++++++++++++++++---------
src/mod/irc.mod/irc.h | 2 ++
src/mod/irc.mod/mode.c | 13 +++++--------
11 files changed, 68 insertions(+), 21 deletions(-)
...from 26bd18a8f51a47c4391ca18b581e4220eba2e732 (commit) to (cdd56e8535cfa460e822012f4581ed9d93afadaf)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit a91ffe3c1406578f6bd4ad09e59df7e3554c5608
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Tue Mar 27 13:55:28 2012 -0500
Add chanset 'voice-moderate' (#48)
commit 30b00340c3f87603d1d52ef06ab06efbcfc2a1ed
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Tue Mar 27 13:55:50 2012 -0500
Auto unset 'voice-moderate' if 'chanmode -m' is set (#48)
commit 82b9bbd899ba48016bc48d5717fad81dbd3700df
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Tue Mar 27 13:57:06 2012 -0500
Auto set +m when 'voice-moderate' is set (#48)
commit d7372b909c8f9d84e4c3a1718e8a43bb9146ba01
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Tue Mar 27 14:02:02 2012 -0500
DRY flood punishment (#48)
commit 571b74975258409d9eebd3765d907391a6510194
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Tue Mar 27 14:07:54 2012 -0500
Implement devoicing on flood (#48)
commit 13973888e5b7bb048132930966acbe3ba28fcc9c
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Tue Mar 27 14:11:53 2012 -0500
Set EVOICE on abusive clients (#48)
commit a849b0ab29190b3aacc5183eb74e5fd7d5081357
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Tue Mar 27 14:12:16 2012 -0500
Respect devoices from other bots (#48)
commit 975b5bd8868fe4e8685d9fa3c600ea9eed7ab489
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Tue Mar 27 14:12:55 2012 -0500
Document 'voice-moderate' (#48)
commit d7f3387942a363d10f7cac7ef8defe3e548a74b0
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Tue Mar 27 14:14:40 2012 -0500
Properly log response to flood (#48)
commit caeb36e375006ce0d4ce5d75fa97adbca054d523
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Tue Mar 27 14:26:48 2012 -0500
Allow any user op (+o) to enable/disable EVOICE (#48)
commit dd7965a0f2ba0d59ad4a1a1359aa9c227511df6b
Merge: 26bd18a caeb36e
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Tue Mar 27 14:49:21 2012 -0500
Merge branch '48-voice-updates' into next
* 48-voice-updates:
Allow any user op (+o) to enable/disable EVOICE (#48)
Properly log response to flood (#48)
Document 'voice-moderate' (#48)
Respect devoices from other bots (#48)
Set EVOICE on abusive clients (#48)
Implement devoicing on flood (#48)
DRY flood punishment (#48)
Auto set +m when 'voice-moderate' is set (#48)
Auto unset 'voice-moderate' if 'chanmode -m' is set (#48)
Add chanset 'voice-moderate' (#48)
Conflicts:
doc/UPDATES
commit 68e8b2e074cd20e59c7229663512eee73e79e2de
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Tue Mar 27 14:52:13 2012 -0500
Fix shadowed variable 'network'
commit cdd56e8535cfa460e822012f4581ed9d93afadaf
Merge: dd7965a 68e8b2e
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Tue Mar 27 14:52:19 2012 -0500
Merge branch 'getin-network-check' into next
* getin-network-check:
Fix shadowed variable 'network'
-----------------------------------------------------------------------
Complete Diff
diff --git a/doc/UPDATES b/doc/UPDATES
index cbf786a..d73edb7 100755
--- a/doc/UPDATES
+++ b/doc/UPDATES
< at >< at > -2,6 +2,10 < at >< at > next
* Bot will now jump from the server it's on if it is removed from the server list. (fixes a changing network bug)
* Properly honor exemptions when kicking matched RBL clients
* Fix LASTON not being shared
+ * Bots now again respect devoices made by other bots and will not revoice those users.
+ * Add chanset 'voice-moderate' which will auto set +m in '+voice' channel and devoice flooding clients instead of kick. (#48)
+ * Bots now will enforce devoices made by ops (user +o) and allow any op (user +o) to revoice to disable that enforcement.
+ This used to use +m to enforce/allowed revoicing.
1.4.0 - http://wraith.botpack.net/milestone/1.4.0
* Updated server list, 'set -yes servers -' and 'set -yes servers6 -' to get new list.
diff --git a/doc/help.txt b/doc/help.txt
index fb09775..21f0073 100644
--- a/doc/help.txt
+++ b/doc/help.txt
< at >< at > -437,6 +437,8 < at >< at > See also: link%{+a}, newhub%{-}
channel is +protect.
$bvoice-non-ident$b If channel is +voice, clients without an ident will
be voiced. Set to 0 to not voice clients without ident.
+ $bvoice-moderate$b If channel is +voice, auto set +m and devoice flooders
+ instead of kicking them. Set to 0 to disable.
The following options choose how to respond to specific events.
Each can be set as any of the specified options.
diff --git a/src/chan.h b/src/chan.h
index 3904660..ffed9cb 100755
--- a/src/chan.h
+++ b/src/chan.h
< at >< at > -197,6 +197,7 < at >< at > struct chanset_t {
int closed_private;
int closed_invite;
int closed_exempt_mode;
+ int voice_moderate;
deflag_t bad_cookie;
deflag_t manop;
deflag_t mdop;
diff --git a/src/mod/channels.mod/chanmisc.c b/src/mod/channels.mod/chanmisc.c
index b29df24..a01b40a 100755
--- a/src/mod/channels.mod/chanmisc.c
+++ b/src/mod/channels.mod/chanmisc.c
< at >< at > -452,6 +452,16 < at >< at > int channel_modify(char *result, struct chanset_t *chan, int items, char **item,
return ERROR;
}
chan->closed_ban = atoi(item[i]);
+ } else if (!strcmp(item[i], "voice-moderate")) {
+ i++;
+ if (i >= items) {
+ if (result)
+ strlcpy(result, "channel voice-moderate needs argument", RESULT_LEN);
+ return ERROR;
+ }
+ chan->voice_moderate = atoi(item[i]);
+ if (chan->mode_mns_prot & CHANMODER && chan->voice_moderate)
+ chan->voice_moderate = 0;
} else if (!strcmp(item[i], "closed-invite")) {
i++;
if (i >= items) {
< at >< at > -1082,6 +1092,7 < at >< at > int channel_add(char *result, const char *newname, char *options, bool isdefault
chan->closed_ban = 0;
chan->closed_private = 1;
chan->closed_invite = 1;
+ chan->voice_moderate = 1;
chan->voice_non_ident = 1;
chan->auto_delay = 5;
chan->ban_type = 3;
diff --git a/src/mod/channels.mod/channels.c b/src/mod/channels.mod/channels.c
index a079685..c00f429 100755
--- a/src/mod/channels.mod/channels.c
+++ b/src/mod/channels.mod/channels.c
< at >< at > -567,6 +567,9 < at >< at > static void set_mode_protect(struct chanset_t *chan, char *set)
if (chan->mode_mns_prot & CHANINV && chan->closed_invite)
chan->closed_invite = 0;
+
+ if (chan->mode_mns_prot & CHANMODER && chan->voice_moderate)
+ chan->voice_moderate = 0;
}
static void get_mode_protect(struct chanset_t *chan, char *s, size_t ssiz)
< at >< at > -790,6 +793,9 < at >< at > void channels_report(int idx, int details)
if (chan->closed_private)
strlcat(s2, "p", sizeof(s2));
}
+ if (channel_voice(chan) && chan->voice_moderate) {
+ strlcat(s2, "m", sizeof(s2));
+ }
if (conf.bot->hub || shouldjoin(chan)) {
if (channel_active(chan)) {
diff --git a/src/mod/channels.mod/cmdschan.c b/src/mod/channels.mod/cmdschan.c
index cbc117d..c49ae5a 100755
--- a/src/mod/channels.mod/cmdschan.c
+++ b/src/mod/channels.mod/cmdschan.c
< at >< at > -1258,6 +1258,7 < at >< at > static void cmd_chaninfo(int idx, char *par)
SHOW_INT("Revenge: ", chan->revenge, DEFLAG_STR, "Ignore");
SHOW_INT("Protect-backup: ", chan->protect_backup, "Do!", "Don't!");
SHOW_INT("Voice-non-ident: ", chan->voice_non_ident, "Do!", "Don't!");
+ SHOW_INT("Voice-moderate:", chan->voice_moderate, NULL, "Don't!");
dprintf(idx, "Flood settings: chan bytes ctcp join kick deop nick mjoin mpub mbytes mctcp\n");
dprintf(idx, " number: %3d %4d %3d %3d %3d %3d %3d %3d %3d %4d %3d\n",
diff --git a/src/mod/channels.mod/userchan.c b/src/mod/channels.mod/userchan.c
index bcb0298..cf251c3 100755
--- a/src/mod/channels.mod/userchan.c
+++ b/src/mod/channels.mod/userchan.c
< at >< at > -719,7 +719,7 < at >< at > flood-chan %d:%d flood-bytes %d:%d flood-ctcp %d:%d flood-join %d:%d \
flood-kick %d:%d flood-deop %d:%d flood-nick %d:%d flood-mjoin %d:%d \
flood-mpub %d:%d flood-mbytes %d:%d flood-mctcp %d:%d \
capslimit %d colorlimit %d closed-ban %d closed-invite %d closed-private %d closed-exempt %d ban-time %d \
-exempt-time %d invite-time %d voice-non-ident %d auto-delay %d \
+exempt-time %d invite-time %d voice-non-ident %d voice-moderate %d auto-delay %d \
flood-exempt %d flood-lock-time %d knock %d fish-key { %s } \
%cmeankicks %cenforcebans %cdynamicbans %cuserbans %cbitch %cfloodban \
%cprivate %ccycle %cinactive %cdynamicexempts %cuserexempts \
< at >< at > -763,6 +763,7 < at >< at > flood-exempt %d flood-lock-time %d knock %d fish-key { %s } \
chan->exempt_time,
chan->invite_time,
chan->voice_non_ident,
+ chan->voice_moderate,
chan->auto_delay,
chan->flood_exempt_mode,
chan->flood_lock_time,
diff --git a/src/mod/irc.mod/chan.c b/src/mod/irc.mod/chan.c
index 74bac47..8e2b568 100755
--- a/src/mod/irc.mod/chan.c
+++ b/src/mod/irc.mod/chan.c
< at >< at > -738,9 +738,8 < at >< at > static bool detect_chan_flood(memberlist* m, const char *from, struct chanset_t
char *s1 = quickban(chan, from);
u_addmask('b', chan, s1, conf.bot->nick, "channel flood", now + (60 * chan->ban_time), 0);
} else {
- putlog(LOG_MODES, chan->dname, "Channel flood from %s -- kicking", m->nick);
- dprintf(DP_MODE, "KICK %s %s :%s%s\n", chan->name, m->nick, kickprefix, response(RES_FLOOD));
- m->flags |= SENTKICK;
+ const char *response = punish_flooder(chan, m);
+ putlog(LOG_MODES, chan->dname, "Channel flood from %s -- %s", m->nick, response);
}
}
return 1;
< at >< at > -1129,6 +1128,10 < at >< at > void recheck_channel_modes(struct chanset_t *chan)
mns &= ~CHANPRIV;
}
}
+ if (channel_voice(chan) && chan->voice_moderate) {
+ pls |= CHANMODER;
+ mns &= ~CHANMODER;
+ }
if (!(chan->ircnet_status & CHAN_ASKEDMODES)) {
if (pls & CHANINV && !(cur & CHANINV))
diff --git a/src/mod/irc.mod/irc.c b/src/mod/irc.mod/irc.c
index 6071298..a5f6c87 100755
--- a/src/mod/irc.mod/irc.c
+++ b/src/mod/irc.mod/irc.c
< at >< at > -184,22 +184,41 < at >< at > detect_offense(memberlist* m, struct chanset_t *chan, char *msg)
if (chan->capslimit && caps_count && tot >= 6) {
caps_percentage = (caps_count)/(double(tot));
if (caps_percentage >= caps_limit) {
- putlog(LOG_MODES, chan->name, "Caps flood (%d%%) from %s -- kicking", int(caps_percentage * 100), m->nick);
- dprintf(DP_SERVER, "KICK %s %s :%s%s\n", chan->name, m->nick, kickprefix, response(RES_FLOOD));
- m->flags |= SENTKICK;
+ const char *response = punish_flooder(chan, m);
+ putlog(LOG_MODES, chan->name, "Caps flood (%d%%) from %s -- %s", int(caps_percentage * 100), m->nick, response);
return 1;
}
} else if (chan->colorlimit && color_count) {
if (color_count >= chan->colorlimit) {
- putlog(LOG_MODES, chan->name, "Color flood (%d) from %s -- kicking", color_count, m->nick);
- dprintf(DP_SERVER, "KICK %s %s :%s%s\n", chan->name, m->nick, kickprefix, response(RES_FLOOD));
- m->flags |= SENTKICK;
+ const char *response = punish_flooder(chan, m);
+ putlog(LOG_MODES, chan->name, "Color flood (%d) from %s -- %s", color_count, m->nick, response);
return 1;
}
}
return 0;
}
+void set_devoice(struct chanset_t *chan, memberlist* m) {
+ if (!(m->flags & EVOICE)) {
+ putlog(LOG_DEBUG, "< at >", "Giving EVOICE flag to: %s (%s)", m->nick, chan->dname);
+ m->flags |= EVOICE;
+ }
+}
+
+const char* punish_flooder(struct chanset_t* chan, memberlist* m, const char *reason) {
+ if (channel_voice(chan) && chan->voice_moderate && !chan_sentdevoice(m)) {
+ add_mode(chan, '-', 'v', m->nick);
+ m->flags |= SENTDEVOICE;
+ set_devoice(chan, m);
+ return "devoicing";
+ } else if (!chan_sentkick(m)) {
+ dprintf(DP_SERVER, "KICK %s %s :%s%s\n", chan->name, m->nick, kickprefix, reason ? reason : response(RES_FLOOD));
+ m->flags |= SENTKICK;
+ return "kicking";
+ }
+ return "ignoring";
+}
+
void unlock_chan(struct chanset_t *chan)
{
if (chan->channel.drone_set_mode) {
< at >< at > -736,13 +755,13 < at >< at > getin_request(char *botnick, char *code, char *par)
}
// Does the remote bot have the same number of clients in its channel as me? And a shared member?
- const char *network = tmp;
+ const char *bot_network = tmp;
char *shared_nick = par[0] ? newsplit(&par) : NULL;
memberlist* shared_member = shared_nick ? ismember(chan, shared_nick) : NULL;
char *shared_host = par[0] ? newsplit(&par) : NULL;
- if (!shared_nick || !shared_member || !shared_host || (strcmp(curnetwork, network)) || strcmp(shared_host, shared_member->userhost)) {
- putlog(LOG_GETIN, "*", "opreq from %s/%s on %s - Bot seems to be on a different network???", botnick, nick, chan->dname);
+ if (!shared_nick || !shared_member || !shared_host || (strcmp(curnetwork, bot_network)) || strcmp(shared_host, shared_member->userhost)) {
+ putlog(LOG_GETIN, "*", "opreq from %s/%s on %s - Bot seems to be on a different network '%s'", botnick, nick, chan->dname, bot_network);
return;
}
diff --git a/src/mod/irc.mod/irc.h b/src/mod/irc.mod/irc.h
index 3e55539..793c59f 100755
--- a/src/mod/irc.mod/irc.h
+++ b/src/mod/irc.mod/irc.h
< at >< at > -107,6 +107,8 < at >< at > typedef struct resolvstruct resolv_member;
void resolve_to_rbl(struct chanset_t *chan, const char *host, struct resolvstruct *r = NULL);
static void do_mask(struct chanset_t *chan, masklist *m, char *mask, char Mode);
static void get_channel_masks(struct chanset_t* chan);
+const char* punish_flooder(struct chanset_t* chan, memberlist* m, const char *reason = NULL);
+void set_devoice(struct chanset_t* chan, memberlist* m);
#endif /* MAKING_IRC */
diff --git a/src/mod/irc.mod/mode.c b/src/mod/irc.mod/mode.c
index d85e6f9..b211ba8 100755
--- a/src/mod/irc.mod/mode.c
+++ b/src/mod/irc.mod/mode.c
< at >< at > -1482,8 +1482,7 < at >< at > gotmode(char *from, char *msg)
if (msign == '+') {
if (mv->flags & EVOICE) {
- /* FIXME: This is a lame check, we need to expand on this more */
- if (!chan_master(user) && !glob_master(user) && !chk_voice(victim, chan)) {
+ if (!chk_op(user, chan) && !chk_voice(victim, chan)) {
dv = 1;
} else {
mv->flags &= ~EVOICE;
< at >< at > -1509,14 +1508,12 < at >< at > gotmode(char *from, char *msg)
add_mode(chan, '+', 'v', mparam);
/* if they arent +v|v and VOICER is m+ then EVOICE them */
} else {
- /* FIXME: same thing here */
- if (!match_my_nick(nick) && channel_voice(chan) && !glob_bot(user) &&
- (glob_master(user) || chan_master(user)) &&
+ if (!match_my_nick(nick) && channel_voice(chan) &&
+ (chk_op(user, chan) || glob_bot(user)) &&
rfc_casecmp(nick, mparam)) {
/* if the user is not +q set them norEVOICE. */
- if (!chan_quiet(victim) && !(mv->flags & EVOICE)) {
- putlog(LOG_DEBUG, "< at >", "Giving EVOICE flag to: %s (%s)", mv->nick, chan->dname);
- mv->flags |= EVOICE;
+ if (!chan_quiet(victim)) {
+ set_devoice(chan, mv);
}
}
}
hooks/post-receive
--
Wraith Botpack
</pre>git< at >shatow.net2012-03-27T19:53:49branch 'next' updated. v1.3.4-767-g26bd18a
http://permalink.gmane.org/gmane.network.irc.bot.wraith.scm/756
<pre>The branch 'next' has been updated
Summary of changes:
src/mod/irc.mod/irc.c | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
...from d4b48f29f25c823dc46934f237be70065179cce9 (commit) to (26bd18a8f51a47c4391ca18b581e4220eba2e732)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 26832d2d9953a1cf054bcc8cc398486d187f945e
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Tue Mar 27 13:38:45 2012 -0500
Avoid rounding errors by adding 1 to make limit even (#44)
commit 8bee0f35f96886f66d69c8a2bef488e161a1a2ab
Merge: d4b48f2 26832d2
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Tue Mar 27 13:38:55 2012 -0500
Merge branch '44-getin-limit' into next
* 44-getin-limit:
Avoid rounding errors by adding 1 to make limit even (#44)
commit adcd3ec38c3bce9277a09bb740161cbb2092ea54
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Tue Mar 27 13:39:34 2012 -0500
Compare to network name, not number of members in channel for getin op sanity checking
commit 26bd18a8f51a47c4391ca18b581e4220eba2e732
Merge: 8bee0f3 adcd3ec
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Tue Mar 27 13:39:51 2012 -0500
Merge branch 'getin-network-check' into next
* getin-network-check:
Compare to network name, not number of members in channel for getin op sanity checking
-----------------------------------------------------------------------
Complete Diff
diff --git a/src/mod/irc.mod/irc.c b/src/mod/irc.mod/irc.c
index 12ce200..6071298 100755
--- a/src/mod/irc.mod/irc.c
+++ b/src/mod/irc.mod/irc.c
< at >< at > -736,12 +736,12 < at >< at > getin_request(char *botnick, char *code, char *par)
}
// Does the remote bot have the same number of clients in its channel as me? And a shared member?
- int members = atoi(tmp);
+ const char *network = tmp;
char *shared_nick = par[0] ? newsplit(&par) : NULL;
memberlist* shared_member = shared_nick ? ismember(chan, shared_nick) : NULL;
char *shared_host = par[0] ? newsplit(&par) : NULL;
- if (!shared_nick || !shared_member || !shared_host || !((chan->channel.members - chan->channel.splitmembers) == members) || strcmp(shared_host, shared_member->userhost)) {
+ if (!shared_nick || !shared_member || !shared_host || (strcmp(curnetwork, network)) || strcmp(shared_host, shared_member->userhost)) {
putlog(LOG_GETIN, "*", "opreq from %s/%s on %s - Bot seems to be on a different network???", botnick, nick, chan->dname);
return;
}
< at >< at > -999,7 +999,7 < at >< at > request_op(struct chanset_t *chan)
}
/* first scan for bots on my server, ask first found for ops */
- simple_snprintf(s, sizeof(s), "gi o %s %s %d %s %s", chan->dname, botname, (chan->channel.members - chan->channel.splitmembers), shared_member->nick, shared_member->userhost);
+ simple_snprintf(s, sizeof(s), "gi o %s %s %s %s %s", chan->dname, botname, curnetwork, shared_member->nick, shared_member->userhost);
/* look for bots 0-1 hops away */
for (i2 = 0; i2 < i; i2++) {
< at >< at > -1399,14 +1399,16 < at >< at > raise_limit(struct chanset_t *chan)
if (chan->mode_mns_prot & CHANLIMIT)
return false;
- int nl = (chan->channel.members - chan->channel.splitmembers) + chan->limitraise;/* new limit */
- int i = chan->limitraise >> 2;/* DIV 4 */
+ const int nl = (chan->channel.members - chan->channel.splitmembers) + chan->limitraise;/* new limit */
+ const int limitraise = (chan->limitraise % 2 == 0) ? chan->limitraise : (chan->limitraise + 1);
+ const int i = limitraise >> 2;/* DIV 4 */
/* if the newlimit will be in the range made by these vars, dont change. */
- int ul = nl + i;/* upper limit */
- int ll = nl - i;/* lower limit */
+ const int ul = nl + i;/* upper limit */
+ const int ll = nl - i;/* lower limit */
- if ((chan->channel.maxmembers > ll) && (chan->channel.maxmembers < ul))
+ if ((chan->channel.maxmembers > ll) && (chan->channel.maxmembers < ul)) {
return false; /* the current limit is in the range, so leave it. */
+ }
if (nl != chan->channel.maxmembers) {
char s[6] = "";
hooks/post-receive
--
Wraith Botpack
</pre>git< at >shatow.net2012-03-27T18:43:02branch 'next' updated. v1.3.4-763-gd4b48f2
http://permalink.gmane.org/gmane.network.irc.bot.wraith.scm/755
<pre>The branch 'next' has been updated
Summary of changes:
src/mod/irc.mod/irc.c | 41 +++++++++++++++++++++--------------------
1 files changed, 21 insertions(+), 20 deletions(-)
...from 7f30778952f01cf0ef4dd01c612c50d2f87754de (commit) to (d4b48f29f25c823dc46934f237be70065179cce9)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 7367f656ddf9a3ce4453fcff84ab3498591e8d3b
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Mon Mar 26 23:46:54 2012 -0500
Ignore all getin requests unless eligible (#44)
commit d4b48f29f25c823dc46934f237be70065179cce9
Merge: 7f30778 7367f65
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Mon Mar 26 23:46:59 2012 -0500
Merge branch '44-getin-limit' into next
* 44-getin-limit:
Ignore all getin requests unless eligible (#44)
-----------------------------------------------------------------------
Complete Diff
diff --git a/src/mod/irc.mod/irc.c b/src/mod/irc.mod/irc.c
index d2c60a3..12ce200 100755
--- a/src/mod/irc.mod/irc.c
+++ b/src/mod/irc.mod/irc.c
< at >< at > -756,6 +756,27 < at >< at > getin_request(char *botnick, char *code, char *par)
putlog(LOG_GETIN, "*", "opreq from %s/%s on %s - Opped", botnick, nick, chan->dname);
} else if (what[0] == 'i') {
+ // Should I respond to this request?
+ // If there's 18 eligible bots in the channel, and in-bots is 2, I have a 2/18 chance of replying.
+ int eligible_bots = 0;
+ for (memberlist* m = chan->channel.member; m && m->nick[0]; m = m->next) {
+ if (chan_hasop(m)) {
+ member_getuser(m, 0);
+ if (m->user && m->user->bot) {
+ ++eligible_bots;
+ }
+ }
+ }
+
+ if (!eligible_bots) {
+ return;
+ }
+
+ if (!((randint(eligible_bots) + 1) <= static_cast<unsigned int>(in_bots))) {
+ // Not my turn
+ return;
+ }
+
if (mem) {
putlog(LOG_GETIN, "*", "inreq from %s/%s for %s - %s is already on %s", botnick, nick, chan->dname, nick, chan->dname);
return;
< at >< at > -783,26 +804,6 < at >< at > getin_request(char *botnick, char *code, char *par)
return;
}
- // Should I respond to this request?
- // If there's 18 eligible bots in the channel, and in-bots is 2, I have a 2/18 chance of replying.
- int eligible_bots = 0;
- for (memberlist* m = chan->channel.member; m && m->nick[0]; m = m->next) {
- if (chan_hasop(m)) {
- member_getuser(m, 0);
- if (m->user && m->user->bot) {
- ++eligible_bots;
- }
- }
- }
-
- if (!eligible_bots) {
- return;
- }
-
- if (!((randint(eligible_bots) + 1) <= static_cast<unsigned int>(in_bots))) {
- // Not my turn
- return;
- }
bool sendi = 0;
hooks/post-receive
--
Wraith Botpack
</pre>git< at >shatow.net2012-03-27T04:47:24branch 'next' updated. v1.3.4-761-g7f30778
http://permalink.gmane.org/gmane.network.irc.bot.wraith.scm/754
<pre>The branch 'next' has been updated
Summary of changes:
src/mod/irc.mod/irc.c | 21 +++++++++------------
src/mod/irc.mod/irc.h | 2 +-
2 files changed, 10 insertions(+), 13 deletions(-)
...from 3a8375bf318221e18c5de5a9e1eaa53660d8600b (commit) to (7f30778952f01cf0ef4dd01c612c50d2f87754de)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 02db2453a6f4e2b1fbe7b854409246366ffe8b43
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Mon Mar 26 20:00:42 2012 -0500
Only raise limit when inviting a bot if needed (#44)
commit 7f30778952f01cf0ef4dd01c612c50d2f87754de
Merge: 3a8375b 02db245
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Mon Mar 26 20:03:05 2012 -0500
Merge branch '44-getin-limit' into next
* 44-getin-limit:
Only raise limit when inviting a bot if needed (#44)
-----------------------------------------------------------------------
Complete Diff
diff --git a/src/mod/irc.mod/irc.c b/src/mod/irc.mod/irc.c
index 16c21ea..d2c60a3 100755
--- a/src/mod/irc.mod/irc.c
+++ b/src/mod/irc.mod/irc.c
< at >< at > -807,14 +807,8 < at >< at > getin_request(char *botnick, char *code, char *par)
bool sendi = 0;
if (chan->channel.maxmembers) {
- int lim = (chan->channel.members - chan->channel.splitmembers) + 5, curlim = chan->channel.maxmembers;
- if (curlim < lim) {
- char s2[6] = "";
-
- sendi = 1;
- simple_snprintf(s2, sizeof(s2), "%d", lim);
- add_mode(chan, '+', 'l', s2);
- putlog(LOG_GETIN, "*", "inreq from %s/%s for %s - Raised limit to %d", botnick, nick, chan->dname, lim);
+ if (raise_limit(chan)) {
+ putlog(LOG_GETIN, "*", "inreq from %s/%s for %s - Raised limit", botnick, nick, chan->dname);
}
}
< at >< at > -1394,15 +1388,15 < at >< at > check_netfight(struct chanset_t *chan)
chan->channel.fighting = 0; /* we put this here because we need to clear it once per min */
}
-void
+bool
raise_limit(struct chanset_t *chan)
{
if (!chan || !me_op(chan))
- return;
+ return false;
/* Don't bother setting limit if the user has set a protect -l */
if (chan->mode_mns_prot & CHANLIMIT)
- return;
+ return false;
int nl = (chan->channel.members - chan->channel.splitmembers) + chan->limitraise;/* new limit */
int i = chan->limitraise >> 2;/* DIV 4 */
< at >< at > -1411,15 +1405,18 < at >< at > raise_limit(struct chanset_t *chan)
int ll = nl - i;/* lower limit */
if ((chan->channel.maxmembers > ll) && (chan->channel.maxmembers < ul))
- return; /* the current limit is in the range, so leave it. */
+ return false; /* the current limit is in the range, so leave it. */
if (nl != chan->channel.maxmembers) {
char s[6] = "";
simple_snprintf(s, sizeof(s), "%d", nl);
add_mode(chan, '+', 'l', s);
+
+ return true;
}
+ return false;
}
void check_shouldjoin(struct chanset_t* chan)
diff --git a/src/mod/irc.mod/irc.h b/src/mod/irc.mod/irc.h
index 1cd32fc..3e55539 100755
--- a/src/mod/irc.mod/irc.h
+++ b/src/mod/irc.mod/irc.h
< at >< at > -146,7 +146,7 < at >< at > inline void check_this_mask(const char type, struct chanset_t *chan, char *mask,
}
void check_this_user(char *, int, char *);
-void raise_limit(struct chanset_t *);
+bool raise_limit(struct chanset_t *);
void enforce_closed(struct chanset_t *);
void recheck_channel(struct chanset_t *, int);
void recheck_channel_modes(struct chanset_t *);
hooks/post-receive
--
Wraith Botpack
</pre>git< at >shatow.net2012-03-27T01:03:26branch 'next' updated. v1.3.4-759-g3a8375b
http://permalink.gmane.org/gmane.network.irc.bot.wraith.scm/753
<pre>The branch 'next' has been updated
Summary of changes:
src/flags.c | 2 +-
src/mod/channels.mod/chanmisc.c | 32 +++++++++++-----------
src/mod/channels.mod/channels.c | 16 -----------
src/mod/irc.mod/irc.c | 9 +++---
src/set.c | 53 ++++++++++++++++++++++++++++----------
5 files changed, 60 insertions(+), 52 deletions(-)
...from 8bccf5fa8bea3cf04b3faa322f13393aedcd311d (commit) to (3a8375bf318221e18c5de5a9e1eaa53660d8600b)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 67bb61d7307ef7f36f8da8e847fe2dfe137ad2cb
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Mon Mar 26 11:27:23 2012 -0500
Only bail out of offense check if there's no color check as well
commit 2a6af5a53bd1e20d189f2dd83d6e69832e151168
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Mon Mar 26 11:28:48 2012 -0500
Don't punish words 6 chars or less for CAPS
commit b61a2bb8b76cbc23b961f96a95040b417ca240cb
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Mon Mar 26 13:18:32 2012 -0500
Update default flood settings
flood-ctcp 5:30
flood-deop 8:10
flood-mjoin 6:1
flood-mpub 20:1
flood-mbytes 1000:1
flood-mctcp 7:1
commit e1841024696406050f8400087b29165c37407206
Merge: 8bccf5f b61a2bb
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Mon Mar 26 13:18:58 2012 -0500
Merge branch 'flood-tweaks' into next
* flood-tweaks:
Update default flood settings
Don't punish words 6 chars or less for CAPS
Only bail out of offense check if there's no color check as well
commit 9207880984aac83af555defe955038f06739384a
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Mon Mar 26 13:21:13 2012 -0500
Revert "Merge branch 'set-list-new-value' into next"
This reverts commit e1ca1a6ada4d614477b641fde458d89cb596a1c7, reversing
changes made to a4582efb94d2fbb20d8363b21466c2b4bb6d35c3.
commit 5a15dfd838c6e3664aa7af19d94dfe7bb8142f58
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Sun Nov 27 12:54:40 2011 -0600
* Don't pad botnick when using botset
commit 0cdcb71a8b098df4064471e31a36eac2cfab515b
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Sun Nov 27 13:48:29 2011 -0600
* DRY displaying set data
commit 95dd83a4db69b553ce156b73a481c1a32373ba47
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Sun Nov 27 13:52:40 2011 -0600
* Display value when removing/adding to a list
commit 3cbbd3c8bbca858aeb93246b67bab7c275ccee81
Merge: 9207880 c821e8d
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Mon Mar 26 16:05:05 2012 -0500
Merge branch 'master' into next
* master:
Raise buffer for deflag reasons
commit e9f2037c09b824f587ade248dcf7b5bfb43deead
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Mon Mar 26 19:18:36 2012 -0500
Show proper value when adding to a list
commit 0a4eb43cde151cf29eff46cee723852169f23909
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Mon Mar 26 19:30:21 2012 -0500
Don't format var type if not needed
commit 4f9de15958b4a852004bce1112318138cc9d17c7
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Mon Mar 26 19:34:21 2012 -0500
Lessen variable name format length
commit 3a8375bf318221e18c5de5a9e1eaa53660d8600b
Merge: 3cbbd3c 4f9de15
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Mon Mar 26 19:34:41 2012 -0500
Merge branch 'set-list-new-value' into next
* set-list-new-value:
Lessen variable name format length
Don't format var type if not needed
Show proper value when adding to a list
* Display value when removing/adding to a list
* DRY displaying set data
* Don't pad botnick when using botset
-----------------------------------------------------------------------
Complete Diff
diff --git a/src/flags.c b/src/flags.c
index 2afd00a..53580eb 100755
--- a/src/flags.c
+++ b/src/flags.c
< at >< at > -585,7 +585,7 < at >< at > deflag_t deflag_translate(const char *buf)
void deflag_user(struct userrec *u, deflag_event_t why, const char *msg, const struct chanset_t *chan)
{
- char tmp[30] = "", tmp2[1024] = "";
+ char tmp[50] = "", tmp2[1024] = "";
struct flag_record fr = {FR_GLOBAL | FR_CHAN, 0, 0, 0 };
int which = 0;
diff --git a/src/mod/channels.mod/chanmisc.c b/src/mod/channels.mod/chanmisc.c
index 83de7f1..b29df24 100755
--- a/src/mod/channels.mod/chanmisc.c
+++ b/src/mod/channels.mod/chanmisc.c
< at >< at > -1096,27 +1096,27 < at >< at > int channel_add(char *result, const char *newname, char *options, bool isdefault
chan->knock_flags = 0;
chan->flood_lock_time = 120;
chan->flood_exempt_mode = 0;
- chan->flood_pub_thr = gfld_chan_thr;
- chan->flood_pub_time = gfld_chan_time;
- chan->flood_bytes_thr = gfld_bytes_thr;
- chan->flood_bytes_time = gfld_bytes_time;
- chan->flood_ctcp_thr = gfld_ctcp_thr;
- chan->flood_ctcp_time = gfld_ctcp_time;
- chan->flood_join_thr = gfld_join_thr;
- chan->flood_join_time = gfld_join_time;
- chan->flood_deop_thr = gfld_deop_thr;
- chan->flood_deop_time = gfld_deop_time;
- chan->flood_kick_thr = gfld_kick_thr;
- chan->flood_kick_time = gfld_kick_time;
- chan->flood_nick_thr = gfld_nick_thr;
- chan->flood_nick_time = gfld_nick_time;
+ chan->flood_pub_thr = 0;
+ chan->flood_pub_time = 0;
+ chan->flood_bytes_thr = 0;
+ chan->flood_bytes_time = 0;
+ chan->flood_ctcp_thr = 5;
+ chan->flood_ctcp_time = 30;
+ chan->flood_join_thr = 0;
+ chan->flood_join_time = 0;
+ chan->flood_deop_thr = 8;
+ chan->flood_deop_time = 10;
+ chan->flood_kick_thr = 0;
+ chan->flood_kick_time = 0;
+ chan->flood_nick_thr = 0;
+ chan->flood_nick_time = 0;
chan->flood_mjoin_thr = 6;
chan->flood_mjoin_time = 1;
chan->capslimit = 0;
chan->colorlimit = 0;
- chan->flood_mpub_thr = 10;
+ chan->flood_mpub_thr = 20;
chan->flood_mpub_time = 1;
- chan->flood_mbytes_thr = 500;
+ chan->flood_mbytes_thr = 1000;
chan->flood_mbytes_time = 1;
chan->flood_mctcp_thr = 7;
chan->flood_mctcp_time = 1;
diff --git a/src/mod/channels.mod/channels.c b/src/mod/channels.mod/channels.c
index 94e70f6..a079685 100755
--- a/src/mod/channels.mod/channels.c
+++ b/src/mod/channels.mod/channels.c
< at >< at > -61,22 +61,6 < at >< at > static interval_t global_invite_time;
static char *lastdeletedmask = NULL;
-/* Global flood settings */
-static int gfld_chan_thr;
-static interval_t gfld_chan_time;
-static int gfld_bytes_thr;
-static interval_t gfld_bytes_time;
-static int gfld_deop_thr = 8;
-static interval_t gfld_deop_time = 10;
-static int gfld_kick_thr;
-static interval_t gfld_kick_time;
-static int gfld_join_thr;
-static interval_t gfld_join_time;
-static int gfld_ctcp_thr = 5;
-static interval_t gfld_ctcp_time = 30;
-static intgfld_nick_thr;
-static interval_tgfld_nick_time;
-
static int killed_bots = 0;
#include "channels.h"
diff --git a/src/mod/irc.mod/irc.c b/src/mod/irc.mod/irc.c
index efd5381..16c21ea 100755
--- a/src/mod/irc.mod/irc.c
+++ b/src/mod/irc.mod/irc.c
< at >< at > -146,12 +146,11 < at >< at > detect_offense(memberlist* m, struct chanset_t *chan, char *msg)
++msg_check;
}
- if (!tot) {
- return 0;
- }
-
if (tot >= 30) {
hit_check = tot/5; //check in-between for hits to save waste of cpu
+ } else if (!tot && !chan->colorlimit) {
+ // Nothing to do, bail out
+ return 0;
}
}
< at >< at > -182,7 +181,7 < at >< at > detect_offense(memberlist* m, struct chanset_t *chan, char *msg)
}
++msg;
}
- if (chan->capslimit && caps_count) {
+ if (chan->capslimit && caps_count && tot >= 6) {
caps_percentage = (caps_count)/(double(tot));
if (caps_percentage >= caps_limit) {
putlog(LOG_MODES, chan->name, "Caps flood (%d%%) from %s -- kicking", int(caps_percentage * 100), m->nick);
diff --git a/src/set.c b/src/set.c
index 0808e71..1f028dd 100755
--- a/src/set.c
+++ b/src/set.c
< at >< at > -938,12 +938,21 < at >< at > void write_vars_and_cmdpass(bd::Stream& stream, int idx)
stream << bd::String::printf("- %s %s\n", cp->name, cp->pass);
}
-static void display_set_value(int idx, const variable_t *var, const char *data, bool format = false)
+static void display_set_value(int idx, const variable_t *var, const char *botnick, bool format = false)
{
char buf[51] = "";
+ const char *data = NULL;
+ if (botnick) {//fetch data from bot's USERENTRY_SET
+ struct userrec *botu = get_user_by_handle(userlist, (char *) botnick);
+ const char *botdata = var_get_bot_data(botu, var->name);
+ data = botdata ? botdata : NULL;
+ } else {//use global, no bot specified
+ data = var->gdata ? var->gdata : NULL;
+ }
+
if (format) {
- simple_snprintf(buf, sizeof(buf), "(%-6s) %-19s: ", var_type_name(var->flags), var->name);
+ simple_snprintf(buf, sizeof(buf), "(%-6s) %-16s: ", var_type_name(var->flags), var->name);
} else {
simple_snprintf(buf, sizeof(buf), "(%s) %s: ", var_type_name(var->flags), var->name);
}
< at >< at > -958,7 +967,7 < at >< at > int cmd_set_real(const char *botnick, int idx, char *par)
variable_t *var = NULL;
char *name = NULL;
const char *data = NULL, *botdata = NULL;
- int list = 0, i = 0;
+ int list = 0;
bool notyes = 1, wildcard = 0;
if (par[0] && !strncasecmp(par, "-yes", 4)) {
< at >< at > -1035,17 +1044,35 < at >< at > int cmd_set_real(const char *botnick, int idx, char *par)
}
if (!data) {
+ // First determine which variables are going to be shown
+ bd::Array<variable_t*> varsToShow;
+ size_t i = 0;
+
while (vars[i].name) {
- botdata = NULL;
- if (!name || wildcard)//not looping all, provided with one...
- if (vars[i].name)
+ if (!name || wildcard) {//not looping all, provided with one...
+ if (vars[i].name) {
var = &vars[i];
+ }
+ }
if (wildcard && !wild_match(name, var->name)) {
++i;
continue;
}
+ varsToShow << var;
+
+ if (name && !wildcard) {
+ break;
+ }
+ ++i;
+ }
+
+ // Then display them
+ for (i = 0; i < varsToShow.length(); ++i) {
+ var = varsToShow[i];
+ botdata = NULL;
+
if (!(var->flags & VAR_HIDE) && !((var->flags & VAR_PERM) && !isowner(dcc[idx].nick)) &&
!(botnick && ((var->flags & VAR_NOLOC) || (ishub && (var->flags & VAR_NOLHUB))))
) {//Just display the data
< at >< at > -1060,12 +1087,10 < at >< at > int cmd_set_real(const char *botnick, int idx, char *par)
else if (list && !data)
dprintf(idx, "%s list not set.\n", var->name);
else {
- display_set_value(idx, var, data, true);
+ const bool shouldFormat = varsToShow.length() > 1;
+ display_set_value(idx, var, botnick, shouldFormat);
}
}
- if (name && !wildcard)
- break;
- ++i;
}
} else { // need to set it!
if (!list && var->flags & VAR_LIST) {
< at >< at > -1129,7 +1154,7 < at >< at > int cmd_set_real(const char *botnick, int idx, char *par)
return 0;
} else if (var_add_list(botnick, var, data)) {
dprintf(idx, "Added '%s' to %s list.\n", data, var->name);
- display_set_value(idx, var, data);
+ display_set_value(idx, var, botnick);
return 1;
}
} else if (list == LIST_RM) {
< at >< at > -1137,7 +1162,7 < at >< at > int cmd_set_real(const char *botnick, int idx, char *par)
if ((expanded_data = var_rem_list(botnick, var, data)) && expanded_data[0]) {
dprintf(idx, "Removed '%s' from %s list.\n", expanded_data, var->name);
- display_set_value(idx, var, botnick ? (!var->ldata || (var->ldata[0] == '-' && !var->ldata[1]) ? "(not set)" : data) : (var->gdata ? var->gdata : "(not set)"));
+ display_set_value(idx, var, botnick);
return 1;
} else if (!var_find_list(botnick, var, data)) {
char *data_word = NULL;
< at >< at > -1169,7 +1194,7 < at >< at > int cmd_set_real(const char *botnick, int idx, char *par)
if (botnick)
var_set_userentry(botnick, name, data);
- display_set_value(idx, var, data);
+ display_set_value(idx, var, botnick);
if (sdata)
free(sdata);
hooks/post-receive
--
Wraith Botpack
</pre>git< at >shatow.net2012-03-27T00:36:32branch 'master' updated. v1.3.4-457-gc821e8d
http://permalink.gmane.org/gmane.network.irc.bot.wraith.scm/752
<pre>The branch 'master' has been updated
Summary of changes:
src/flags.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
...from 183674744a4fc1bac909c5b483267123740c65be (commit) to (c821e8d29797675b4c2fdf5d3cf78d00d0449b34)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit c821e8d29797675b4c2fdf5d3cf78d00d0449b34
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Mon Mar 26 16:03:58 2012 -0500
Raise buffer for deflag reasons
-----------------------------------------------------------------------
Complete Diff
diff --git a/src/flags.c b/src/flags.c
index 2afd00a..53580eb 100755
--- a/src/flags.c
+++ b/src/flags.c
< at >< at > -585,7 +585,7 < at >< at > deflag_t deflag_translate(const char *buf)
void deflag_user(struct userrec *u, deflag_event_t why, const char *msg, const struct chanset_t *chan)
{
- char tmp[30] = "", tmp2[1024] = "";
+ char tmp[50] = "", tmp2[1024] = "";
struct flag_record fr = {FR_GLOBAL | FR_CHAN, 0, 0, 0 };
int which = 0;
hooks/post-receive
--
Wraith Botpack
</pre>git< at >shatow.net2012-03-27T00:36:20branch 'next' updated. v1.3.4-745-g8bccf5f
http://permalink.gmane.org/gmane.network.irc.bot.wraith.scm/751
<pre>The branch 'next' has been updated
Summary of changes:
src/mod/irc.mod/cmdsirc.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
...from 06e38d079d790247142c60f034ec9cbeb230e87d (commit) to (8bccf5fa8bea3cf04b3faa322f13393aedcd311d)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 8bccf5fa8bea3cf04b3faa322f13393aedcd311d
Merge: 06e38d0 1836747
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Sun Mar 25 20:38:03 2012 -0500
Merge branch 'master' into next
* master:
Fix cmd_adduser/cmd_kickban not using proper hostname
-----------------------------------------------------------------------
Complete Diff
diff --git a/src/mod/irc.mod/cmdsirc.c b/src/mod/irc.mod/cmdsirc.c
index 018e376..a4a2711 100755
--- a/src/mod/irc.mod/cmdsirc.c
+++ b/src/mod/irc.mod/cmdsirc.c
< at >< at > -286,6 +286,7 < at >< at > static void cmd_kickban(int idx, char *par)
}
member_getuser(m);
u = m->user;
+ strlcpy(s, m->from, sizeof(s));
get_user_flagrec(u, &victim, chan->dname);
if ((chan_master(victim) || glob_master(victim)) &&
< at >< at > -1720,6 +1721,7 < at >< at > static void cmd_adduser(int idx, char *par)
if (strlen(hand) > HANDLEN)
hand[HANDLEN] = 0;
member_getuser(m);
+ strlcpy(s, m->from, sizeof(s));
if ((u = m->user)) {
dprintf(idx, "%s is already known as %s.\n", nick, u->handle);
return;
hooks/post-receive
--
Wraith Botpack
</pre>git< at >shatow.net2012-03-26T01:38:30branch 'master' updated. v1.3.4-456-g1836747
http://permalink.gmane.org/gmane.network.irc.bot.wraith.scm/750
<pre>The branch 'master' has been updated
Summary of changes:
src/mod/irc.mod/cmdsirc.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
...from 066136fa9684d2b61cf58f862729a39211e52487 (commit) to (183674744a4fc1bac909c5b483267123740c65be)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 183674744a4fc1bac909c5b483267123740c65be
Author: Bryan Drewery <bryan< at >shatow.net>
Date: Sun Mar 25 20:28:21 2012 -0500
Fix cmd_adduser/cmd_kickban not using proper hostname
This was a regression from 'member-from'
-----------------------------------------------------------------------
Complete Diff
diff --git a/src/mod/irc.mod/cmdsirc.c b/src/mod/irc.mod/cmdsirc.c
index 018e376..a4a2711 100755
--- a/src/mod/irc.mod/cmdsirc.c
+++ b/src/mod/irc.mod/cmdsirc.c
< at >< at > -286,6 +286,7 < at >< at > static void cmd_kickban(int idx, char *par)
}
member_getuser(m);
u = m->user;
+ strlcpy(s, m->from, sizeof(s));
get_user_flagrec(u, &victim, chan->dname);
if ((chan_master(victim) || glob_master(victim)) &&
< at >< at > -1720,6 +1721,7 < at >< at > static void cmd_adduser(int idx, char *par)
if (strlen(hand) > HANDLEN)
hand[HANDLEN] = 0;
member_getuser(m);
+ strlcpy(s, m->from, sizeof(s));
if ((u = m->user)) {
dprintf(idx, "%s is already known as %s.\n", nick, u->handle);
return;
hooks/post-receive
--
Wraith Botpack
</pre>git< at >shatow.net2012-03-26T01:38:22Search EngineSearch the mailing list at Gmanequery
http://search.gmane.org/?group=$group=gmane.network.irc.bot.wraith.scm