sisimai 4.25.4-java → 4.25.10-java

data/lib/sisimai/lhost/exim.rb

@@ -7,10 +7,16 @@ module Sisimai::Lhost
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      StartingOf = {
-        deliverystatus: ['Content-type: message/delivery-status'],
-        endof:          ['__END_OF_EMAIL_MESSAGE__'],
-      }.freeze
+      # deliver.c:6423|          if (bounce_return_body) fprintf(f,
+      # deliver.c:6424|"------ This is a copy of the message, including all the headers. ------\n");
+      # deliver.c:6425|          else fprintf(f,
+      # deliver.c:6426|"------ This is a copy of the message's headers. ------\n");
+      ReBackbone = %r{^(?:
+         [-]+[ ]This[ ]is[ ]a[ ]copy[ ]of[ ](?:the|your)[ ]message,[ ]including[ ]all[ ]the[ ]headers[.][ ][-]+
+        |Content-Type:[ ]*message/rfc822\n(?:[\s\t]+.*?\n\n)?
+        )
+      }x.freeze
+      StartingOf = { deliverystatus: ['Content-type: message/delivery-status'] }.freeze
       MarkingsOf = {
         # Error text regular expressions which defined in exim/src/deliver.c
         #
@@ -29,24 +35,15 @@ module Sisimai::Lhost
         # deliver.c:6304|"could not be delivered to one or more of its recipients. The following\n"
         # deliver.c:6305|"address(es) failed:\n", sender_address);
         # deliver.c:6306|          }
-        #
-        # deliver.c:6423|          if (bounce_return_body) fprintf(f,
-        # deliver.c:6424|"------ This is a copy of the message, including all the headers. ------\n");
-        # deliver.c:6425|          else fprintf(f,
-        # deliver.c:6426|"------ This is a copy of the message's headers. ------\n");
-        alias:  %r/\A([ ]+an undisclosed address)\z/,
-        frozen: %r/\AMessage .+ (?:has been frozen|was frozen on arrival)/,
-        rfc822: %r{\A(?:
-             [-]+[ ]This[ ]is[ ]a[ ]copy[ ]of[ ](?:the|your)[ ]message.+headers[.][ ][-]+
-            |Content-Type:[ ]*message/rfc822
-            )\z
-          }x,
+        alias:   %r/\A([ ]+an undisclosed address)\z/,
+        frozen:  %r/\AMessage [^ ]+ (?:has been frozen|was frozen on arrival)/,
         message: %r{\A(?>
            This[ ]message[ ]was[ ]created[ ]automatically[ ]by[ ]mail[ ]delivery[ ]software[.]
           |A[ ]message[ ]that[ ]you[ ]sent[ ]was[ ]rejected[ ]by[ ]the[ ]local[ ]scanning[ ]code
           |A[ ]message[ ]that[ ]you[ ]sent[ ]contained[ ]one[ ]or[ ]more[ ]recipient[ ]addresses[ ]
-          |Message[ ].+[ ](?:has[ ]been[ ]frozen|was[ ]frozen[ ]on[ ]arrival)
-          |The[ ].+[ ]router[ ]encountered[ ]the[ ]following[ ]error[(]s[)]:
+          |A[ ]message[ ]that[ ]you[ ]sent[ ]could[ ]not[ ]be[ ]delivered[ ]to[ ]all[ ]of[ ]its[ ]recipients
+          |Message[ ][^ ]+[ ](?:has[ ]been[ ]frozen|was[ ]frozen[ ]on[ ]arrival)
+          |The[ ][^ ]+[ ]router[ ]encountered[ ]the[ ]following[ ]error[(]s[)]:
           )
          }x,
       }.freeze
@@ -123,31 +120,22 @@ module Sisimai::Lhost
         'was frozen on arrival by ',
       ].freeze
 
-      def description; return 'Exim'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-      def headerlist;  return %w[x-failed-recipients]; end
-
       # Parse bounce messages from Exim
