Committer : entrope
CVSROOT : /cvsroot/undernet-ircu
Module : ircu2.10
Commit time: 2005-05-30 16:51:15 UTC
Modified files:
ircd/s_err.c ircd/s_debug.c ircd/s_conf.c ircd/s_bsd.c
ircd/m_server.c ircd/client.c ChangeLog
Log message:
Show LIST_CHAN privilege, count User structs better, text: line->block.
---------------------- diff included ----------------------
Index: ircu2.10/ChangeLog
diff -u ircu2.10/ChangeLog:1.637 ircu2.10/ChangeLog:1.638
--- ircu2.10/ChangeLog:1.637 Mon May 30 08:11:37 2005
+++ ircu2.10/ChangeLog Mon May 30 09:51:05 2005
@@ -1,5 +1,21 @@
2005-05-30 Michael Poole <[EMAIL PROTECTED]>
+ * ircd/client.c (privtab): Add missing LIST_CHAN privilege, move
+ WIDE_GLINE to reflect its enumerated value.
+
+ * ircd/s_debug.c (count_memory): Use user_count_memory() function
+ to count User structs in-use.
+
+ * ircd/m_server.c (mr_server): Change "C:line" to "Connect block".
+
+ * ircd/s_bsd.c (connect_server): Likewise.
+
+ * ircd/s_conf.c (conf_check_server): Likewise.
+
+ * ircd/s_err.c (replyTable): Change "O-lines" to "Operator block".
+
+2005-05-30 Michael Poole <[EMAIL PROTECTED]>
+
* ircd/match.c (match): Rewrite to handle globs that end in an
escaped wildcard (and hopefully clarify the code).
Index: ircu2.10/ircd/client.c
diff -u ircu2.10/ircd/client.c:1.30 ircu2.10/ircd/client.c:1.31
--- ircu2.10/ircd/client.c:1.30 Wed Feb 23 19:07:03 2005
+++ ircu2.10/ircd/client.c Mon May 30 09:51:05 2005
@@ -18,7 +18,7 @@
*/
/** @file
* @brief Implementation of functions for handling local clients.
- * @version $Id: client.c,v 1.30 2005/02/24 03:07:03 entrope Exp $
+ * @version $Id: client.c,v 1.31 2005/05/30 16:51:05 entrope Exp $
*/
#include "config.h"
@@ -229,8 +229,8 @@
P(GLINE), P(LOCAL_GLINE), P(JUPE), P(LOCAL_JUPE),
P(OPMODE), P(LOCAL_OPMODE), P(SET), P(WHOX),
P(BADCHAN), P(LOCAL_BADCHAN), P(SEE_CHAN), P(PROPAGATE),
- P(DISPLAY), P(SEE_OPERS), P(FORCE_OPMODE),
P(FORCE_LOCAL_OPMODE),
- P(WIDE_GLINE),
+ P(DISPLAY), P(SEE_OPERS), P(WIDE_GLINE), P(LIST_CHAN),
+ P(FORCE_OPMODE), P(FORCE_LOCAL_OPMODE), P(APASS_OPMODE),
#undef P
{ 0, 0 }
};
Index: ircu2.10/ircd/m_server.c
diff -u ircu2.10/ircd/m_server.c:1.40 ircu2.10/ircd/m_server.c:1.41
--- ircu2.10/ircd/m_server.c:1.40 Fri Mar 25 21:43:48 2005
+++ ircu2.10/ircd/m_server.c Mon May 30 09:51:05 2005
@@ -22,7 +22,7 @@
*/
/** @file
* @brief Handlers for the SERVER command.
- * @version $Id: m_server.c,v 1.40 2005/03/26 05:43:48 entrope Exp $
+ * @version $Id: m_server.c,v 1.41 2005/05/30 16:51:05 entrope Exp $
*/
#include "config.h"
@@ -590,7 +590,7 @@
log_write(LS_NETWORK, L_NOTICE, LOG_NOSNOTICE, "Received unauthorized "
"connection from %C [%s]", cptr,
ircd_ntoa(&cli_ip(cptr)));
- return exit_client(cptr, cptr, &me, "No C:line");
+ return exit_client(cptr, cptr, &me, "No Connect block");
}
host = cli_name(cptr);
Index: ircu2.10/ircd/s_bsd.c
diff -u ircu2.10/ircd/s_bsd.c:1.76 ircu2.10/ircd/s_bsd.c:1.77
--- ircu2.10/ircd/s_bsd.c:1.76 Fri Mar 25 21:43:49 2005
+++ ircu2.10/ircd/s_bsd.c Mon May 30 09:51:04 2005
@@ -19,7 +19,7 @@
*/
/** @file
* @brief Functions that now (or in the past) relied on BSD APIs.
- * @version $Id: s_bsd.c,v 1.76 2005/03/26 05:43:49 entrope Exp $
+ * @version $Id: s_bsd.c,v 1.77 2005/05/30 16:51:04 entrope Exp $
*/
#include "config.h"
@@ -786,10 +786,10 @@
if (!find_conf_byhost(cli_confs(cptr), aconf->host, CONF_SERVER)) {
sendto_opmask_butone(0, SNO_OLDSNO, "Host %s is not enabled for "
- "connecting: no C-line", aconf->name);
+ "connecting: no Connect block", aconf->name);
if (by && IsUser(by) && !MyUser(by)) {
sendcmdto_one(&me, CMD_NOTICE, by, "%C :Connect to host %s failed: no "
- "C-line", by, aconf->name);
+ "Connect block", by, aconf->name);
}
det_confs_butmask(cptr, 0);
free_client(cptr);
Index: ircu2.10/ircd/s_conf.c
diff -u ircu2.10/ircd/s_conf.c:1.76 ircu2.10/ircd/s_conf.c:1.77
--- ircu2.10/ircd/s_conf.c:1.76 Tue Apr 19 17:59:24 2005
+++ ircu2.10/ircd/s_conf.c Mon May 30 09:51:04 2005
@@ -19,7 +19,7 @@
*/
/** @file
* @brief ircd configuration file driver
- * @version $Id: s_conf.c,v 1.76 2005/04/20 00:59:24 entrope Exp $
+ * @version $Id: s_conf.c,v 1.77 2005/05/30 16:51:04 entrope Exp $
*/
#include "config.h"
@@ -1137,7 +1137,8 @@
if (IsConnecting(cptr) || IsHandshake(cptr)) {
c_conf = find_conf_byname(lp, cli_name(cptr), CONF_SERVER);
if (!c_conf) {
- sendto_opmask_butone(0, SNO_OLDSNO, "Connect Error: lost C:line for %s",
+ sendto_opmask_butone(0, SNO_OLDSNO,
+ "Connect Error: lost Connect block for %s",
cli_name(cptr));
det_confs_butmask(cptr, 0);
return -1;
Index: ircu2.10/ircd/s_debug.c
diff -u ircu2.10/ircd/s_debug.c:1.37 ircu2.10/ircd/s_debug.c:1.38
--- ircu2.10/ircd/s_debug.c:1.37 Sun Mar 20 08:06:30 2005
+++ ircu2.10/ircd/s_debug.c Mon May 30 09:51:04 2005
@@ -19,7 +19,7 @@
*/
/** @file
* @brief Debug support for the ircd.
- * @version $Id: s_debug.c,v 1.37 2005/03/20 16:06:30 entrope Exp $
+ * @version $Id: s_debug.c,v 1.38 2005/05/30 16:51:04 entrope Exp $
*/
#include "config.h"
@@ -44,6 +44,7 @@
#include "res.h"
#include "s_bsd.h"
#include "s_conf.h"
+#include "s_user.h"
#include "s_stats.h"
#include "send.h"
#include "struct.h"
@@ -217,7 +218,6 @@
cn = 0, /* connections */
ch = 0, /* channels */
lcc = 0, /* local client conf links */
- us = 0, /* user structs */
chi = 0, /* channel invites */
chb = 0, /* channel bans */
wwu = 0, /* whowas users */
@@ -235,6 +235,8 @@
chbm = 0, /* memory used by channel bans */
cm = 0, /* memory used by clients */
cnm = 0, /* memory used by connections */
+ us = 0, /* user structs */
+ usm = 0, /* memory used by user structs */
awm = 0, /* memory used by aways */
wwam = 0, /* whowas away memory used */
wwm = 0, /* whowas array memory used */
@@ -263,7 +265,6 @@
}
if (cli_user(acptr))
{
- us++;
for (link = cli_user(acptr)->invited; link; link = link->next)
usi++;
for (member = cli_user(acptr)->channel; member; member =
member->next_channel)
@@ -280,6 +281,7 @@
}
cm = c * sizeof(struct Client);
cnm = cn * sizeof(struct Connection);
+ user_count_memory(&us, &usm);
for (chptr = GlobalChannelList; chptr; chptr = chptr->next)
{
@@ -309,8 +311,8 @@
send_reply(cptr, SND_EXPLICIT | RPL_STATSDEBUG,
":Clients %d(%zu) Connections %d(%zu)", c, cm, cn, cnm);
send_reply(cptr, SND_EXPLICIT | RPL_STATSDEBUG,
- ":Users %d(%zu) Accounts %d(%zu) Invites %d(%zu)",
- us, us * sizeof(struct User), acc, acc * (ACCOUNTLEN + 1),
+ ":Users %zu(%zu) Accounts %d(%zu) Invites %d(%zu)",
+ us, usm, acc, acc * (ACCOUNTLEN + 1),
usi, usi * sizeof(struct SLink));
send_reply(cptr, SND_EXPLICIT | RPL_STATSDEBUG,
":User channels %d(%zu) Aways %d(%zu)", memberships,
Index: ircu2.10/ircd/s_err.c
diff -u ircu2.10/ircd/s_err.c:1.69 ircu2.10/ircd/s_err.c:1.70
--- ircu2.10/ircd/s_err.c:1.69 Mon May 30 06:23:24 2005
+++ ircu2.10/ircd/s_err.c Mon May 30 09:51:04 2005
@@ -18,7 +18,7 @@
*/
/** @file
* @brief Error handling support.
- * @version $Id: s_err.c,v 1.69 2005/05/30 13:23:24 entrope Exp $
+ * @version $Id: s_err.c,v 1.70 2005/05/30 16:51:04 entrope Exp $
*/
#include "config.h"
@@ -1014,7 +1014,7 @@
/* 490 */
{ 0 },
/* 491 */
- { ERR_NOOPERHOST, ":No O-lines for your host", "491" },
+ { ERR_NOOPERHOST, ":No Operator block for your host", "491" },
/* 492 */
{ 0 },
/* 493 */
----------------------- End of diff -----------------------
_______________________________________________
Patches mailing list
[email protected]
http://undernet.sbg.org/mailman/listinfo/patches
