sisimai 4.24.1-java → 4.25.0-java

data/lib/sisimai/bite/email/messagingserver.rb

@@ -10,7 +10,7 @@ module Sisimai::Bite::Email
       Indicators = Sisimai::Bite::Email.INDICATORS
       StartingOf = { message: ['This report relates to a message you sent with the following header fields:'] }.freeze
       MarkingsOf = { rfc822: %r!\A(?:Content-type:[ ]*message/rfc822|Return-path:[ ]*)! }.freeze
-      MessagesOf = { hostunknown: ['Illegal host/domain name found'] }.freeze
+      MessagesOf = { 'hostunknown' => ['Illegal host/domain name found'] }.freeze
 
       def description; return 'Oracle Communications Messaging Server'; end
       def smtpagent;   return Sisimai::Bite.smtpagent(self); end
@@ -60,7 +60,7 @@ module Sisimai::Bite::Email
           end
 
           if readcursor & Indicators[:'message-rfc822'] > 0
-            # After "message/rfc822"
+            # Inside of the original message part
             if e.empty?
               blanklines += 1
               break if blanklines > 1
@@ -68,7 +68,7 @@ module Sisimai::Bite::Email
             end
             rfc822list << e
           else
-            # Before "message/rfc822"
+            # Error message part
             next if (readcursor & Indicators[:deliverystatus]) == 0
             next if e.empty?
 
@@ -126,12 +126,11 @@ module Sisimai::Bite::Email
               sessionlog = cv[2]  # smtp session
               v['rhost'] = remotehost
 
-              if cv = sessionlog.match(/\A[(]TCP|(.+)|\d+|(.+)|\d+[)]/)
-                # The value does not include ".", use IP address instead.
-                # (TCP|17.111.174.67|47323|192.0.2.225|25)
-                v['lhost'] = cv[1]
-                v['rhost'] = cv[2] unless remotehost =~ /[^.]+[.][^.]+/
-              end
+              # The value does not include ".", use IP address instead.
+              # (TCP|17.111.174.67|47323|192.0.2.225|25)
+              next unless cv = sessionlog.match(/\A[(]TCP|(.+)|\d+|(.+)|\d+[)]/)
+              v['lhost'] = cv[1]
+              v['rhost'] = cv[2] unless remotehost =~ /[^.]+[.][^.]+/
             else
               # Original-envelope-id: 0NFC009FLKOUVMA0@mr21p30im-asmtp004.me.com
               # Reporting-MTA: dns;mr21p30im-asmtp004.me.com (tcp-daemon)
@@ -172,7 +171,7 @@ module Sisimai::Bite::Email
           MessagesOf.each_key do |r|
             # Verify each regular expression of session errors
             next unless MessagesOf[r].any? { |a| e['diagnosis'].include?(a) }
-            e['reason'] = r.to_s
+            e['reason'] = r
             break
           end
           e.each_key { |a| e[a] ||= '' }

data/lib/sisimai/bite/email/mfilter.rb

@@ -17,7 +17,7 @@ module Sisimai::Bite::Email
 
       def description; return 'Digital Arts m-FILTER'; end
       def smtpagent;   return 'Email::mFILTER'; end
-      def headerlist;  return ['X-Mailer']; end
+      def headerlist;  return %w[x-mailer]; end
 
       # Parse bounce messages from Digital Arts m-FILTER
       # @param         [Hash] mhead       Message headers of a bounce email
@@ -59,7 +59,7 @@ module Sisimai::Bite::Email
           end
 
           if readcursor & Indicators[:'message-rfc822'] > 0
-            # After "message/rfc822"
+            # Inside of the original message part
             if e.empty?
               blanklines += 1
               break if blanklines > 1
@@ -67,7 +67,7 @@ module Sisimai::Bite::Email
             end
             rfc822list << e
           else
-            # Before "message/rfc822"
+            # Error message part
             next if (readcursor & Indicators[:deliverystatus]) == 0
             next if e.empty?
 