-      # @param         [Hash] mhead       Message headers of a bounce email
-      # @options mhead [String] from      From header
-      # @options mhead [String] date      Date header
-      # @options mhead [String] subject   Subject header
-      # @options mhead [Array]  received  Received headers
-      # @options mhead [String] others    Other required headers
-      # @param         [String] mbody     Message body of a bounce email
-      # @return        [Hash, Nil]        Bounce data list and message/rfc822
-      #                                   part or nil if it failed to parse or
-      #                                   the arguments are missing
+      # @param  [Hash] mhead    Message headers of a bounce email
+      # @param  [String] mbody  Message body of a bounce email
+      # @return [Hash]          Bounce data list and message/rfc822 part
+      # @return [Nil]           it failed to parse or the arguments are missing
       def make(mhead, mbody)
         return nil if mhead['from'] =~ /[@].+[.]mail[.]ru[>]?/
 
         # Message-Id: <E1P1YNN-0003AD-Ga@example.org>
+        # X-Failed-Recipients: kijitora@example.ed.jp
         match  = 0
         match += 1 if mhead['from'].start_with?('Mail Delivery System')
         match += 1 if mhead['message-id'].to_s =~ %r/\A[<]\w{7}[-]\w{6}[-]\w{2}[@]/
         match += 1 if mhead['subject'] =~ %r{(?:
            Mail[ ]delivery[ ]failed(:[ ]returning[ ]message[ ]to[ ]sender)?
-          |Warning:[ ]message[ ].+[ ]delayed[ ]+
+          |Warning:[ ]message[ ][^ ]+[ ]delayed[ ]+
           |Delivery[ ]Status[ ]Notification
           |Mail[ ]failure
           |Message[ ]frozen
@@ -159,16 +147,13 @@ module Sisimai::Lhost
         require 'sisimai/rfc1894'
         fieldtable = Sisimai::RFC1894.FIELDTABLE
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
-        hasdivided = mbody.split("\n")
-        rfc822list = []     # (Array) Each line in message/rfc822 part string
-        blanklines = 0      # (Integer) The number of blank lines
+        emailsteak = Sisimai::RFC5322.fillet(mbody, ReBackbone)
+        bodyslices = emailsteak[0].split("\n")
         readcursor = 0      # (Integer) Points the current cursor position
+        nextcursor = 0
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
         localhost0 = ''     # (String) Local MTA
         boundary00 = ''     # (String) Boundary string
-        havepassed = {
-          :deliverystatus => 0
-        }
         v = nil
 
         if mhead['content-type']
@@ -177,9 +162,9 @@ module Sisimai::Lhost
           boundary00 = Sisimai::MIME.boundary(mhead['content-type']) || ''
         end
 
-        while e = hasdivided.shift do
-          break if e == StartingOf[:endof][0]
-
+        while e = bodyslices.shift do
+          # Read error messages and delivery status lines from the head of the email
+          # to the previous line of the beginning of the original message.
           if readcursor == 0
             # Beginning of the bounce message or message/delivery-status part
             if e =~ MarkingsOf[:message]
@@ -187,143 +172,123 @@ module Sisimai::Lhost
               next unless e =~ MarkingsOf[:frozen]
             end
           end
+          next if (readcursor & Indicators[:deliverystatus]) == 0
+          next if e.empty?
+
+          # This message was created automatically by mail delivery software.
+          #
+          # A message that you sent could not be delivered to one or more of its
+          # recipients. This is a permanent error. The following address(es) failed:
+          #
+          #  kijitora@example.jp
+          #    SMTP error from remote mail server after RCPT TO:<kijitora@example.jp>:
+          #    host neko.example.jp [192.0.2.222]: 550 5.1.1 <kijitora@example.jp>... User Unknown
+          v = dscontents[-1]
+
+          if cv = e.match(/\A[ \t]{2}([^ \t]+[@][^ \t]+[.]?[a-zA-Z]+)(:.+)?\z/) ||
+                  e.match(/\A[ \t]{2}[^ \t]+[@][^ \t]+[.][a-zA-Z]+[ ]<(.+?[@].+?)>:.+\z/) ||
+                  e.match(MarkingsOf[:alias])
+            #   kijitora@example.jp
+            #   sabineko@example.jp: forced freeze
+            #   mikeneko@example.jp <nekochan@example.org>: ...
+            #
+            # deliver.c:4549|  printed = US"an undisclosed address";
+            #   an undisclosed address
+            #     (generated from kijitora@example.jp)
+            r = cv[1]
 
-          if (readcursor & Indicators[:'message-rfc822']) == 0
-            # Beginning of the original message part(message/rfc822)
-            if e =~ MarkingsOf[:rfc822]
-              readcursor |= Indicators[:'message-rfc822']
-              next
+            if v['recipient']
+              # There are multiple recipient addresses in the message body.
+              dscontents << Sisimai::Lhost.DELIVERYSTATUS
+              v = dscontents[-1]
             end
-          end
-
-          if readcursor & Indicators[:'message-rfc822'] > 0
-            # message/rfc822 OR text/rfc822-headers part
-            if e.empty?
-              blanklines += 1
-              break if blanklines > 1
-              next
+            # v['recipient'] = cv[1]
+
+            if cv = e.match(/\A[ \t]+[^ \t]+[@][^ \t]+[.][a-zA-Z]+[ ]<(.+?[@].+?)>:.+\z/)
+              # parser.c:743| while (bracket_count-- > 0) if (*s++ != '>')
+              # parser.c:744|   {
+              # parser.c:745|   *errorptr = s[-1] == 0
+              # parser.c:746|     ? US"'>' missing at end of address"
+              # parser.c:747|     : string_sprintf("malformed address: %.32s may not follow %.*s",
+              # parser.c:748|     s-1, (int)(s - US mailbox - 1), mailbox);
+              # parser.c:749|   goto PARSE_FAILED;
+              # parser.c:750|   }
+              r = cv[1]
+              v['diagnosis'] = e
             end
-            rfc822list << e
+            v['recipient'] = r
+            recipients += 1
+
+          elsif cv = e.match(/\A[ ]+[(]generated[ ]from[ ](.+)[)]\z/) ||
+                     e.match(/\A[ ]+generated[ ]by[ ]([^ \t]+[@][^ \t]+)/)
+            #     (generated from kijitora@example.jp)
+            #  pipe to |/bin/echo "Some pipe output"
+            #    generated by userx@myhost.test.ex
+            v['alias'] = cv[1]
           else
-            # message/delivery-status part
-            next if (readcursor & Indicators[:deliverystatus]) == 0
             next if e.empty?
 
-            # This message was created automatically by mail delivery software.
-            #
-            # A message that you sent could not be delivered to one or more of its
-            # recipients. This is a permanent error. The following address(es) failed:
-            #
-            #  kijitora@example.jp
-            #    SMTP error from remote mail server after RCPT TO:<kijitora@example.jp>:
-            #    host neko.example.jp [192.0.2.222]: 550 5.1.1 <kijitora@example.jp>... User Unknown
-            v = dscontents[-1]
-
-            if cv = e.match(/\A[ \t]{2}([^ \t]+[@][^ \t]+[.]?[a-zA-Z]+)(:.+)?\z/) ||
-                    e.match(/\A[ \t]{2}[^ \t]+[@][^ \t]+[.][a-zA-Z]+[ ]<(.+?[@].+?)>:.+\z/) ||
-                    e.match(MarkingsOf[:alias])
-              #   kijitora@example.jp
-              #   sabineko@example.jp: forced freeze
-              #   mikeneko@example.jp <nekochan@example.org>: ...
-              #
-              # deliver.c:4549|  printed = US"an undisclosed address";
-              #   an undisclosed address
-              #     (generated from kijitora@example.jp)
-              r = cv[1]
-
-              if v['recipient']
-                # There are multiple recipient addresses in the message body.
-                dscontents << Sisimai::Lhost.DELIVERYSTATUS
-                v = dscontents[-1]
-              end
-              # v['recipient'] = cv[1]
-
-              if cv = e.match(/\A[ \t]+[^ \t]+[@][^ \t]+[.][a-zA-Z]+[ ]<(.+?[@].+?)>:.+\z/)
-                # parser.c:743| while (bracket_count-- > 0) if (*s++ != '>')
-                # parser.c:744|   {
-                # parser.c:745|   *errorptr = s[-1] == 0
-                # parser.c:746|     ? US"'>' missing at end of address"
-                # parser.c:747|     : string_sprintf("malformed address: %.32s may not follow %.*s",
-                # parser.c:748|     s-1, (int)(s - US mailbox - 1), mailbox);
-                # parser.c:749|   goto PARSE_FAILED;
-                # parser.c:750|   }
-                r = cv[1]
-                v['diagnosis'] = e
-              end
-              v['recipient'] = r
-              recipients += 1
-
-            elsif cv = e.match(/\A[ ]+[(]generated[ ]from[ ](.+)[)]\z/) ||
-                       e.match(/\A[ ]+generated[ ]by[ ]([^ \t]+[@][^ \t]+)/)
-              #     (generated from kijitora@example.jp)
-              #  pipe to |/bin/echo "Some pipe output"
-              #    generated by userx@myhost.test.ex
-              v['alias'] = cv[1]
+            if e =~ MarkingsOf[:frozen]
+              # Message *** has been frozen by the system filter.
+              # Message *** was frozen on arrival by ACL.
+              v['alterrors'] ||= ''
+              v['alterrors'] <<  e + ' '
             else
-              next if e.empty?
+              if !boundary00.empty?
+                # --NNNNNNNNNN-eximdsn-MMMMMMMMMM
+                # Content-type: message/delivery-status
+                # ...
+                if Sisimai::RFC1894.match(e)
+                  # "e" matched with any field defined in RFC3464
+                  next unless o = Sisimai::RFC1894.field(e)
+
+                  if o[-1] == 'addr'
+                    # Final-Recipient: rfc822; kijitora@example.jp
+                    # X-Actual-Recipient: rfc822; kijitora@example.co.jp
+                    next unless o[0] == 'final-recipient'
+                    v['spec'] ||= o[2].include?('@') ? 'SMTP' : 'X-UNIX'
+
+                  elsif o[-1] == 'code'
+                    # Diagnostic-Code: SMTP; 550 5.1.1 <userunknown@example.jp>... User Unknown
+                    v['spec'] = o[1]
+                    v['diagnosis'] = o[2]
 
-              if e =~ MarkingsOf[:frozen]
-                # Message *** has been frozen by the system filter.
-                # Message *** was frozen on arrival by ACL.
-                v['alterrors'] ||= ''
-                v['alterrors'] <<  e + ' '
-              else
-                if !boundary00.empty?
-                  # --NNNNNNNNNN-eximdsn-MMMMMMMMMM
-                  # Content-type: message/delivery-status
-                  # ...
-                  if Sisimai::RFC1894.match(e)
-                    # "e" matched with any field defined in RFC3464
-                    next unless o = Sisimai::RFC1894.field(e)
-
-                    if o[-1] == 'addr'
-                      # Final-Recipient: rfc822; kijitora@example.jp
-                      # X-Actual-Recipient: rfc822; kijitora@example.co.jp
-                      next unless o[0] == 'final-recipient'
-                      v['spec'] ||= o[2].include?('@') ? 'SMTP' : 'X-UNIX'
-
-                    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
-                      # Other DSN fields defined in RFC3464
-                      next unless fieldtable.key?(o[0])
-                      v[fieldtable[o[0]]] = o[2]
-                    end
                   else
-                    # Error message ?
-                    next if havepassed[:deliverystatus] == 1
-
-                    # Content-type: message/delivery-status
-                    havepassed[:deliverystatus] = 1 if e.start_with?(StartingOf[:deliverystatus][0])
-                    v['alterrors'] ||= ''
-                    v['alterrors'] << e + ' ' if e.start_with?(' ')
+                    # Other DSN fields defined in RFC3464
+                    next unless fieldtable[o[0]]
+                    v[fieldtable[o[0]]] = o[2]
                   end
                 else
-                  if dscontents.size == recipients
-                    # Error message
-                    next if e.empty?
-                    v['diagnosis'] ||= ''
-                    v['diagnosis'] << e + '  '
+                  # Error message ?
+                  next if nextcursor == 1
+
+                  # Content-type: message/delivery-status
+                  nextcursor = 1 if e.start_with?(StartingOf[:deliverystatus][0])
+                  v['alterrors'] ||= ''
+                  v['alterrors'] << e + ' ' if e.start_with?(' ')
+                end
+              else
+                if dscontents.size == recipients
+                  # Error message
+                  next if e.empty?
+                  v['diagnosis'] ||= ''
+                  v['diagnosis'] << e + '  '
+                else
+                  # Error message when email address above does not include '@'
+                  # and domain part.
+                  if e =~ %r<\A[ ]+pipe[ ]to[ ][|]/[^ ]+>
+                    # pipe to |/path/to/prog ...
+                    #   generated by kijitora@example.com
+                    v['diagnosis'] = e
                   else
-                    # Error message when email address above does not include '@'
-                    # and domain part.
-                    if e =~ %r<\A[ ]+pipe[ ]to[ ][|]/.+>
-                      # pipe to |/path/to/prog ...
-                      #   generated by kijitora@example.com
-                      v['diagnosis'] = e
-                    else
-                      next unless e.start_with?('    ')
-                      v['alterrors'] ||= ''
-                      v['alterrors'] << e + ' '
-                    end
+                    next unless e.start_with?('    ')
+                    v['alterrors'] ||= ''
+                    v['alterrors'] << e + ' '
                   end
                 end
               end
             end
-          end # End of message/delivery-status
+          end
         end
 
         if recipients > 0
@@ -367,7 +332,6 @@ module Sisimai::Lhost
 
         dscontents.each do |e|
           # Set default values if each value is empty.
-          e['agent']   = self.smtpagent
           e['lhost'] ||= localhost0
 
           unless e['diagnosis']
@@ -516,13 +480,11 @@ module Sisimai::Lhost
                  end
           end
           e['status'] ||= sv.to_s
-          e.each_key { |a| e[a] ||= '' }
         end
 
-        rfc822part = Sisimai::RFC5322.weedout(rfc822list)
-        return { 'ds' => dscontents, 'rfc822' => rfc822part }
+        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
-
+      def description; return 'Exim'; end
     end
   end
 end

data/lib/sisimai/lhost/ezweb.rb

@@ -7,6 +7,7 @@ module Sisimai::Lhost
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
+      ReBackbone = %r<^(?:[-]{50}|Content-Type:[ ]*message/rfc822)>.freeze
       MarkingsOf = {
         message: %r{\A(?:
              The[ ]user[(]s[)][ ]
@@ -15,7 +16,6 @@ module Sisimai::Lhost
             |[<][^ ]+[@][^ ]+[>]\z
             )
         }x,
-        rfc822: %r#\A(?:[-]{50}|Content-Type:[ ]*message/rfc822)#,
       }.freeze
       ReFailures = {
         # notaccept: [ %r/The following recipients did not receive this message:/ ],
@@ -38,21 +38,11 @@ module Sisimai::Lhost
         ],
       }.freeze
 
-      def description; return 'au EZweb: http://www.au.kddi.com/mobile/'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-      def headerlist;  return %w[x-spasign]; end
-
       # Parse bounce messages from au EZweb
-      # @param         [Hash] mhead       Message headers of a bounce email
-      # @options mhead [String] from      From header
-      # @options mhead [String] date      Date header
-      # @options mhead [String] subject   Subject header
-      # @options mhead [Array]  received  Received headers
-      # @options mhead [String] others    Other required headers
-      # @param         [String] mbody     Message body of a bounce email
-      # @return        [Hash, Nil]        Bounce data list and message/rfc822
-      #                                   part or nil if it failed to parse or
-      #                                   the arguments are missing
+      # @param  [Hash] mhead    Message headers of a bounce email
+      # @param  [String] mbody  Message body of a bounce email
+      # @return [Hash]          Bounce data list and message/rfc822 part
+      # @return [Nil]           it failed to parse or the arguments are missing
       def make(mhead, mbody)
         match  = 0
         match += 1 if mhead['from'].include?('Postmaster@ezweb.ne.jp')
@@ -68,9 +58,8 @@ module Sisimai::Lhost
         require 'sisimai/rfc1894'
         fieldtable = Sisimai::RFC1894.FIELDTABLE
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
-        hasdivided = mbody.split("\n")
-        rfc822list = []     # (Array) Each line in message/rfc822 part string
-        blanklines = 0      # (Integer) The number of blank lines
+        emailsteak = Sisimai::RFC5322.fillet(mbody, ReBackbone)
+        bodyslices = emailsteak[0].split("\n")
         readcursor = 0      # (Integer) Points the current cursor position
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
         rxboundary = %r/\A__SISIMAI_PSEUDO_BOUNDARY__\z/
@@ -85,83 +74,65 @@ module Sisimai::Lhost
         rxmessages = []
         ReFailures.each_value { |a| rxmessages << a }
 
-        while e = hasdivided.shift do
+        while e = bodyslices.shift do
+          # Read error messages and delivery status lines from the head of the email
+          # to the previous line of the beginning of the original message.
           if readcursor == 0
             # Beginning of the bounce message or delivery status part
             readcursor |= Indicators[:deliverystatus] if e =~ MarkingsOf[:message]
           end
-
-          if (readcursor & Indicators[:'message-rfc822']) == 0
-            # Beginning of the original message part
-            if e =~ MarkingsOf[:rfc822] || e =~ rxboundary
-              readcursor |= Indicators[:'message-rfc822']
-              next
+          next if (readcursor & Indicators[:deliverystatus]) == 0
+          next if e.empty?
+
+          # The user(s) account is disabled.
+          #
+          # <***@ezweb.ne.jp>: 550 user unknown (in reply to RCPT TO command)
+          #
+          #  -- OR --
+          # Each of the following recipients was rejected by a remote
+          # mail server.
+          #
+          #    Recipient: <******@ezweb.ne.jp>
+          #    >>> RCPT TO:<******@ezweb.ne.jp>
+          #    <<< 550 <******@ezweb.ne.jp>: User unknown
+          v = dscontents[-1]
+
+          if cv = e.match(/\A[<]([^ ]+[@][^ ]+)[>]\z/) ||
+                  e.match(/\A[<]([^ ]+[@][^ ]+)[>]:?(.*)\z/) ||
+                  e.match(/\A[ \t]+Recipient: [<]([^ ]+[@][^ ]+)[>]/)
+
+            if v['recipient']
+              # There are multiple recipient addresses in the message body.
+              dscontents << Sisimai::Lhost.DELIVERYSTATUS
+              v = dscontents[-1]
             end
-          end
 
-          if readcursor & Indicators[:'message-rfc822'] > 0
-            # Inside of the original message part
-            if e.empty?
-              blanklines += 1
-              break if blanklines > 1
-              next
-            end
-            rfc822list << e
-          else
-            # Error message part
-            next if (readcursor & Indicators[:deliverystatus]) == 0
-            next if e.empty?
-
-            # The user(s) account is disabled.
-            #
-            # <***@ezweb.ne.jp>: 550 user unknown (in reply to RCPT TO command)
-            #
-            #  -- OR --
-            # Each of the following recipients was rejected by a remote
-            # mail server.
-            #
-            #    Recipient: <******@ezweb.ne.jp>
-            #    >>> RCPT TO:<******@ezweb.ne.jp>
-            #    <<< 550 <******@ezweb.ne.jp>: User unknown
-            v = dscontents[-1]
-
-            if cv = e.match(/\A[<]([^ ]+[@][^ ]+)[>]\z/) ||
-                    e.match(/\A[<]([^ ]+[@][^ ]+)[>]:?(.*)\z/) ||
-                    e.match(/\A[ \t]+Recipient: [<]([^ ]+[@][^ ]+)[>]/)
-
-              if v['recipient']
-                # There are multiple recipient addresses in the message body.
-                dscontents << Sisimai::Lhost.DELIVERYSTATUS
-                v = dscontents[-1]
-              end
+            r = Sisimai::Address.s3s4(cv[1])
+            v['recipient'] = r
+            recipients += 1
 
-              r = Sisimai::Address.s3s4(cv[1])
-              v['recipient'] = r
-              recipients += 1
-
-            elsif f = Sisimai::RFC1894.match(e)
-              # "e" matched with any field defined in RFC3464
-              next unless o = Sisimai::RFC1894.field(e)
-              next unless fieldtable.key?(o[0])
-              v[fieldtable[o[0]]] = o[2]
+          elsif f = Sisimai::RFC1894.match(e)
+            # "e" matched with any field defined in RFC3464
+            next unless o = Sisimai::RFC1894.field(e)
+            next unless fieldtable[o[0]]
+            v[fieldtable[o[0]]] = o[2]
 
+          else
+            # The line does not begin with a DSN field defined in RFC3464
+            next if Sisimai::String.is_8bit(e)
+            if cv = e.match(/\A[ \t]+[>]{3}[ \t]+([A-Z]{4})/)
+              #    >>> RCPT TO:<******@ezweb.ne.jp>
+              v['command'] = cv[1]
             else
-              # The line does not begin with a DSN field defined in RFC3464
-              next if Sisimai::String.is_8bit(e)
-              if cv = e.match(/\A[ \t]+[>]{3}[ \t]+([A-Z]{4})/)
-                #    >>> RCPT TO:<******@ezweb.ne.jp>
-                v['command'] = cv[1]
+              # Check error message
+              if rxmessages.any? { |messages| messages.any? { |message| e =~ message } }
+                # Check with regular expressions of each error
+                v['diagnosis'] ||= ''
+                v['diagnosis'] << ' ' << e
               else
-                # Check error message
-                if rxmessages.any? { |a| e =~ a }
-                  # Check with regular expressions of each error
-                  v['diagnosis'] ||= ''
-                  v['diagnosis'] << ' ' << e
-                else
-                  # >>> 550
-                  v['alterrors'] ||= ''
-                  v['alterrors'] << ' ' << e
-                end
+                # >>> 550
+                v['alterrors'] ||= ''
+                v['alterrors'] << ' ' << e
               end
             end
           end
@@ -169,8 +140,6 @@ module Sisimai::Lhost
         return nil unless recipients > 0
 
         dscontents.each do |e|
-          e['agent'] = self.smtpagent
-
           unless e['alterrors'].to_s.empty?
             # Copy alternative error message
             e['diagnosis'] ||= e['alterrors']
@@ -212,10 +181,9 @@ module Sisimai::Lhost
           e['reason'] = 'userunknown'
         end
 
-        rfc822part = Sisimai::RFC5322.weedout(rfc822list)
-        return { 'ds' => dscontents, 'rfc822' => rfc822part }
+        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
-
+      def description; return 'au EZweb: http://www.au.kddi.com/mobile/'; end
     end
   end
 end