[IRC-Dev CVS] [CVS] Module ircd-ircdev: Change committed
Brought to you by:
zolty
Menu
▾
▴
[IRC-Dev CVS] [CVS] Module ircd-ircdev: Change committed
|
From: Toni G. <zo...@us...> - 2005-02-15 16:32:29
|
CVSROOT : /cvsroot/irc-dev
Module : ircd-ircdev
Commit time: 2005-02-15 16:32:02 UTC
Modified files:
ChangeLog ChangeLog.es Makefile.in configure.in
include/ircd_alloc.h include/memdebug.h include/patchlevel.h
ircd/Makefile.in ircd/gline.c ircd/ircd_alloc.c ircd/ircd_res.c
ircd/ircd_string.c ircd/memdebug.c ircd/motd.c ircd/umkpasswd.c
ircd/test/ircd_in_addr_t.c
Log message:
Author: zoltan <zo...@ir...>
Log message:
2005-02-15 Toni García <zo...@ir...> 1.0.alpha17
* Fix de un bug IPv6
* Fix de un bug MOTD
* Fix de un bug GLINE
---------------------- diff included ----------------------
Index: ircd-ircdev/ChangeLog
diff -u ircd-ircdev/ChangeLog:1.17 ircd-ircdev/ChangeLog:1.18
--- ircd-ircdev/ChangeLog:1.17 Wed Jan 26 09:19:33 2005
+++ ircd-ircdev/ChangeLog Tue Feb 15 08:31:48 2005
@@ -1,10 +1,15 @@
#
# ChangeLog for ircd-ircdev
#
-# $Id: ChangeLog,v 1.17 2005/01/26 17:19:33 zolty Exp $
+# $Id: ChangeLog,v 1.18 2005/02/15 16:31:48 zolty Exp $
#
# Insert new changes at beginning of the change list.
#
+2005-02-15 Toni García <zo...@ir...> 1.0.alpha17
+ * Fix IPv6 bug
+ * Fix MOTD bug
+ * Fix GLINE bug
+
2005-01-26 Toni García <zo...@ir...> 1.0.alpha16
* Undernet synchronization
Index: ircd-ircdev/ChangeLog.es
diff -u ircd-ircdev/ChangeLog.es:1.17 ircd-ircdev/ChangeLog.es:1.18
--- ircd-ircdev/ChangeLog.es:1.17 Wed Jan 26 09:19:37 2005
+++ ircd-ircdev/ChangeLog.es Tue Feb 15 08:31:49 2005
@@ -1,10 +1,15 @@
#
# Log de Cambios para ircd-ircdev
#
-# $Id: ChangeLog.es,v 1.17 2005/01/26 17:19:37 zolty Exp $
+# $Id: ChangeLog.es,v 1.18 2005/02/15 16:31:49 zolty Exp $
#
# Insertar los nuevos cambios al principio de esta lista de cambios.
#
+2005-02-15 Toni García <zo...@ir...> 1.0.alpha17
+ * Fix de un bug IPv6
+ * Fix de un bug MOTD
+ * Fix de un bug GLINE
+
2005-01-26 Toni García <zo...@ir...> 1.0.alpha16
* Sincronizacion Undernet
Index: ircd-ircdev/Makefile.in
diff -u ircd-ircdev/Makefile.in:1.7 ircd-ircdev/Makefile.in:1.8
--- ircd-ircdev/Makefile.in:1.7 Mon Jan 10 04:29:52 2005
+++ ircd-ircdev/Makefile.in Tue Feb 15 08:31:49 2005
@@ -103,7 +103,6 @@
install: ${IRCD_MAKEFILES}
test -d ${prefix} || mkdir ${prefix}
- test -d ${prefix}/include || mkdir ${prefix}/include
@for i in ${SUBDIRS}; do \
echo "Installing $$i..."; \
cd $$i; ${MAKE} install; cd ..; \
Index: ircd-ircdev/configure.in
diff -u ircd-ircdev/configure.in:1.11 ircd-ircdev/configure.in:1.12
--- ircd-ircdev/configure.in:1.11 Wed Jan 26 09:19:39 2005
+++ ircd-ircdev/configure.in Tue Feb 15 08:31:49 2005
@@ -22,7 +22,7 @@
dnl along with this program; if not, write to the Free Software
dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
dnl
-dnl $Id: configure.in,v 1.11 2005/01/26 17:19:39 zolty Exp $
+dnl $Id: configure.in,v 1.12 2005/02/15 16:31:49 zolty Exp $
dnl
dnl Make sure we are in the correct directory (someone could have run
@@ -172,7 +172,8 @@
elif echo "" | $YACC -V -v --version > /dev/null 2>&1 ; then
:
else
- AC_MSG_ERROR([Cannot use $YACC as yacc.])
+dnl byacc does not seem to have any way to test for workingness, so only warn.
+ AC_MSG_WARN([$YACC may not work as yacc.])
fi
Index: ircd-ircdev/include/ircd_alloc.h
diff -u ircd-ircdev/include/ircd_alloc.h:1.4 ircd-ircdev/include/ircd_alloc.h:1.5
--- ircd-ircdev/include/ircd_alloc.h:1.4 Mon Jan 10 04:21:59 2005
+++ ircd-ircdev/include/ircd_alloc.h Tue Feb 15 08:31:49 2005
@@ -21,7 +21,7 @@
*/
/** @file
* @brief IRC daemon memory allocation functions.
- * @version $Id: ircd_alloc.h,v 1.4 2005/01/10 12:21:59 zolty Exp $
+ * @version $Id: ircd_alloc.h,v 1.5 2005/02/15 16:31:49 zolty Exp $
*/
#ifndef INCLUDED_ircd_alloc_h
#define INCLUDED_ircd_alloc_h
@@ -40,7 +40,7 @@
/** Helper macro for zero-initialized allocations. */
#define MyCalloc(nelem, size) \
- DoMallocZero(size * nelem, "calloc", __FILE__, __LINE__)
+ DoMallocZero((size) * (nelem), "calloc", __FILE__, __LINE__)
/** Helper macro for freeing memory. */
#define MyFree(p) \
@@ -74,7 +74,7 @@
#define DoMallocZero(size, type, file, line) \
dbg_malloc_zero(size, type, file, line)
#define DoFree(p, file, line) \
- dbg_free(p, file, line)
+ do { dbg_free(p, file, line); (p) = 0; } while (0)
#define DoRealloc(p, size, file, line) \
dbg_realloc(p, size, file, line)
#endif /* defined(MDEBUG) */
Index: ircd-ircdev/include/memdebug.h
diff -u ircd-ircdev/include/memdebug.h:1.2 ircd-ircdev/include/memdebug.h:1.3
--- ircd-ircdev/include/memdebug.h:1.2 Mon Jan 10 04:22:00 2005
+++ ircd-ircdev/include/memdebug.h Tue Feb 15 08:31:49 2005
@@ -18,7 +18,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * $Id: memdebug.h,v 1.2 2005/01/10 12:22:00 zolty Exp $
+ * $Id: memdebug.h,v 1.3 2005/02/15 16:31:49 zolty Exp $
*/
/* This file should only ever be included from ircd_alloc.h */
@@ -26,3 +26,5 @@
void *dbg_malloc_zero(size_t size, const char *type, const char *file, int line);
void *dbg_realloc(void *ptr, size_t size, const char *file, int line);
void dbg_free(void *ptr, const char *file, int line);
+size_t fda_get_byte_count(void);
+size_t fda_get_block_count(void);
Index: ircd-ircdev/include/patchlevel.h
diff -u ircd-ircdev/include/patchlevel.h:1.18 ircd-ircdev/include/patchlevel.h:1.19
--- ircd-ircdev/include/patchlevel.h:1.18 Wed Jan 26 09:19:42 2005
+++ ircd-ircdev/include/patchlevel.h Tue Feb 15 08:31:50 2005
@@ -17,10 +17,10 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * $Id: patchlevel.h,v 1.18 2005/01/26 17:19:42 zolty Exp $
+ * $Id: patchlevel.h,v 1.19 2005/02/15 16:31:50 zolty Exp $
*
*/
-#define PATCHLEVEL ".alpha16"
+#define PATCHLEVEL ".alpha17"
#define RELEASE "1.0"
Index: ircd-ircdev/ircd/Makefile.in
diff -u ircd-ircdev/ircd/Makefile.in:1.16 ircd-ircdev/ircd/Makefile.in:1.17
--- ircd-ircdev/ircd/Makefile.in:1.16 Wed Jan 26 09:19:42 2005
+++ ircd-ircdev/ircd/Makefile.in Tue Feb 15 08:31:50 2005
@@ -18,7 +18,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307 USA
-# $Id: Makefile.in,v 1.16 2005/01/26 17:19:42 zolty Exp $
+# $Id: Makefile.in,v 1.17 2005/02/15 16:31:50 zolty Exp $
#### Start of system configuration section. ####
@@ -301,11 +301,6 @@
${INSTALL} -s -m 700 -o ${IRCDOWN} -g ${IRCDGRP} umkpasswd ${BINDIR}
${INSTALL} -m 600 -o ${IRCDOWN} -g ${IRCDGRP} ${top_srcdir}/doc/ircd.sample-en.conf ${DPATH}
${INSTALL} -m 600 -o ${IRCDOWN} -g ${IRCDGRP} ${top_srcdir}/doc/ircd.sample-es.conf ${DPATH}
-# ( cd ${DPATH}; \
-# ${TOUCH} ${MPATH}; \
-# ${TOUCH} ${RPATH}; \
-# ${CHOWN} ${IRCDOWN} ${MPATH} ${RPATH}; \
-# ${CHGRP} ${IRCDGRP} ${MPATH} ${RPATH}; )
install-no-symlink: build mkbindir
@if [ ! -d ${DPATH} -a ! -f ${DPATH} ]; then \
@@ -319,11 +314,6 @@
${INSTALL} -m ${IRCDMODE} -o ${IRCDOWN} -g ${IRCDGRP} ircd ${BINDIR}/ircd
${INSTALL} -m 600 -o ${IRCDOWN} -g ${IRCDGRP} ${top_srcdir}/doc/ircd.sample-en.conf ${DPATH}
${INSTALL} -m 600 -o ${IRCDOWN} -g ${IRCDGRP} ${top_srcdir}/doc/ircd.sample-es.conf ${DPATH}
-# ( cd ${DPATH}; \
-# ${TOUCH} ${MPATH}; \
-# ${TOUCH} ${RPATH}; \
-# ${CHOWN} ${IRCDOWN} ${MPATH} ${RPATH}; \
-# ${CHGRP} ${IRCDGRP} ${MPATH} ${RPATH}; )
uninstall:
@if [ "${BINDIR}" != "${DPATH}" ]; then \
Index: ircd-ircdev/ircd/gline.c
diff -u ircd-ircdev/ircd/gline.c:1.11 ircd-ircdev/ircd/gline.c:1.12
--- ircd-ircdev/ircd/gline.c:1.11 Mon Jan 10 04:22:58 2005
+++ ircd-ircdev/ircd/gline.c Tue Feb 15 08:31:51 2005
@@ -23,7 +23,7 @@
*/
/** @file
* @brief Implementation of Gline manipulation functions.
- * @version $Id: gline.c,v 1.11 2005/01/10 12:22:58 zolty Exp $
+ * @version $Id: gline.c,v 1.12 2005/02/15 16:31:51 zolty Exp $
*/
#include "config.h"
@@ -644,10 +644,7 @@
return 0;
DupString(t_uh, userhost);
- canon_userhost(t_uh, &user, &host, 0);
-
- if(BadPtr(user))
- return 0;
+ canon_userhost(t_uh, &user, &host, "*");
for (gline = GlobalGlineList; gline; gline = sgline) {
sgline = gline->gl_next;
@@ -660,14 +657,12 @@
else if (flags & GLINE_EXACT) {
if (((gline->gl_host && host && ircd_strcmp(gline->gl_host,host) == 0)
||(!gline->gl_host && !host)) &&
- ((!user && ircd_strcmp(gline->gl_user, "*") == 0) ||
- ircd_strcmp(gline->gl_user, user) == 0))
+ (ircd_strcmp(gline->gl_user, user) == 0))
break;
} else {
if (((gline->gl_host && host && match(gline->gl_host,host) == 0)
||(!gline->gl_host && !host)) &&
- ((!user && ircd_strcmp(gline->gl_user, "*") == 0) ||
- match(gline->gl_user, user) == 0))
+ (match(gline->gl_user, user) == 0))
break;
}
}
Index: ircd-ircdev/ircd/ircd_alloc.c
diff -u ircd-ircdev/ircd/ircd_alloc.c:1.5 ircd-ircdev/ircd/ircd_alloc.c:1.6
--- ircd-ircdev/ircd/ircd_alloc.c:1.5 Mon Jan 10 04:22:58 2005
+++ ircd-ircdev/ircd/ircd_alloc.c Tue Feb 15 08:31:51 2005
@@ -21,7 +21,7 @@
*/
/** @file
* @brief IRC daemon memory allocation functions.
- * @version $Id: ircd_alloc.c,v 1.5 2005/01/10 12:22:58 zolty Exp $
+ * @version $Id: ircd_alloc.c,v 1.6 2005/02/15 16:31:51 zolty Exp $
*/
#include "config.h"
@@ -57,6 +57,7 @@
noMemHandler = handler;
}
+#ifndef MDEBUG
/** Allocate memory.
* @param[in] size Number of bytes to allocate.
* @param[in] x Type of allocation (ignored).
@@ -101,4 +102,5 @@
(*noMemHandler)();
return t;
}
+#endif
Index: ircd-ircdev/ircd/ircd_res.c
diff -u ircd-ircdev/ircd/ircd_res.c:1.5 ircd-ircdev/ircd/ircd_res.c:1.6
--- ircd-ircdev/ircd/ircd_res.c:1.5 Wed Jan 26 09:19:47 2005
+++ ircd-ircdev/ircd/ircd_res.c Tue Feb 15 08:31:51 2005
@@ -41,7 +41,7 @@
*/
/** @file
* @brief IRC resolver functions.
- * @version $Id: ircd_res.c,v 1.5 2005/01/26 17:19:47 zolty Exp $
+ * @version $Id: ircd_res.c,v 1.6 2005/02/15 16:31:51 zolty Exp $
*/
#include "client.h"
#include "ircd_alloc.h"
@@ -300,7 +300,7 @@
{
if (when > CurrentTime + AR_TTL)
when = CurrentTime + AR_TTL;
- if (!t_onqueue(&res_timeout))
+ if (!t_active(&res_timeout) || !t_onqueue(&res_timeout))
timer_add(&res_timeout, timeout_resolver, NULL, TT_ABSOLUTE, when);
else if (when < t_expire(&res_timeout))
timer_chg(&res_timeout, TT_ABSOLUTE, when);
Index: ircd-ircdev/ircd/ircd_string.c
diff -u ircd-ircdev/ircd/ircd_string.c:1.7 ircd-ircdev/ircd/ircd_string.c:1.8
--- ircd-ircdev/ircd/ircd_string.c:1.7 Mon Jan 10 04:23:00 2005
+++ ircd-ircdev/ircd/ircd_string.c Tue Feb 15 08:31:51 2005
@@ -21,7 +21,7 @@
*/
/** @file
* @brief Implementation of string operations.
- * @version $Id: ircd_string.c,v 1.7 2005/01/10 12:23:00 zolty Exp $
+ * @version $Id: ircd_string.c,v 1.8 2005/02/15 16:31:51 zolty Exp $
*/
#include "config.h"
@@ -599,6 +599,7 @@
return 0;
colon = 0;
pos += 2;
+ part_start = input + pos;
}
while (ii < 8) {
unsigned char chval;
Index: ircd-ircdev/ircd/memdebug.c
diff -u ircd-ircdev/ircd/memdebug.c:1.3 ircd-ircdev/ircd/memdebug.c:1.4
--- ircd-ircdev/ircd/memdebug.c:1.3 Mon Jan 10 04:23:03 2005
+++ ircd-ircdev/ircd/memdebug.c Tue Feb 15 08:31:51 2005
@@ -18,7 +18,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * $Id: memdebug.c,v 1.3 2005/01/10 12:23:03 zolty Exp $
+ * $Id: memdebug.c,v 1.4 2005/02/15 16:31:51 zolty Exp $
*
*/
#include <sys/types.h>
@@ -27,7 +27,9 @@
#include "ircd_log.h"
#include "client.h"
#include "s_debug.h"
+#include "send.h"
#include <stdlib.h>
+#include <string.h>
/* #include <assert.h> -- Now using assert in ircd_log.h */
Index: ircd-ircdev/ircd/motd.c
diff -u ircd-ircdev/ircd/motd.c:1.6 ircd-ircdev/ircd/motd.c:1.7
--- ircd-ircdev/ircd/motd.c:1.6 Mon Jan 10 04:23:03 2005
+++ ircd-ircdev/ircd/motd.c Tue Feb 15 08:31:51 2005
@@ -22,7 +22,7 @@
*/
/** @file
* @brief Message-of-the-day manipulation implementation.
- * @version $Id: motd.c,v 1.6 2005/01/10 12:23:03 zolty Exp $
+ * @version $Id: motd.c,v 1.7 2005/02/15 16:31:51 zolty Exp $
*/
#include "config.h"
@@ -93,6 +93,8 @@
if (hostmask != NULL)
DupString(tmp->hostmask, hostmask);
+ else
+ tmp->hostmask = NULL;
DupString(tmp->path, path);
tmp->maxcount = maxcount;
Index: ircd-ircdev/ircd/test/ircd_in_addr_t.c
diff -u ircd-ircdev/ircd/test/ircd_in_addr_t.c:1.1 ircd-ircdev/ircd/test/ircd_in_addr_t.c:1.2
--- ircd-ircdev/ircd/test/ircd_in_addr_t.c:1.1 Wed Jan 5 03:58:36 2005
+++ ircd-ircdev/ircd/test/ircd_in_addr_t.c Tue Feb 15 08:31:51 2005
@@ -34,6 +34,9 @@
{ "::ffff:127.0.0.3", "127.0.0.3",
{{ 0, 0, 0, 0, 0, 0xffff, 0x7f00, 3 }},
"B]AAAD", "B]AAAD", 1, 1, 1 },
+ { "::127.0.0.1", "127.0.0.1",
+ {{ 0, 0, 0, 0, 0, 0, 0x7f00, 1 }},
+ "B]AAAB", "B]AAAB", 1, 1, 1 },
{ "2002:7f00:3::1", "2002:7f00:3::1",
{{ 0x2002, 0x7f00, 3, 0, 0, 0, 0, 1 }},
"B]AAAD", "CACH8AAAD_AAB", 1, 0, 0 },
Index: ircd-ircdev/ircd/umkpasswd.c
diff -u ircd-ircdev/ircd/umkpasswd.c:1.3 ircd-ircdev/ircd/umkpasswd.c:1.4
--- ircd-ircdev/ircd/umkpasswd.c:1.3 Mon Jan 10 04:23:04 2005
+++ ircd-ircdev/ircd/umkpasswd.c Tue Feb 15 08:31:51 2005
@@ -18,7 +18,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * $Id: umkpasswd.c,v 1.3 2005/01/10 12:23:04 zolty Exp $
+ * $Id: umkpasswd.c,v 1.4 2005/02/15 16:31:51 zolty Exp $
*
*/
#include "config.h"
@@ -49,6 +49,13 @@
umkpasswd_conf_t* umkpasswd_conf;
crypt_mechs_t* crypt_mechs_root;
int log_inassert = 0;
+time_t CurrentTime;
+
+void sendto_opmask_butone(struct Client *one, unsigned int mask,
+ const char *pattern, ...)
+{
+ /* only needed with memdebug, which also calls Debug() */
+}
void copyright(void)
{
----------------------- End of diff -----------------------
|
