[cvslog] (2005-04-16 03:01:16 UTC) Module eggdrop1.6: Change committed!

cvslog cvs at tsss.org
Fri Apr 15 21:01:16 CST 2005


CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.6
Commit time: 2005-04-16 03:01:15 UTC
Commited by: Will Buckner <wcc at techmonkeys.org>

Modified files:
     doc/UPDATES1.6 src/dns.c src/main.c src/net.c src/patch.h

Log message:

- Hopefully fixed dns lockups.
* Found by: various - Patch by: Sven Trenkel

---------------------- diff included ----------------------
Index: eggdrop1.6/doc/UPDATES1.6
diff -u eggdrop1.6/doc/UPDATES1.6:1.607 eggdrop1.6/doc/UPDATES1.6:1.608
--- eggdrop1.6/doc/UPDATES1.6:1.607	Tue Feb  8 10:13:11 2005
+++ eggdrop1.6/doc/UPDATES1.6	Fri Apr 15 22:01:04 2005
@@ -1,4 +1,4 @@
-$Id: UPDATES1.6,v 1.607 2005/02/08 16:13:11 tothwolf Exp $
+$Id: UPDATES1.6,v 1.608 2005/04/16 03:01:04 wcc Exp $
 
 Eggdrop Changes (since v1.6.0)
     _____________________________________________________________________
@@ -12,6 +12,9 @@
 
 
   1.6.18:
+    - Hopefully fixed dns lockups.
+    * Found by: various - Patch by: Sven Trenkel
+
     - Fixed remote note bug in add_note() that was introduced in 1.6.17.
       Fixes Bugzilla Bug # 433 "Remote Notes Always Say User is Offline"
     * Found by: alex323 - Patch by: Tothwolf
Index: eggdrop1.6/src/dns.c
diff -u eggdrop1.6/src/dns.c:1.31 eggdrop1.6/src/dns.c:1.32
--- eggdrop1.6/src/dns.c:1.31	Mon Jan  3 14:01:44 2005
+++ eggdrop1.6/src/dns.c	Fri Apr 15 22:01:05 2005
@@ -4,7 +4,7 @@
  *   provides the code used by the bot if the DNS module is not loaded
  *   DNS Tcl commands
  *
- * $Id: dns.c,v 1.31 2005/01/03 20:01:44 paladin Exp $
+ * $Id: dns.c,v 1.32 2005/04/16 03:01:05 wcc Exp $
  */
 /*
  * Written by Fabian Knittel <fknittel at gmx.de>
@@ -39,7 +39,7 @@
 extern int dcc_total;
 extern int resolve_timeout;
 extern time_t now;
-extern jmp_buf alarmret;
+extern sigjmp_buf alarmret;
 extern Tcl_Interp *interp;
 
 devent_t *dns_events = NULL;
@@ -449,7 +449,7 @@
   unsigned long addr = htonl(ip);
   static char s[UHOSTLEN];
 
-  if (!setjmp(alarmret)) {
+  if (!sigsetjmp(alarmret, 1)) {
     alarm(resolve_timeout);
     hp = gethostbyaddr((char *) &addr, sizeof(addr), AF_INET);
     alarm(0);
@@ -475,7 +475,7 @@
     call_ipbyhost(host, ntohl(inaddr.s_addr), 1);
     return;
   }
-  if (!setjmp(alarmret)) {
+  if (!sigsetjmp(alarmret, 1)) {
     struct hostent *hp;
     struct in_addr *in;
     IP ip = 0;
Index: eggdrop1.6/src/main.c
diff -u eggdrop1.6/src/main.c:1.114 eggdrop1.6/src/main.c:1.115
--- eggdrop1.6/src/main.c:1.114	Thu Jan 27 21:26:20 2005
+++ eggdrop1.6/src/main.c	Fri Apr 15 22:01:05 2005
@@ -5,7 +5,7 @@
  *   command line arguments
  *   context and assert debugging
  *
- * $Id: main.c,v 1.114 2005/01/28 03:26:20 wcc Exp $
+ * $Id: main.c,v 1.115 2005/04/16 03:01:05 wcc Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -80,7 +80,7 @@
 extern log_t *logs;
 extern Tcl_Interp *interp;
 extern tcl_timer_t *timer, *utimer;
-extern jmp_buf alarmret;
+extern sigjmp_buf alarmret;
 time_t now;
 
 /*
@@ -390,7 +390,7 @@
  */
 static void got_alarm(int z)
 {
-  longjmp(alarmret, 1);
+  siglongjmp(alarmret, 1);
 
   /* -Never reached- */
 }
Index: eggdrop1.6/src/net.c
diff -u eggdrop1.6/src/net.c:1.75 eggdrop1.6/src/net.c:1.76
--- eggdrop1.6/src/net.c:1.75	Tue Feb  8 00:51:59 2005
+++ eggdrop1.6/src/net.c	Fri Apr 15 22:01:05 2005
@@ -2,7 +2,7 @@
  * net.c -- handles:
  *   all raw network i/o
  *
- * $Id: net.c,v 1.75 2005/02/08 06:51:59 tothwolf Exp $
+ * $Id: net.c,v 1.76 2005/04/16 03:01:05 wcc Exp $
  */
 /*
  * This is hereby released into the public domain.
@@ -67,7 +67,7 @@
 
 sock_list *socklist = NULL;   /* Enough to be safe.                           */
 int MAXSOCKS = 0;
-jmp_buf alarmret;             /* Env buffer for alarm() returns.              */
+sigjmp_buf alarmret;             /* Env buffer for alarm() returns.              */
 
 /* Types of proxies */
 #define PROXY_SOCKS   1
@@ -341,7 +341,7 @@
       egg_memcpy(x, &ip, 4);
     } else {
       /* no, must be host.domain */
-      if (!setjmp(alarmret)) {
+      if (!sigsetjmp(alarmret, 1)) {
         alarm(resolve_timeout);
         hp = gethostbyname(host);
         alarm(0);
@@ -415,7 +415,7 @@
   else {
     /* No, must be host.domain */
     debug0("WARNING: open_telnet_raw() is about to block in gethostbyname()!");
-    if (!setjmp(alarmret)) {
+    if (!sigsetjmp(alarmret, 1)) {
       alarm(resolve_timeout);
       hp = gethostbyname(host);
       alarm(0);
Index: eggdrop1.6/src/patch.h
diff -u eggdrop1.6/src/patch.h:1.1150 eggdrop1.6/src/patch.h:1.1151
--- eggdrop1.6/src/patch.h:1.1150	Tue Feb  8 10:13:11 2005
+++ eggdrop1.6/src/patch.h	Fri Apr 15 22:01:05 2005
@@ -10,7 +10,7 @@
  * statement, leave the rest of the file alone, this allows better
  * overlapping patches.
  *
- * $Id: patch.h,v 1.1150 2005/02/08 16:13:11 tothwolf Exp $
+ * $Id: patch.h,v 1.1151 2005/04/16 03:01:05 wcc Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -41,12 +41,12 @@
  *
  *
  */
-patch("1107879001");            /* current unixtime */
+patch("1113619880");            /* current unixtime */
 /*
  *
  *
  */
-patch("notesfix");
+patch("sigsetjmp");
 /*
  *
  *
----------------------- End of diff -----------------------



More information about the Changes mailing list