Changeset 240

Timestamp:

Aug 6, 2009, 12:35:50 AM (15 years ago)

Author:

katerina

Message:

Fix bugs in mailer code (ticket #160, #161).

Location:

trunk

Files:

• docs/Changelog (modified) (1 diff)
• src/sh_mail.c (modified) (6 diffs)
• src/sh_nmail.c (modified) (14 diffs)

trunk/docs/Changelog

@@ -1 @@
-2.5.7:
+2.5.8:
+        * fixed a bug in the MX resolver routine which causes it to fail 
+          sometimes (issue reported by N. Rath).
+        * fixed deadlock with mutex_listall in sh_nmail_test_recipients() if 
+          error occurs within sh_nmail_flush (problem reported by N. Rath)
+        
+2.5.7 (21-07-2009):
         * sh_userfiles.c: set userUids = NULL at reconfiguration (issue
           reported by U. Melzer)

trunk/src/sh_mail.c

@@ -1584 +1584 @@
   length = res_query (hostname, C_IN, T_MX, 
                       (unsigned char *) reply, 4095);
+
   if (length < 1)
     {
@@ -1649 +1650 @@
         }
     }
+
   count         = ntohs (header->ancount);
   if (count < 1)
@@ -1688 +1690 @@
       /* HEADER NAME 
        */
-      ret = dn_expand ((unsigned char *) &reply, eom, comp_dn, 
+      ret = dn_expand ((unsigned char *) reply, eom, comp_dn, 
                        (char *) expanded, 1023);
       comp_dn += ret;
@@ -1711 +1713 @@
         }
 
+
       /* CLASS (re-use 'type' var)
        */
@@ -1723 +1726 @@
         }
 
+
       /* TTL
        */
@@ -1758 +1762 @@
         }
 
-      ret = dn_expand ((unsigned char *) &reply, eom, comp_dn, 
+      ret = dn_expand ((unsigned char *) reply, eom, comp_dn, 
                        (char *) expanded, 1023);
       comp_dn += ret;

trunk/src/sh_nmail.c

@@ -44 +44 @@
 
 SH_MUTEX_INIT(mutex_listall, PTHREAD_MUTEX_INITIALIZER);
+SH_MUTEX_INIT(mutex_flush_l, PTHREAD_MUTEX_INITIALIZER);
 
 /* Pointer to last address */
@@ -376 +377 @@
 }
 
+/* Is not called from same(recursively) or different thread
+ */
 static
 int sh_nmail_flag_recipients (int level, const char * message, 
@@ -391 +394 @@
 }
 
+/* Can be called from same thread with mutex_listall held via sh_nmail_flush()
+ */
 static
 int sh_nmail_test_recipients (int level, const char * message, 
@@ -399 +404 @@
   if (message)
     {
-      SH_MUTEX_LOCK_UNSAFE(mutex_listall);
-      retval = sh_nmail_compute_recipients (level, message, alias, 0);
-      SH_MUTEX_UNLOCK_UNSAFE(mutex_listall);
+      if (0 == SH_MUTEX_TRYLOCK_UNSAFE(mutex_flush_l))
+        {
+          SH_MUTEX_LOCK_UNSAFE(mutex_listall);
+          retval = sh_nmail_compute_recipients (level, message, alias, 0);
+          SH_MUTEX_UNLOCK_UNSAFE(mutex_listall);
+          SH_MUTEX_UNLOCK_UNSAFE(mutex_flush_l);
+        }
     }
   return retval;
@@ -426 +435 @@
 }
 
+static int nmail_count = 0;
+
 /*
  * First mark list of recipients, then call sh_mail_msg().
@@ -433 +444 @@
 {
   volatile int retval = 0;
-  static int count = 0;
 
   /* Need to:
@@ -445 +455 @@
   if (0 == SH_MUTEX_TRYLOCK_UNSAFE(nmail_lock))
     {
-      ++count;
-      if (count != 1)
-        {
-          --count;
+      ++nmail_count;
+      if (nmail_count != 1)
+        {
+          --nmail_count;
           SH_MUTEX_UNLOCK_UNSAFE(nmail_lock);
           goto cleanup;
@@ -468 +478 @@
         }
       SH_MUTEX_LOCK_UNSAFE(nmail_lock);
-      --count;
+      --nmail_count;
       SH_MUTEX_UNLOCK_UNSAFE(nmail_lock);
     }
@@ -477 +487 @@
 }
 
+static int sh_nmail_flush_int (void);
+
+int sh_nmail_flush ()
+{
+  int                retval = 0;
+
+  if (0 == SH_MUTEX_TRYLOCK_UNSAFE(nmail_lock))
+    {
+      ++nmail_count;
+      if (nmail_count != 1)
+        {
+          --nmail_count;
+          SH_MUTEX_UNLOCK_UNSAFE(nmail_lock);
+          return retval;
+        }
+      SH_MUTEX_UNLOCK_UNSAFE(nmail_lock);
+
+      retval = sh_nmail_flush_int ();
+
+      SH_MUTEX_LOCK_UNSAFE(nmail_lock);
+      --nmail_count;
+      SH_MUTEX_UNLOCK_UNSAFE(nmail_lock);
+    }
+  return retval;
+}
+
+/* warning: variable ‘list’ might be clobbered by ‘longjmp’ or ‘vfork’*/
+static struct alias ** list_dummy;
+
 /*
  * Loop over all recipients in stack. 
@@ -483 +522 @@
  */
 
-int sh_nmail_flush ()
+static int sh_nmail_flush_int ()
 {
   int                retval = 0;
@@ -491 +530 @@
   struct alias     * dlist;
 
+  /* warning: variable ‘list’ might be clobbered by ‘longjmp’ or ‘vfork’*/
+  list_dummy = &list;
+
   SH_MUTEX_LOCK(mutex_listall);
 
@@ -529 +571 @@
       list = compiled_recipient_list;
       
+      SH_MUTEX_LOCK(mutex_flush_l);
       (void) sh_mail_msg(sh_string_str(msg));
+      SH_MUTEX_UNLOCK(mutex_flush_l);
+
       sh_string_destroy(&msg);
       
@@ -591 +636 @@
     if (smsg)
       {
+        SH_MUTEX_LOCK(mutex_flush_l);
         (void) sh_mail_msg(sh_string_str(smsg));
+        SH_MUTEX_UNLOCK(mutex_flush_l);
         sh_string_destroy(&smsg);
       }
@@ -656 +703 @@
     if (smsg)
       {
+        SH_MUTEX_LOCK(mutex_flush_l);
         (void) sh_mail_msg(sh_string_str(smsg));
+        SH_MUTEX_UNLOCK(mutex_flush_l);
         sh_string_destroy(&smsg);
       }