@@ -125,21 +125,21 @@ module Sisimai::Bite::Email
         return nil unless recipients > 0
 
         dscontents.each do |e|
-          unless mhead['received'].empty?
-            # Get localhost and remote host name from Received header.
-            rheads = mhead['received']
-            rhosts = Sisimai::RFC5322.received(rheads[-1])
-
-            e['lhost'] ||= Sisimai::RFC5322.received(rheads[0]).shift
-            while ee = rhosts.shift do
-              # Avoid "... by m-FILTER"
-              next unless ee.include?('.')
-              e['rhost'] = ee
-            end
-          end
+          e.each_key { |a| e[a] ||= '' }
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
           e['agent']     = self.smtpagent
-          e.each_key { |a| e[a] ||= '' }
+
+          # Get localhost and remote host name from Received header.
+          next if mhead['received'].empty?
+          rheads = mhead['received']
+          rhosts = Sisimai::RFC5322.received(rheads[-1])
+
+          e['lhost'] ||= Sisimai::RFC5322.received(rheads[0]).shift
+          while ee = rhosts.shift do
+            # Avoid "... by m-FILTER"
+            next unless ee.include?('.')
+            e['rhost'] = ee
+          end
         end
 
         rfc822part = Sisimai::RFC5322.weedout(rfc822list)

data/lib/sisimai/bite/email/mxlogic.rb

