CVSROOT : /cvsroot/undernet-ircu
Module : ircu2.10
Branch tags: u2_10_11_06
Commit time: 2003-11-05 07:02:08 UTC
Modified files:
Tag: u2_10_11_06
ChangeLog include/patchlevel.h ircd/gline.c ircd/s_serv.c
Log message:
Author: Isomer <[EMAIL PROTECTED]>
Log message:
* Fix one of the infamous realname gline bugs
* Send glines earlier in the burst to try and help poor servers that are
usually being pummelled by drones on their initial burst.
---------------------- diff included ----------------------
Index: ircu2.10/ChangeLog
diff -u ircu2.10/ChangeLog:1.290.2.129 ircu2.10/ChangeLog:1.290.2.129.2.1
--- ircu2.10/ChangeLog:1.290.2.129 Sat Nov 1 02:19:05 2003
+++ ircu2.10/ChangeLog Tue Nov 4 23:01:56 2003
@@ -1,3 +1,10 @@
+2003-11-04 Isomer <[EMAIL PROTECTED]>
+ * include/patchlevel.h: 2.10.11.06 initial branch
+
+ * ircd/s_serv.c: Burst glines/jupes early
+
+ * ircd/gline.c: Don't add spirious @
+
2003-11-01 Isomer <[EMAIL PROTECTED]>
* include/patchlevel.h: 2.10.11.05 release
Index: ircu2.10/include/patchlevel.h
diff -u ircu2.10/include/patchlevel.h:1.10.4.64
ircu2.10/include/patchlevel.h:1.10.4.64.2.1
--- ircu2.10/include/patchlevel.h:1.10.4.64 Sat Nov 1 02:19:08 2003
+++ ircu2.10/include/patchlevel.h Tue Nov 4 23:01:57 2003
@@ -15,10 +15,10 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * $Id: patchlevel.h,v 1.10.4.64 2003/11/01 10:19:08 isomer Exp $
+ * $Id: patchlevel.h,v 1.10.4.64.2.1 2003/11/05 07:01:57 isomer Exp $
*
*/
-#define PATCHLEVEL "05"
+#define PATCHLEVEL "06.(pre0)"
#define RELEASE ".11."
Index: ircu2.10/ircd/gline.c
diff -u ircu2.10/ircd/gline.c:1.38.2.8 ircu2.10/ircd/gline.c:1.38.2.8.2.1
--- ircu2.10/ircd/gline.c:1.38.2.8 Sat Nov 1 02:19:10 2003
+++ ircu2.10/ircd/gline.c Tue Nov 4 23:01:58 2003
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * $Id: gline.c,v 1.38.2.8 2003/11/01 10:19:10 isomer Exp $
+ * $Id: gline.c,v 1.38.2.8.2.1 2003/11/05 07:01:58 isomer Exp $
*/
#include "config.h"
@@ -683,8 +683,9 @@
if (gline->gl_expire <= CurrentTime) /* expire any that need expiring */
gline_free(gline);
else if (!GlineIsLocal(gline) && gline->gl_lastmod)
- sendcmdto_one(&me, CMD_GLINE, cptr, "* [EMAIL PROTECTED] %Tu %Tu :%s",
+ sendcmdto_one(&me, CMD_GLINE, cptr, "* %c%s%s%s %Tu %Tu :%s",
GlineIsRemActive(gline) ? '+' : '-', gline->gl_user,
+ gline->gl_host ? gline->gl_host : "@",
gline->gl_host ? gline->gl_host : "",
gline->gl_expire - CurrentTime, gline->gl_lastmod,
gline->gl_reason);
Index: ircu2.10/ircd/s_serv.c
diff -u ircu2.10/ircd/s_serv.c:1.27.2.1 ircu2.10/ircd/s_serv.c:1.27.2.1.14.1
--- ircu2.10/ircd/s_serv.c:1.27.2.1 Sun Feb 3 12:31:46 2002
+++ ircu2.10/ircd/s_serv.c Tue Nov 4 23:01:58 2003
@@ -20,7 +20,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * $Id: s_serv.c,v 1.27.2.1 2002/02/03 20:31:46 kev Exp $
+ * $Id: s_serv.c,v 1.27.2.1.14.1 2003/11/05 07:01:58 isomer Exp $
*/
#include "config.h"
@@ -181,6 +181,13 @@
cli_info(cptr));
}
+ /* Send these as early as possible so that glined users/juped servers can
+ * be removed from the network while the remote server is still chewing
+ * our burst.
+ */
+ gline_burst(cptr);
+ jupe_burst(cptr);
+
/*
* Pass on my client information to the new server
*
@@ -246,8 +253,6 @@
for (chptr = GlobalChannelList; chptr; chptr = chptr->next)
send_channel_modes(cptr, chptr);
}
- jupe_burst(cptr);
- gline_burst(cptr);
sendcmdto_one(&me, CMD_END_OF_BURST, cptr, "");
return 0;
}
----------------------- End of diff -----------------------
