Committer : entrope
CVSROOT : /cvsroot/undernet-ircu
Module : ircu2.10
Commit time: 2005-08-25 01:26:56 UTC
Modified files:
ChangeLog include/patchlevel.h ircd/channel.c ircd/engine_epoll.c
ircd/ircd_log.c
Log message:
Bump patchlevel; add more epoll support; assertion check in
joinbuf_join(); cleanup when opening a log file.
---------------------- diff included ----------------------
Index: ircu2.10/ChangeLog
diff -u ircu2.10/ChangeLog:1.677 ircu2.10/ChangeLog:1.678
--- ircu2.10/ChangeLog:1.677 Sun Aug 21 06:46:05 2005
+++ ircu2.10/ChangeLog Wed Aug 24 18:26:45 2005
@@ -1,3 +1,15 @@
+2005-08-24 Michael Poole <[EMAIL PROTECTED]>
+
+ * include/patchlevel.h (PATCHLEVEL): Increment.
+
+ * ircd/channel.c (joinbuf_join): Double check that oplevel is 0 or
+ 1 when propagating JOIN <level>:#channel, to avoid PV on receiver.
+
+ * ircd/engine_epoll.c: Add system call numbers for more CPU types.
+
+ * ircd/ircd_log.c (log_open): Remove NFS-oriented alarm() calls;
+ anyone who writes logs over NFS is mental. (Thanks to D. Bruce.)
+
2005-08-21 Michael Poole <[EMAIL PROTECTED]>
* include/s_conf.h (free_mapping): Declare new function.
Index: ircu2.10/include/patchlevel.h
diff -u ircu2.10/include/patchlevel.h:1.21 ircu2.10/include/patchlevel.h:1.22
--- ircu2.10/include/patchlevel.h:1.21 Sat Apr 23 17:17:39 2005
+++ ircu2.10/include/patchlevel.h Wed Aug 24 18:26:45 2005
@@ -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.21 2005/04/24 00:17:39 entrope Exp $
+ * $Id: patchlevel.h,v 1.22 2005/08/25 01:26:45 entrope Exp $
*
*/
-#define PATCHLEVEL "09"
+#define PATCHLEVEL "10"
#define RELEASE ".12.beta."
Index: ircu2.10/ircd/channel.c
diff -u ircu2.10/ircd/channel.c:1.142 ircu2.10/ircd/channel.c:1.143
--- ircu2.10/ircd/channel.c:1.142 Tue Aug 16 19:07:10 2005
+++ ircu2.10/ircd/channel.c Wed Aug 24 18:26:46 2005
@@ -19,7 +19,7 @@
*/
/** @file
* @brief Channel management and maintenance
- * @version $Id: channel.c,v 1.142 2005/08/17 02:07:10 entrope Exp $
+ * @version $Id: channel.c,v 1.143 2005/08/25 01:26:46 entrope Exp $
*/
#include "config.h"
@@ -3410,10 +3410,11 @@
/* send notification to all servers */
if (jbuf->jb_type != JOINBUF_TYPE_CREATE && !is_local)
{
- if (flags & CHFL_CHANOP)
+ if (flags & CHFL_CHANOP) {
+ assert(oplevel == 0 || oplevel == 1);
sendcmdto_serv_butone(jbuf->jb_source, CMD_JOIN, jbuf->jb_connect,
"%u:%H %Tu", oplevel, chan, chan->creationtime);
- else
+ } else
sendcmdto_serv_butone(jbuf->jb_source, CMD_JOIN, jbuf->jb_connect,
"%H %Tu", chan, chan->creationtime);
}
Index: ircu2.10/ircd/engine_epoll.c
diff -u ircu2.10/ircd/engine_epoll.c:1.11 ircu2.10/ircd/engine_epoll.c:1.12
--- ircu2.10/ircd/engine_epoll.c:1.11 Sun May 1 09:11:01 2005
+++ ircu2.10/ircd/engine_epoll.c Wed Aug 24 18:26:46 2005
@@ -18,7 +18,7 @@
*/
/** @file
* @brief Linux epoll_*() event engine.
- * @version $Id: engine_epoll.c,v 1.11 2005/05/01 16:11:01 entrope Exp $
+ * @version $Id: engine_epoll.c,v 1.12 2005/08/25 01:26:46 entrope Exp $
*/
#include "config.h"
@@ -48,11 +48,7 @@
/* Oh, did we mention that some glibc releases do not even define the
* syscall numbers? */
#if !defined(__NR_epoll_create)
-#if defined(__i386__)
-#define __NR_epoll_create 254
-#define __NR_epoll_ctl 255
-#define __NR_epoll_wait 256
-#elif defined(__ia64__)
+#if defined(__ia64__)
#define __NR_epoll_create 1243
#define __NR_epoll_ctl 1244
#define __NR_epoll_wait 1245
@@ -60,6 +56,34 @@
#define __NR_epoll_create 214
#define __NR_epoll_ctl 233
#define __NR_epoll_wait 232
+#elif defined(__sparc64__) || defined(__sparc__)
+#define __NR_epoll_create 193
+#define __NR_epoll_ctl 194
+#define __NR_epoll_wait 195
+#elif defined(__s390__) || defined(__m68k__)
+#define __NR_epoll_create 249
+#define __NR_epoll_ctl 250
+#define __NR_epoll_wait 251
+#elif defined(__ppc64__) || defined(__ppc__)
+#define __NR_epoll_create 236
+#define __NR_epoll_ctl 237
+#define __NR_epoll_wait 238
+#elif defined(__parisc__) || defined(__arm26__) || defined(__arm__)
+#define __NR_epoll_create 224
+#define __NR_epoll_ctl 225
+#define __NR_epoll_wait 226
+#elif defined(__alpha__)
+#define __NR_epoll_create 407
+#define __NR_epoll_ctl 408
+#define __NR_epoll_wait 409
+#elif defined(__sh64__)
+#define __NR_epoll_create 282
+#define __NR_epoll_ctl 283
+#define __NR_epoll_wait 284
+#elif defined(__i386__) || defined(__sh__) || defined(__m32r__) ||
defined(__h8300__) || defined(__frv__)
+#define __NR_epoll_create 254
+#define __NR_epoll_ctl 255
+#define __NR_epoll_wait 256
#else /* cpu types */
#error No system call numbers defined for epoll family.
#endif /* cpu types */
Index: ircu2.10/ircd/ircd_log.c
diff -u ircu2.10/ircd/ircd_log.c:1.21 ircu2.10/ircd/ircd_log.c:1.22
--- ircu2.10/ircd/ircd_log.c:1.21 Sun May 1 09:11:01 2005
+++ ircu2.10/ircd/ircd_log.c Wed Aug 24 18:26:46 2005
@@ -22,7 +22,7 @@
*/
/** @file
* @brief IRC logging implementation.
- * @version $Id: ircd_log.c,v 1.21 2005/05/01 16:11:01 entrope Exp $
+ * @version $Id: ircd_log.c,v 1.22 2005/08/25 01:26:46 entrope Exp $
*/
#include "config.h"
@@ -195,10 +195,8 @@
{
/* only open the file if we haven't already */
if (lf && lf->fd < 0) {
- alarm(3); /* if NFS hangs, we hang only for 3 seconds */
lf->fd = open(lf->file, O_WRONLY | O_CREAT | O_APPEND,
S_IRUSR | S_IWUSR);
- alarm(0);
}
}
----------------------- End of diff -----------------------
_______________________________________________
Patches mailing list
[email protected]
http://undernet.sbg.org/mailman/listinfo/patches