@@ -21,11 +21,11 @@ module Sisimai::Bite::Email
       MessagesOf = {
         # find exim/ -type f -exec grep 'message = US' {} /dev/null \;
         # route.c:1158|  DEBUG(D_uid) debug_printf("getpwnam() returned NULL (user not found)\n");
-        userunknown: ['user not found'],
+        'userunknown' => ['user not found'],
         # transports/smtp.c:3524|  addr->message = US"all host address lookups failed permanently";
         # routers/dnslookup.c:331|  addr->message = US"all relevant MX records point to non-existent hosts";
         # route.c:1826|  uschar *message = US"Unrouteable address";
-        hostunknown: [
+        'hostunknown' => [
           'all host address lookups failed permanently',
           'all relevant MX records point to non-existent hosts',
           'Unrouteable address',
@@ -33,10 +33,10 @@ module Sisimai::Bite::Email
         # transports/appendfile.c:2567|  addr->user_message = US"mailbox is full";
         # transports/appendfile.c:3049|  addr->message = string_sprintf("mailbox is full "
         # transports/appendfile.c:3050|  "(quota exceeded while writing to file %s)", filename);
-        mailboxfull: ['mailbox is full', 'error: quota exceed'],
+        'mailboxfull' => ['mailbox is full', 'error: quota exceed'],
         # routers/dnslookup.c:328|  addr->message = US"an MX or SRV record indicated no SMTP service";
         # transports/smtp.c:3502|  addr->message = US"no host found for existing SMTP connection";
-        notaccept: [
+        'notaccept'   => [
           'an MX or SRV record indicated no SMTP service',
           'no host found for existing SMTP connection',
         ],
@@ -44,7 +44,7 @@ module Sisimai::Bite::Email
         # parser.c:701| if(bracket_count++ > 5) FAILED(US"angle-brackets nested too deep");
         # parser.c:738| FAILED(US"domain missing in source-routed address");
         # parser.c:747| : string_sprintf("malformed address: %.32s may not follow %.*s",
-        syntaxerror: [
+        'syntaxerror' => [
           'angle-brackets nested too deep',
           'expected word or "<"',
           'domain missing in source-routed address',
@@ -53,14 +53,14 @@ module Sisimai::Bite::Email
         # deliver.c:5614|  addr->message = US"delivery to file forbidden";
         # deliver.c:5624|  addr->message = US"delivery to pipe forbidden";
         # transports/pipe.c:1156|  addr->user_message = US"local delivery failed";
-        systemerror: [
+        'systemerror' => [
           'delivery to file forbidden',
           'delivery to pipe forbidden',
           'local delivery failed',
           'LMTP error after ',
         ],
         # deliver.c:5425|  new->message = US"Too many \"Received\" headers - suspected mail loop";
-        contenterror: ['Too many "Received" headers'],
+        'contenterror' => ['Too many "Received" headers'],
       }.freeze
       DelayedFor = [
         'retry timeout exceeded',
@@ -77,7 +77,7 @@ module Sisimai::Bite::Email
       # X-MX-Bounce: mta/src/queue/bounce
       # X-MXL-NoteHash: ffffffffffffffff-0000000000000000000000000000000000000000
       # X-MXL-Hash: 4c9d4d411993da17-bbd4212b6c887f6c23bab7db4bd87ef5edc00758
-      def headerlist;  return ['X-MXL-NoteHash', 'X-MXL-Hash', 'X-MX-Bounce']; end
+      def headerlist;  return %w[x-mxl-notehash x-mxl-hash x-mx-bounce]; end
 
       # Parse bounce messages from MXLogic
       # @param         [Hash] mhead       Message headers of a bounce email
@@ -132,7 +132,7 @@ module Sisimai::Bite::Email
           end
 
           if readcursor & Indicators[:'message-rfc822'] > 0
-            # After "message/rfc822"
+            # Inside of the original message part
             if e.empty?
               blanklines += 1
               break if blanklines > 1
@@ -140,7 +140,7 @@ module Sisimai::Bite::Email
             end
             rfc822list << e
           else
-            # Before "message/rfc822"
+            # Error message part
             next if (readcursor & Indicators[:deliverystatus]) == 0
             next if e.empty?
 
@@ -222,7 +222,7 @@ module Sisimai::Bite::Email
               MessagesOf.each_key do |r|
                 # Check each regular expression
                 next unless MessagesOf[r].any? { |a| e['diagnosis'].include?(a) }
-                e['reason'] = r.to_s
+                e['reason'] = r
                 break
               end
 

data/lib/sisimai/bite/email/notes.rb

@@ -12,7 +12,7 @@ module Sisimai::Bite::Email
         rfc822:  ['------- Returned Message '],
       }.freeze
       MessagesOf = {
-        userunknown: [
+        'userunknown' => [
           'User not listed in public Name & Address Book',
           'ディレクトリのリストにありません',
         ],
@@ -74,7 +74,7 @@ module Sisimai::Bite::Email
           end
 
           if readcursor & Indicators[:'message-rfc822'] > 0
-            # After "message/rfc822"
+            # Inside of the original message part
             if e.empty?
               blanklines += 1
               break if blanklines > 1
@@ -82,7 +82,7 @@ module Sisimai::Bite::Email
             end
             rfc822list << e
           else
-            # Before "message/rfc822"
+            # Error message part
             next if (readcursor & Indicators[:deliverystatus]) == 0
 
             # ------- Failure Reasons  --------
@@ -150,9 +150,8 @@ module Sisimai::Bite::Email
           MessagesOf.each_key do |r|
             # Check each regular expression of Notes error messages
             next unless MessagesOf[r].any? { |a| e['diagnosis'].include?(a) }
-            e['reason'] = r.to_s
-            pseudostatus = Sisimai::SMTP::Status.code(r.to_s)
-            e['status'] = pseudostatus unless pseudostatus.empty?
+            e['reason'] = r
+            e['status'] = Sisimai::SMTP::Status.code(r.to_s) || ''
             break
           end
           e.each_key { |a| e[a] ||= '' }

data/lib/sisimai/bite/email/office365.rb

@@ -65,14 +65,15 @@ module Sisimai::Bite::Email
         # X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2015 23:34:45.6789 (JST)
         # X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
         # X-MS-Exchange-Transport-CrossTenantHeadersStamped: ...
-        return [
-          'X-MS-Exchange-Message-Is-Ndr',
-          'X-Microsoft-Antispam-PRVS',
-          'X-Exchange-Antispam-Report-Test',
-          'X-Exchange-Antispam-Report-CFA-Test',
-          'X-MS-Exchange-CrossTenant-OriginalArrivalTime',
-          'X-MS-Exchange-CrossTenant-FromEntityHeader',
-          'X-MS-Exchange-Transport-CrossTenantHeadersStamped',
+        return %w[
+          content-language
+          x-ms-exchange-message-is-ndr
+          x-microsoft-antispam-prvs
+          x-exchange-antispam-report-test
+          x-exchange-antispam-report-cfa-test
+          x-ms-exchange-crosstenant-originalarrivaltime
+          x-ms-exchange-crosstenant-fromentityheader
+          x-ms-exchange-transport-crosstenantheadersstamped
         ]
       end
 
@@ -105,6 +106,10 @@ module Sisimai::Bite::Email
         end
         return nil if match < 2
 
+        require 'sisimai/rfc1894'
+        fieldtable = Sisimai::RFC1894.FIELDTABLE
+        permessage = {}     # (Hash) Store values of each Per-Message field
+
         dscontents = [Sisimai::Bite.DELIVERYSTATUS]
         hasdivided = mbody.split("\n")
         rfc822list = []     # (Array) Each line in message/rfc822 part string
@@ -134,7 +139,7 @@ module Sisimai::Bite::Email
           end
 
           if readcursor & Indicators[:'message-rfc822'] > 0
-            # After "message/rfc822"
+            # Inside of the original message part
             if e.empty?
               blanklines += 1
               break if blanklines > 1
@@ -142,7 +147,7 @@ module Sisimai::Bite::Email
             end
             rfc822list << e
           else
-            # Before "message/rfc822"
+            # Error message part
             next if (readcursor & Indicators[:deliverystatus]) == 0
             next if e.empty?
 
@@ -168,35 +173,14 @@ module Sisimai::Bite::Email
             else
               if endoferror
                 # After "Original message headers:"
-                if htmlbegins
-                  # <html> .. </html>
-                  htmlbegins = false if e.start_with?('</html>')
-                  next
-                end
-
-                if cv = e.match(/\AAction:[ ]*(.+)\z/)
-                  # Action: failed
-                  v['action'] = cv[1].downcase
-
-                elsif cv = e.match(/\AStatus:[ ]*(\d[.]\d+[.]\d+)/)
-                  # Status:5.2.0
-                  v['status'] = cv[1]
-
-                elsif cv = e.match(/\AReporting-MTA:[ ]*(?:DNS|dns);[ ]*(.+)\z/)
-                  # Reporting-MTA: dns;BLU004-OMC3S13.hotmail.example.com
-                  connheader['lhost'] = cv[1].downcase
-
-                elsif cv = e.match(/\AReceived-From-MTA:[ ]*(?:DNS|dns);[ ]*(.+)\z/)
-                  # Reporting-MTA: dns;BLU004-OMC3S13.hotmail.example.com
-                  connheader['rhost'] = cv[1].downcase
-
-                elsif cv = e.match(/\AArrival-Date:[ ]*(.+)\z/)
-                  # Arrival-Date: Wed, 29 Apr 2009 16:03:18 +0900
-                  next if connheader['date']
-                  connheader['date'] = cv[1]
-                else
-                  htmlbegins = true if e.start_with?('<html>')
-                end
+                next unless f = Sisimai::RFC1894.match(e)
+                next unless o = Sisimai::RFC1894.field(e)
+                next unless fieldtable.key?(o[0])
+                next if o[0] =~ /\A(?:diagnostic-code|final-recipient)\z/
+                v[fieldtable[o[0]]] = o[2]
+
+                next unless f == 1
+                permessage[fieldtable[o[0]]] = o[2]
               else
                 if e == StartingOf[:error][0]
                   # Diagnostic information for administrators:
@@ -222,7 +206,7 @@ module Sisimai::Bite::Email
 
         dscontents.each do |e|
           # Set default values if each value is empty.
-          connheader.each_key { |a| e[a] ||= connheader[a] || '' }
+          permessage.each_key { |a| e[a] ||= permessage[a] || '' }
 
           e['agent']     = self.smtpagent
           e['status']  ||= ''
@@ -230,8 +214,7 @@ module Sisimai::Bite::Email
 
           if e['status'].empty? || e['status'].end_with?('.0.0')
             # There is no value of Status header or the value is 5.0.0, 4.0.0
-            pseudostatus = Sisimai::SMTP::Status.find(e['diagnosis'])
-            e['status'] = pseudostatus unless pseudostatus.empty?
+            e['status'] = Sisimai::SMTP::Status.find(e['diagnosis']) || ''
           end
 
           ReCommands.each_key do |p|

data/lib/sisimai/bite/email/opensmtpd.rb

@@ -38,17 +38,17 @@ module Sisimai::Bite::Email
       }.freeze
       MessagesOf = {
         # smtpd/queue.c:221|  envelope_set_errormsg(&evp, "Envelope expired");
-        expired: ['Envelope expired'],
+        'expired' => ['Envelope expired'],
         # smtpd/mta.c:976|  relay->failstr = "Invalid domain name";
         # smtpd/mta.c:980|  relay->failstr = "Domain does not exist";
-        hostunknown: [
+        'hostunknown' => [
           'Invalid domain name',
           'Domain does not exist',
         ],
         # smtp/mta.c:1085|  relay->failstr = "Destination seem to reject all mails";
-        notaccept: ['Destination seem to reject all mails'],
+        'notaccept' => ['Destination seem to reject all mails'],
         #  smtpd/mta.c:972|  relay->failstr = "Temporary failure in MX lookup";
-        networkerror: [
+        'networkerror' => [
           'Address family mismatch on destination MXs',
           'All routes to destination blocked',
           'bad DNS lookup error code',
@@ -62,7 +62,7 @@ module Sisimai::Bite::Email
           'Temporary failure in MX lookup',
         ],
         # smtpd/mta.c:1013|  relay->failstr = "Could not retrieve credentials";
-        securityerror: ['Could not retrieve credentials'],
+        'securityerror' => ['Could not retrieve credentials'],
       }.freeze
 
       def description; return 'OpenSMTPD'; end
@@ -111,7 +111,7 @@ module Sisimai::Bite::Email
           end
 
           if readcursor & Indicators[:'message-rfc822'] > 0
-            # After "message/rfc822"
+            # Inside of the original message part
             if e.empty?
               blanklines += 1
               break if blanklines > 1
@@ -119,7 +119,7 @@ module Sisimai::Bite::Email
             end
             rfc822list << e
           else
-            # Before "message/rfc822"
+            # Error message part
             next if (readcursor & Indicators[:deliverystatus]) == 0
             next if e.empty?
 
@@ -157,7 +157,7 @@ module Sisimai::Bite::Email
           MessagesOf.each_key do |r|
             # Verify each regular expression of session errors
             next unless MessagesOf[r].any? { |a| e['diagnosis'].include?(a) }
-            e['reason'] = r.to_s
+            e['reason'] = r
             break
           end
           e.each_key { |a| e[a] ||= '' }

data/lib/sisimai/bite/email/outlook.rb

@@ -13,8 +13,8 @@ module Sisimai::Bite::Email
         rfc822:  ['Content-Type: message/rfc822'],
       }.freeze
       MessagesOf = {
-        hostunknown: ['The mail could not be delivered to the recipient because the domain is not reachable'],
-        userunknown: ['Requested action not taken: mailbox unavailable'],
+        'hostunknown' => ['The mail could not be delivered to the recipient because the domain is not reachable'],
+        'userunknown' => ['Requested action not taken: mailbox unavailable'],
       }.freeze
 
       def description; return 'Microsoft Outlook.com: https://www.outlook.com/'; end
@@ -22,7 +22,7 @@ module Sisimai::Bite::Email
 
       # X-Message-Delivery: Vj0xLjE7RD0wO0dEPTA7U0NMPTk7bD0xO3VzPTE=
       # X-Message-Info: AuEzbeVr9u5fkDpn2vR5iCu5wb6HBeY4iruBjnutBzpStnUabbM...
-      def headerlist;  return ['X-Message-Delivery', 'X-Message-Info']; end
+      def headerlist;  return %w[x-message-delivery x-message-info]; end
 
       # Parse bounce messages from Microsoft Outlook.com
       # @param         [Hash] mhead       Message headers of a bounce email
@@ -44,6 +44,10 @@ module Sisimai::Bite::Email
         match += 1 if mhead['received'].any? { |a| a.include?('.hotmail.com') }
         return nil if match < 2
 
+        require 'sisimai/rfc1894'
+        fieldtable = Sisimai::RFC1894.FIELDTABLE
+        permessage = {}     # (Hash) Store values of each Per-Message field
+
         dscontents = [Sisimai::Bite.DELIVERYSTATUS]
         hasdivided = mbody.split("\n")
         havepassed = ['']
@@ -51,11 +55,6 @@ module Sisimai::Bite::Email
         blanklines = 0      # (Integer) The number of blank lines
         readcursor = 0      # (Integer) Points the current cursor position
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
-        connvalues = 0      # (Integer) Flag, 1 if all the value of connheader have been set
-        connheader = {
-          'date'  => '',    # The value of Arrival-Date header
-          'lhost' => '',    # The value of Reporting-MTA header
-        }
         v = nil
 
         while e = hasdivided.shift do
@@ -64,7 +63,7 @@ module Sisimai::Bite::Email
           p = havepassed[-2]
 
           if readcursor == 0
-            # Beginning of the bounce message or delivery status part
+            # Beginning of the bounce message or message/delivery-status part
             if e.start_with?(StartingOf[:message][0])
               readcursor |= Indicators[:deliverystatus]
               next
@@ -72,7 +71,7 @@ module Sisimai::Bite::Email
           end
 
           if (readcursor & Indicators[:'message-rfc822']) == 0
-            # Beginning of the original message part
+            # Beginning of the original message part(message/rfc822)
             if e == StartingOf[:rfc822][0]
               readcursor |= Indicators[:'message-rfc822']
               next
@@ -80,7 +79,7 @@ module Sisimai::Bite::Email
           end
 
           if readcursor & Indicators[:'message-rfc822'] > 0
-            # After "message/rfc822"
+            # message/rfc822 OR text/rfc822-headers part
             if e.empty?
               blanklines += 1
               break if blanklines > 1
@@ -88,76 +87,59 @@ module Sisimai::Bite::Email
             end
             rfc822list << e
           else
-            # Before "message/rfc822"
+            # message/delivery-status part
             next if (readcursor & Indicators[:deliverystatus]) == 0
             next if e.empty?
 
-            if connvalues == connheader.keys.size
-              # This is an automatically generated Delivery Status Notification.
-              #
-              # Delivery to the following recipients failed.
-              #
-              #      kijitora@example.jp
-              #
-              # Final-Recipient: rfc822;kijitora@example.jp
-              # Action: failed
-              # Status: 5.2.2
-              # Diagnostic-Code: smtp;550 5.2.2 <kijitora@example.jp>... Mailbox Full
+            if f = Sisimai::RFC1894.match(e)
+              # "e" matched with any field defined in RFC3464
+              next unless o = Sisimai::RFC1894.field(e)
               v = dscontents[-1]
 
-              if cv = e.match(/\AFinal-Recipient:[ ]*(?:RFC|rfc)822;[ ]*([^ ]+)\z/)
-                # Final-Recipient: rfc822;kijitora@example.jp
-                if v['recipient']
-                  # There are multiple recipient addresses in the message body.
-                  dscontents << Sisimai::Bite.DELIVERYSTATUS
-                  v = dscontents[-1]
+              if o[-1] == 'addr'
+                # Final-Recipient: rfc822; kijitora@example.jp
+                # X-Actual-Recipient: rfc822; kijitora@example.co.jp
+                if o[0] == 'final-recipient'
+                  # Final-Recipient: rfc822; kijitora@example.jp
+                  if v['recipient']
+                    # There are multiple recipient addresses in the message body.
+                    dscontents << Sisimai::Bite.DELIVERYSTATUS
+                    v = dscontents[-1]
+                  end
+                  v['recipient'] = o[2]
+                  recipients += 1
+                else
+                  # X-Actual-Recipient: rfc822; kijitora@example.co.jp
+                  v['alias'] = o[2]
                 end
-                v['recipient'] = cv[1]
-                recipients += 1
-
-              elsif cv = e.match(/\AAction:[ ]*(.+)\z/)
-                # Action: failed
-                v['action'] = cv[1].downcase
-
-              elsif cv = e.match(/\AStatus:[ ]*(\d[.]\d+[.]\d+)/)
-                # Status:5.2.0
-                v['status'] = cv[1]
+              elsif o[-1] == 'code'
+                # Diagnostic-Code: SMTP; 550 5.1.1 <userunknown@example.jp>... User Unknown
+                v['spec'] = o[1]
+                v['diagnosis'] = o[2]
               else
-                if cv = e.match(/\ADiagnostic-Code:[ ]*(.+?);[ ]*(.+)\z/)
-                  # Diagnostic-Code: SMTP; 550 5.1.1 <userunknown@example.jp>... User Unknown
-                  v['spec'] = cv[1].upcase
-                  v['diagnosis'] = cv[2]
-
-                elsif p.start_with?('Diagnostic-Code:') && cv = e.match(/\A[ \t]+(.+)\z/)
-                  # Continued line of the value of Diagnostic-Code header
-                  v['diagnosis'] << ' ' << cv[1]
-                  havepassed[-1] = 'Diagnostic-Code: ' << e
-                end
+                # Other DSN fields defined in RFC3464
+                next unless fieldtable.key?(o[0])
+                v[fieldtable[o[0]]] = o[2]
+
+                next unless f == 1
+                permessage[fieldtable[o[0]]] = o[2]
               end
             else
-              # Reporting-MTA: dns;BLU004-OMC3S13.hotmail.example.com
-              # Received-From-MTA: dns;BLU436-SMTP66
-              # Arrival-Date: Fri, 21 Nov 2014 14:17:34 -0800
-              if cv = e.match(/\AReporting-MTA:[ ]*(?:DNS|dns);[ ]*(.+)\z/)
-                # Reporting-MTA: dns;BLU004-OMC3S13.hotmail.example.com
-                next unless connheader['lhost'].empty?
-                connheader['lhost'] = cv[1].downcase
-                connvalues += 1
-
-              elsif cv = e.match(/\AArrival-Date:[ ]*(.+)\z/)
-                # Arrival-Date: Wed, 29 Apr 2009 16:03:18 +0900
-                next unless connheader['date'].empty?
-                connheader['date'] = cv[1]
-                connvalues += 1
-              end
+              # Continued line of the value of Diagnostic-Code field
+              next unless p.start_with?('Diagnostic-Code:')
+              next unless cv = e.match(/\A[ \t]+(.+)\z/)
+              v['diagnosis'] << ' ' << cv[1]
+              havepassed[-1] = 'Diagnostic-Code: ' << e
             end
-          end
+          end # End of message/delivery-status
         end
         return nil unless recipients > 0
 
         dscontents.each do |e|
           # Set default values if each value is empty.
-          connheader.each_key { |a| e[a] ||= connheader[a] || '' }
+          e['lhost'] ||= permessage['rhost']
+          permessage.each_key { |a| e[a] ||= permessage[a] || '' }
+
           e['agent']     = self.smtpagent
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis']) || ''
 
@@ -176,7 +158,7 @@ module Sisimai::Bite::Email
           MessagesOf.each_key do |r|
             # Verify each regular expression of session errors
             next unless MessagesOf[r].any? { |a| e['diagnosis'].include?(a) }
-            e['reason'] = r.to_s
+            e['reason'] = r
             break
           end
         end