Committer : entrope
CVSROOT : /cvsroot/undernet-ircu
Module : ircu2.10
Branch tags: u2_10_12_branch
Commit time: 2007-03-28 04:04:43 UTC
Modified files:
Tag: u2_10_12_branch
ircd/m_asll.c ChangeLog
Log message:
Add new line to ASLL output to resolve SF bug #1687382.
---------------------- diff included ----------------------
Index: ircu2.10/ChangeLog
diff -u ircu2.10/ChangeLog:1.710.2.171 ircu2.10/ChangeLog:1.710.2.172
--- ircu2.10/ChangeLog:1.710.2.171 Mon Mar 26 20:44:41 2007
+++ ircu2.10/ChangeLog Tue Mar 27 21:04:32 2007
@@ -1,3 +1,10 @@
+2007-03-28 Michael Poole <[EMAIL PROTECTED]>
+
+ * ircd/m_asll.c (ms_asll): Count hits and report at the end, so
+ that a client is told whether any match (and has a hint that only
+ directly linked servers are checked).
+ (mo_asll): Likewise.
+
2007-03-26 Michael Poole <[EMAIL PROTECTED]>
* ircd/s_stats.c (m_stats): Move check for STAT_FLAG_LOCONLY (and
Index: ircu2.10/ircd/m_asll.c
diff -u ircu2.10/ircd/m_asll.c:1.3 ircu2.10/ircd/m_asll.c:1.3.2.1
--- ircu2.10/ircd/m_asll.c:1.3 Fri Dec 10 21:13:46 2004
+++ ircu2.10/ircd/m_asll.c Tue Mar 27 21:04:32 2007
@@ -19,7 +19,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * $Id: m_asll.c,v 1.3 2004/12/11 05:13:46 klmitch Exp $
+ * $Id: m_asll.c,v 1.3.2.1 2007/03/28 04:04:32 entrope Exp $
*/
/*
@@ -115,6 +115,7 @@
{
char *mask;
struct Client *acptr;
+ int hits;
int i;
if (parc < 2)
@@ -135,14 +136,16 @@
return 0;
mask = parv[1];
- for (i = 0; i <= HighestFd; i++) {
+ for (i = hits = 0; i <= HighestFd; i++) {
acptr = LocalClientArray[i];
if (!acptr || !IsServer(acptr) || !MyConnect(acptr) || match(mask,
cli_name(acptr)))
continue;
sendcmdto_prio_one(&me, CMD_ASLL, sptr, "%C %s %i %i %i", sptr,
cli_name(acptr), cli_serv(acptr)->asll_rtt,
cli_serv(acptr)->asll_to, cli_serv(acptr)->asll_from);
+ hits++;
}
+ sendcmdto_one(&me, CMD_NOTICE, sptr, "%C :AsLL for %s: %d local servers
matched", sptr, mask, hits);
return 0;
}
@@ -153,6 +156,7 @@
{
char *mask;
struct Client *acptr;
+ int hits;
int i;
if (parc < 2)
@@ -165,12 +169,14 @@
return 0;
mask = parv[1];
- for (i = 0; i <= HighestFd; i++) {
+ for (i = hits = 0; i <= HighestFd; i++) {
acptr = LocalClientArray[i];
if (!acptr || !IsServer(acptr) || !MyConnect(acptr) || match(mask,
cli_name(acptr)))
continue;
send_asll_reply(&me, sptr, cli_name(acptr), cli_serv(acptr)->asll_rtt,
cli_serv(acptr)->asll_to, cli_serv(acptr)->asll_from);
+ hits++;
}
+ sendcmdto_one(&me, CMD_NOTICE, sptr, "%C :AsLL for %s: %d local servers
matched", sptr, mask, hits);
return 0;
}
----------------------- End of diff -----------------------
_______________________________________________
Patches mailing list
[email protected]
http://undernet.sbg.org/mailman/listinfo/patches
