Thread: [IRC-Dev CVS] SF.net SVN: irc-dev:[204] ircd/trunk/ircd
Brought to you by:
zolty
Menu
▾
▴
irc-dev-cvs
|
From: <zo...@us...> - 2008-08-18 19:26:23
|
Revision: 204
http://irc-dev.svn.sourceforge.net/irc-dev/?rev=204&view=rev
Author: zolty
Date: 2008-08-18 19:26:23 +0000 (Mon, 18 Aug 2008)
Log Message:
-----------
TRansicion vhosts
Modified Paths:
--------------
ircd/trunk/ircd/ddb_events.c
ircd/trunk/ircd/m_die.c
ircd/trunk/ircd/s_user.c
Modified: ircd/trunk/ircd/ddb_events.c
===================================================================
--- ircd/trunk/ircd/ddb_events.c 2008-08-15 22:09:38 UTC (rev 203)
+++ ircd/trunk/ircd/ddb_events.c 2008-08-18 19:26:23 UTC (rev 204)
@@ -32,6 +32,7 @@
#include "ircd.h"
#include "ircd_alloc.h"
#include "ircd_chattr.h"
+#include "ircd_features.h"
#include "ircd_snprintf.h"
#include "ircd_tea.h"
#include "msg.h"
@@ -270,14 +271,14 @@
tempa[0] = keytemp;
tempa[1] = content;
- feature_set(&me, tempa, 2);
+ feature_set(&me, (const char * const *)tempa, 2);
}
else
{
char *tempb[1];
tempb[0] = keytemp;
- feature_set(&me, tempb, 1);
+ feature_set(&me, (const char * const *)tempb, 1);
}
}
@@ -518,11 +519,22 @@
{
if (content)
{
+#if 1 /* TRANSICION IRC-HISPANO */
+ if (!strcmp(key, feature_bool(FEAT_TRANSICION_HISPANO) ?
+ "numero.maximo.de.clones.por.defecto" : DDB_CONFIGDB_MAX_CLONES_PER_IP))
+ max_clones = atoi(content);
+ else if (!strcmp(key, feature_bool(FEAT_TRANSICION_HISPANO) ?
+ "mensaje.de.demasiados.clones" : DDB_CONFIGDB_MSG_TOO_MANY_FROM_IP))
+ msg_many_clones = content;
+ else if (!strcmp(key, feature_bool(FEAT_TRANSICION_HISPANO) ?
+ "clave.de.cifrado.de.ips" : DDB_CONFIGDB_IP_CRYPT_KEY))
+#else
if (!strcmp(key, DDB_CONFIGDB_MAX_CLONES_PER_IP))
max_clones = atoi(content);
else if (!strcmp(key, DDB_CONFIGDB_MSG_TOO_MANY_FROM_IP))
msg_many_clones = content;
else if (!strcmp(key, DDB_CONFIGDB_IP_CRYPT_KEY))
+#endif
{
char keytmp[12 + 1];
char c;
@@ -539,11 +551,22 @@
}
else
{
+#if 1 /* TRANSICION IRC-HISPANO */
+ if (!strcmp(key, feature_bool(FEAT_TRANSICION_HISPANO) ?
+ "numero.maximo.de.clones.por.defecto" : DDB_CONFIGDB_MAX_CLONES_PER_IP))
+ max_clones = 0;
+ else if (!strcmp(key, feature_bool(FEAT_TRANSICION_HISPANO) ?
+ "mensaje.de.demasiados.clones" : DDB_CONFIGDB_MSG_TOO_MANY_FROM_IP))
+ msg_many_clones = NULL;
+ else if (!strcmp(key, feature_bool(FEAT_TRANSICION_HISPANO) ?
+ "clave.de.cifrado.de.ips" : DDB_CONFIGDB_IP_CRYPT_KEY))
+#else
if (!strcmp(key, DDB_CONFIGDB_MAX_CLONES_PER_IP))
max_clones = 0;
else if (!strcmp(key, DDB_CONFIGDB_MSG_TOO_MANY_FROM_IP))
msg_many_clones = NULL;
else if (!strcmp(key, DDB_CONFIGDB_IP_CRYPT_KEY))
+#endif
{
ip_crypt_key = NULL;
binary_ip_crypt_key[0] = 0;
Modified: ircd/trunk/ircd/m_die.c
===================================================================
--- ircd/trunk/ircd/m_die.c 2008-08-15 22:09:38 UTC (rev 203)
+++ ircd/trunk/ircd/m_die.c 2008-08-18 19:26:23 UTC (rev 204)
@@ -122,7 +122,7 @@
reason = parv[parc - 1];
/* now, let's schedule the exit */
- exit_schedule(0, 0, 0, "Received DIE");
+ exit_schedule(0, when, sptr, reason);
return 0;
}
Modified: ircd/trunk/ircd/s_user.c
===================================================================
--- ircd/trunk/ircd/s_user.c 2008-08-15 22:09:38 UTC (rev 203)
+++ ircd/trunk/ircd/s_user.c 2008-08-18 19:26:23 UTC (rev 204)
@@ -1248,7 +1248,6 @@
ipcrypted[6] = '.';
inttobase64(ipcrypted + 7, x[1], 6);
strncpy(ipcrypted + 13, ".v4", HOSTLEN);
- log_write(LS_SYSTEM, L_CRIT, 0, "%u - %u", x[0], x[1]);
/* No deber\xEDa ocurrir nunca... */
if (++ts == 65535)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <zo...@us...> - 2008-09-11 23:21:34
|
Revision: 208
http://irc-dev.svn.sourceforge.net/irc-dev/?rev=208&view=rev
Author: zolty
Date: 2008-09-11 23:21:45 +0000 (Thu, 11 Sep 2008)
Log Message:
-----------
Correcciones menores
Modified Paths:
--------------
ircd/trunk/ircd/m_ghost.c
ircd/trunk/ircd/s_user.c
Modified: ircd/trunk/ircd/m_ghost.c
===================================================================
--- ircd/trunk/ircd/m_ghost.c 2008-08-24 19:44:36 UTC (rev 207)
+++ ircd/trunk/ircd/m_ghost.c 2008-09-11 23:21:45 UTC (rev 208)
@@ -117,7 +117,7 @@
acptr, cptr);
}
sendcmdbotto_one(botname, CMD_NOTICE, cptr, "%C :*** %C GHOST session has been "
- "released", acptr, cptr);
+ "released", cptr, acptr);
exit_client_msg(cptr, acptr, &me, "Killed (GHOST session released by %C)",
cptr);
return 0;
Modified: ircd/trunk/ircd/s_user.c
===================================================================
--- ircd/trunk/ircd/s_user.c 2008-08-24 19:44:36 UTC (rev 207)
+++ ircd/trunk/ircd/s_user.c 2008-09-11 23:21:45 UTC (rev 208)
@@ -486,8 +486,8 @@
/* Send user mode to client */
if (MyUser(sptr))
{
+ #if defined(UNDERNET)
static struct Flags flags; /* automatically initialized to zeros */
-#if defined(UNDERNET)
/* To avoid sending +r to the client due to auth-on-connect, set
* the "old" FLAG_ACCOUNT bit to match the client's value.
*/
@@ -496,8 +496,8 @@
else
FlagClr(&flags, FLAG_ACCOUNT);
client_set_privs(sptr, NULL);
-#endif
send_umode(cptr, sptr, &flags, ALL_UMODES);
+#endif
if ((cli_snomask(sptr) != SNO_DEFAULT) && HasFlag(sptr, FLAG_SERVNOTICE))
send_reply(sptr, RPL_SNOMASK, cli_snomask(sptr), cli_snomask(sptr));
}
@@ -832,6 +832,9 @@
#if defined(DDB)
if (IsIdentify(flags) && !IsNickEquivalent(flags))
{
+ if (!botname)
+ botname = ddb_get_botname(DDB_NICKSERV);
+
sendcmdbotto_one(botname, CMD_NOTICE, cptr,
"%C :*** Password accepted. Welcome to %s",
cptr, feature_str(FEAT_NETWORK));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <zo...@us...> - 2008-09-12 12:44:50
|
Revision: 211
http://irc-dev.svn.sourceforge.net/irc-dev/?rev=211&view=rev
Author: zolty
Date: 2008-09-12 12:45:00 +0000 (Fri, 12 Sep 2008)
Log Message:
-----------
correccion gramatical
Modified Paths:
--------------
ircd/trunk/ircd/hash.c
ircd/trunk/ircd/ircd_features.c
ircd/trunk/ircd/s_conf.c
Modified: ircd/trunk/ircd/hash.c
===================================================================
--- ircd/trunk/ircd/hash.c 2008-09-12 00:11:06 UTC (rev 210)
+++ ircd/trunk/ircd/hash.c 2008-09-12 12:45:00 UTC (rev 211)
@@ -498,7 +498,7 @@
#if defined(DDB)
for (ddb = ddb_iterator_first(DDB_JUPEDB); ddb;
ddb = ddb_iterator_next())
- send_reply(to, SND_EXPLICIT | RPL_STATSJLINE, "J %s :%s (setted by DDB)",
+ send_reply(to, SND_EXPLICIT | RPL_STATSJLINE, "J %s :%s (set by DDB)",
ddb_key(ddb), ddb_content(ddb));
#endif
}
Modified: ircd/trunk/ircd/ircd_features.c
===================================================================
--- ircd/trunk/ircd/ircd_features.c 2008-09-12 00:11:06 UTC (rev 210)
+++ ircd/trunk/ircd/ircd_features.c 2008-09-12 12:45:00 UTC (rev 211)
@@ -640,7 +640,7 @@
} else if (feat->flags & FEAT_DDB) {
if (from) {
- sendcmdto_one(&me, CMD_NOTICE, from, "%C :The feature has been setted by DDB", from);
+ sendcmdto_one(&me, CMD_NOTICE, from, "%C :The feature has been set by DDB", from);
send_reply(from, ERR_NOFEATURE, fields[0]);
}
return 0;
@@ -804,7 +804,7 @@
#if defined(DDB)
if (feat->flags & FEAT_DDB) {
if (from) {
- sendcmdto_one(&me, CMD_NOTICE, from, "%C :The feature has been setted by DDB", from);
+ sendcmdto_one(&me, CMD_NOTICE, from, "%C :The feature has been set by DDB", from);
send_reply(from, ERR_NOFEATURE, fields[0]);
}
return 0;
@@ -1039,7 +1039,7 @@
case FEAT_INT: /* Report an F-line with integer values */
#if defined(DDB)
if (features[i].flags & FEAT_DDB) {
- send_reply(to, SND_EXPLICIT | RPL_STATSFLINE, "F %s %d (setted by DDB)",
+ send_reply(to, SND_EXPLICIT | RPL_STATSFLINE, "F %s %d (set by DDB)",
features[i].type, features[i].v_int);
break;
} else if (features[i].flags & FEAT_MARK) /* it's been changed */
@@ -1053,7 +1053,7 @@
case FEAT_UINT: /* Report an F-line with unsigned values */
#if defined(DDB)
if (features[i].flags & FEAT_DDB) {
- send_reply(to, SND_EXPLICIT | RPL_STATSFLINE, "F %s %u (setted by DDB)",
+ send_reply(to, SND_EXPLICIT | RPL_STATSFLINE, "F %s %u (set by DDB)",
features[i].type, features[i].v_int);
break;
} else if (features[i].flags & FEAT_MARK) /* it's been changed */
@@ -1067,7 +1067,7 @@
case FEAT_BOOL: /* Report an F-line with boolean values */
#if defined(DDB)
if (features[i].flags & FEAT_DDB) {
- send_reply(to, SND_EXPLICIT | RPL_STATSFLINE, "F %s %s (setted by DDB)",
+ send_reply(to, SND_EXPLICIT | RPL_STATSFLINE, "F %s %s (set by DDB)",
features[i].type, features[i].v_int ? "TRUE" : "FALSE");
break;
} else if (features[i].flags & FEAT_MARK) /* it's been changed */
@@ -1082,10 +1082,10 @@
#if defined(DDB)
if (features[i].flags & FEAT_DDB) {
if (features[i].v_str)
- send_reply(to, SND_EXPLICIT | RPL_STATSFLINE, "F %s %s (setted by DDB)",
+ send_reply(to, SND_EXPLICIT | RPL_STATSFLINE, "F %s %s (set by DDB)",
features[i].type, features[i].v_str);
else
- send_reply(to, SND_EXPLICIT | RPL_STATSFLINE, "F %s (setted by DDB)",
+ send_reply(to, SND_EXPLICIT | RPL_STATSFLINE, "F %s (set by DDB)",
features[i].type);
break;
} else if (features[i].flags & FEAT_MARK) { /* it's been changed */
Modified: ircd/trunk/ircd/s_conf.c
===================================================================
--- ircd/trunk/ircd/s_conf.c 2008-09-12 00:11:06 UTC (rev 210)
+++ ircd/trunk/ircd/s_conf.c 2008-09-12 12:45:00 UTC (rev 211)
@@ -1009,7 +1009,7 @@
#if defined(DDB)
for (ddb = ddb_iterator_first(DDB_UWORLDDB); ddb;
ddb = ddb_iterator_next())
- send_reply(to, SND_EXPLICIT | RPL_STATSULINE, "U %s (setted by DDB)",
+ send_reply(to, SND_EXPLICIT | RPL_STATSULINE, "U %s (set by DDB)",
ddb_key(ddb));
#endif
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X