sisimai 4.16.0-java → 4.17.0-java

data/lib/sisimai/mta/postfix.rb

@@ -36,8 +36,6 @@ module Sisimai
           :endof  => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
         }
         Indicators = Sisimai::MTA.INDICATORS
-        LongFields = Sisimai::RFC5322.LONGFIELDS
-        RFC822Head = Sisimai::RFC5322.HEADERFIELDS
 
         def description; return 'Postfix'; end
         def smtpagent;   return 'Postfix'; end
@@ -60,12 +58,11 @@ module Sisimai
           return nil unless mbody
           return nil unless mhead['subject'] =~ Re0[:subject]
 
-          dscontents = []; dscontents << Sisimai::MTA.DELIVERYSTATUS
+          dscontents = [Sisimai::MTA.DELIVERYSTATUS]
           hasdivided = mbody.split("\n")
           havepassed = ['']
-          rfc822next = { 'from' => false, 'to' => false, 'subject' => false }
-          rfc822part = ''     # (String) message/rfc822-headers part
-          previousfn = ''     # (String) Previous field name
+          rfc822list = []     # (Array) Each line in message/rfc822 part string
+          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
           commandset = []     # (Array) ``in reply to * command'' list
@@ -79,12 +76,13 @@ module Sisimai
 
           hasdivided.each do |e|
             # Save the current line for the next loop
-            havepassed << e; p = havepassed[-2]
+            havepassed << e
+            p = havepassed[-2]
 
             if readcursor == 0
               # Beginning of the bounce message or delivery status part
               if e =~ Re1[:begin]
-                readcursor |= Indicators[:'deliverystatus']
+                readcursor |= Indicators[:deliverystatus]
                 next
               end
             end
@@ -99,30 +97,16 @@ module Sisimai
 
             if readcursor & Indicators[:'message-rfc822'] > 0
               # After "message/rfc822"
-              if cv = e.match(/\A([-0-9A-Za-z]+?)[:][ ]*.*\z/)
-                # Get required headers only
-                lhs = cv[1].downcase
-                previousfn = ''
-                next unless RFC822Head.key?(lhs)
-
-                previousfn  = lhs
-                rfc822part += e + "\n"
-
-              elsif e =~ /\A[ \t]+/
-                # Continued line from the previous line
-                next if rfc822next[previousfn]
-                rfc822part += e + "\n" if LongFields.key?(previousfn)
-
-              else
-                # Check the end of headers in rfc822 part
-                next unless LongFields.key?(previousfn)
-                next unless e.empty?
-                rfc822next[previousfn] = true
+              if e.empty?
+                blanklines += 1
+                break if blanklines > 1
+                next
               end
+              rfc822list << e
 
             else
               # Before "message/rfc822"
-              next if readcursor & Indicators[:'deliverystatus'] == 0
+              next if readcursor & Indicators[:deliverystatus] == 0
               next if e.empty?
 
               if connvalues == connheader.keys.size
@@ -145,7 +129,7 @@ module Sisimai
                   recipients += 1
 
                 elsif cv = e.match(/\A[Xx]-[Aa]ctual-[Rr]ecipient:[ ]*(?:RFC|rfc)822;[ ]*([^ ]+)\z/) ||
-                      cv = e.match(/\A[Oo]riginal-[Rr]ecipient:[ ]*(?:RFC|rfc)822;[ ]*([^ ]+)\z/)
+                           e.match(/\A[Oo]riginal-[Rr]ecipient:[ ]*(?:RFC|rfc)822;[ ]*([^ ]+)\z/)
                   # X-Actual-Recipient: RFC822; kijitora@example.co.jp
                   # Original-Recipient: rfc822;kijitora@example.co.jp
                   v['alias'] = cv[1]
@@ -222,7 +206,7 @@ module Sisimai
 
                   elsif cv = e.match(/\A(X-Postfix-Sender):[ ]*rfc822;[ ]*(.+)\z/)
                     # X-Postfix-Sender: rfc822; shironeko@example.org
-                    rfc822part += sprintf('%s: %s\n', cv[1], cv[2])
+                    rfc822list << sprintf('%s: %s', cv[1], cv[2])
 
                   else
                     # Alternative error message and recipient
@@ -279,24 +263,10 @@ module Sisimai
             end
             e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
             e['spec']    ||= 'SMTP' if e['diagnosis'] =~ /host .+ said:/
-            e['status']  ||= ''
-
-            if mhead['received'].size > 0
-              # Get localhost and remote host name from Received header.
-              r0 = mhead['received']
-              %w|lhost rhost|.each { |a| e[a] ||= '' }
-              e['lhost'] = Sisimai::RFC5322.received(r0[0]).shift if e['lhost'].empty?
-              e['rhost'] = Sisimai::RFC5322.received(r0[-1]).pop  if e['rhost'].empty?
-            end
-
-            if e['status'].empty? || e['status'] =~ /\A\d[.]0[.]0\z/
-              # There is no value of Status header or the value is 5.0.0, 4.0.0
-              r = Sisimai::SMTP::Status.find(e['diagnosis'])
-              e['status'] = r if r.size > 0
-            end
             e.each_key { |a| e[a] ||= '' }
           end
 
+          rfc822part = Sisimai::RFC5322.weedout(rfc822list)
           return { 'ds' => dscontents, 'rfc822' => rfc822part }
         end
 

data/lib/sisimai/mta/qmail.rb

@@ -29,21 +29,21 @@ module Sisimai
         ReSMTP = {
           # Error text regular expressions which defined in qmail-remote.c
           # qmail-remote.c:225|  if (smtpcode() != 220) quit("ZConnected to "," but greeting failed");
-          'conn' => %r/(?:Error:)?Connected[ ]to[ ].+[ ]but[ ]greeting[ ]failed[.]/x,
+          conn: %r/(?:Error:)?Connected[ ]to[ ].+[ ]but[ ]greeting[ ]failed[.]/x,
           # qmail-remote.c:231|  if (smtpcode() != 250) quit("ZConnected to "," but my name was rejected");
-          'ehlo' => %r/(?:Error:)?Connected[ ]to[ ].+[ ]but[ ]my[ ]name[ ]was[ ]rejected[.]/x,
+          ehlo: %r/(?:Error:)?Connected[ ]to[ ].+[ ]but[ ]my[ ]name[ ]was[ ]rejected[.]/x,
           # qmail-remote.c:238|  if (code >= 500) quit("DConnected to "," but sender was rejected");
           # reason = rejected
-          'mail' => %r/(?:Error:)?Connected[ ]to[ ].+[ ]but[ ]sender[ ]was[ ]rejected[.]/x,
+          mail: %r/(?:Error:)?Connected[ ]to[ ].+[ ]but[ ]sender[ ]was[ ]rejected[.]/x,
           # qmail-remote.c:249|  out("h"); outhost(); out(" does not like recipient.\n");
           # qmail-remote.c:253|  out("s"); outhost(); out(" does not like recipient.\n");
           # reason = userunknown
-          'rcpt' => %r/(?:Error:)?.+[ ]does[ ]not[ ]like[ ]recipient[.]/x,
+          rcpt: %r/(?:Error:)?.+[ ]does[ ]not[ ]like[ ]recipient[.]/x,
           # qmail-remote.c:265|  if (code >= 500) quit("D"," failed on DATA command");
           # qmail-remote.c:266|  if (code >= 400) quit("Z"," failed on DATA command");
           # qmail-remote.c:271|  if (code >= 500) quit("D"," failed after I sent the message");
           # qmail-remote.c:272|  if (code >= 400) quit("Z"," failed after I sent the message");
-          'data' => %r{(?:
+          data: %r{(?:
              (?:Error:)?.+[ ]failed[ ]on[ ]DATA[ ]command[.]
             |(?:Error:)?.+[ ]failed[ ]after[ ]I[ ]sent[ ]the[ ]message[.]
             )
@@ -58,10 +58,10 @@ module Sisimai
         }x
         ReLDAP = {
           # qmail-ldap-1.03-20040101.patch:19817 - 19866
-          'suspend'     => %r/Mailaddress is administrative?le?y disabled/,            # 5.2.1
-          'userunknown' => %r/[Ss]orry, no mailbox here by that name/,                 # 5.1.1
-          'exceedlimit' => %r/The message exeeded the maximum size the user accepts/,  # 5.2.3
-          'systemerror' => %r{(?>
+          suspend:     %r/Mailaddress is administrative?le?y disabled/,            # 5.2.1
+          userunknown: %r/[Ss]orry, no mailbox here by that name/,                 # 5.1.1
+          exceedlimit: %r/The message exeeded the maximum size the user accepts/,  # 5.2.3
+          systemerror: %r{(?>
              Automatic[ ]homedir[ ]creator[ ]crashed                    # 4.3.0
             |Illegal[ ]value[ ]in[ ]LDAP[ ]attribute                    # 5.3.5
             |LDAP[ ]attribute[ ]is[ ]not[ ]given[ ]but[ ]mandatory      # 5.3.5
@@ -89,40 +89,37 @@ module Sisimai
         ReFailure = {
           # qmail-local.c:589|  strerr_die1x(100,"Sorry, no mailbox here by that name. (#5.1.1)");
           # qmail-remote.c:253|  out("s"); outhost(); out(" does not like recipient.\n");
-          'userunknown' => %r{(?:
+          userunknown: %r{(?:
              no[ ]mailbox[ ]here[ ]by[ ]that[ ]name
             |[ ]does[ ]not[ ]like[ ]recipient[.]
             )
           }x,
           # error_str.c:192|  X(EDQUOT,"disk quota exceeded")
-          'mailboxfull' => %r/disk[ ]quota[ ]exceeded/x,
+          mailboxfull: %r/disk[ ]quota[ ]exceeded/x,
           # qmail-qmtpd.c:233| ... result = "Dsorry, that message size exceeds my databytes limit (#5.3.4)";
           # qmail-smtpd.c:391| ... out("552 sorry, that message size exceeds my databytes limit (#5.3.4)\r\n"); return;
-          'mesgtoobig' => %r/Message[ ]size[ ]exceeds[ ]fixed[ ]maximum[ ]message[ ]size:/x,
+          mesgtoobig: %r/Message[ ]size[ ]exceeds[ ]fixed[ ]maximum[ ]message[ ]size:/x,
           # qmail-remote.c:68|  Sorry, I couldn't find any host by that name. (#4.1.2)\n"); zerodie();
           # qmail-remote.c:78|  Sorry, I couldn't find any host named ");
-          'hostunknown' => %r/\ASorry[,][ ]I[ ]couldn[']t[ ]find[ ]any[ ]host[ ]/x,
-          'systemerror' => %r{(?>
+          hostunknown: %r/\ASorry[,][ ]I[ ]couldn[']t[ ]find[ ]any[ ]host[ ]/x,
+          systemerror: %r{(?>
              bad[ ]interpreter:[ ]No[ ]such[ ]file[ ]or[ ]directory
             |system[ ]error
             |Unable[ ]to\b
             )
           }x,
-          'networkerror' => %r{Sorry(?:
+          networkerror: %r{Sorry(?:
              [,][ ]I[ ]wasn[']t[ ]able[ ]to[ ]establish[ ]an[ ]SMTP[ ]connection
             |[,][ ]I[ ]couldn[']t[ ]find[ ]a[ ]mail[ ]exchanger[ ]or[ ]IP[ ]address
             |[.][ ]Although[ ]I[']m[ ]listed[ ]as[ ]a[ ]best[-]preference[ ]MX[ ]
                 or[ ]A[ ]for[ ]that[ ]host
             )
           }x,
-          'systemfull' => %r/Requested action not taken: mailbox unavailable [(]not enough free space[)]/,
+          systemfull: %r/Requested action not taken: mailbox unavailable [(]not enough free space[)]/,
         }
         # qmail-send.c:922| ... (&dline[c],"I'm not going to try again; this message has been in the queue too long.\n")) nomem();
         ReDelayed  = %r/this[ ]message[ ]has[ ]been[ ]in[ ]the[ ]queue[ ]too[ ]long[.]\z/x
-
         Indicators = Sisimai::MTA.INDICATORS
-        LongFields = Sisimai::RFC5322.LONGFIELDS
-        RFC822Head = Sisimai::RFC5322.HEADERFIELDS
 
         def description; return 'qmail'; end
         def smtpagent;   return 'qmail'; end
@@ -153,11 +150,10 @@ module Sisimai
           match += 1 if mhead['received'].find { |a| a =~ Re0[:received] }
           return nil if match == 0
 
-          dscontents = []; dscontents << Sisimai::MTA.DELIVERYSTATUS
+          dscontents = [Sisimai::MTA.DELIVERYSTATUS]
           hasdivided = mbody.split("\n")
-          rfc822next = { 'from' => false, 'to' => false, 'subject' => false }
-          rfc822part = ''     # (String) message/rfc822-headers part
-          previousfn = ''     # (String) Previous field name
+          rfc822list = []     # (Array) Each line in message/rfc822 part string
+          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
           v = nil
@@ -166,7 +162,7 @@ module Sisimai
             if readcursor == 0
               # Beginning of the bounce message or delivery status part
               if e =~ Re1[:begin]
-                readcursor |= Indicators[:'deliverystatus']
+                readcursor |= Indicators[:deliverystatus]
                 next
               end
             end
@@ -181,30 +177,16 @@ module Sisimai
 
             if readcursor & Indicators[:'message-rfc822'] > 0
               # After "message/rfc822"
-              if cv = e.match(/\A([-0-9A-Za-z]+?)[:][ ]*.+\z/)
-                # Get required headers only
-                lhs = cv[1].downcase
-                previousfn = ''
-                next unless RFC822Head.key?(lhs)
-
-                previousfn  = lhs
-                rfc822part += e + "\n"
-
-              elsif e =~ /\A[ \t]+/
-                # Continued line from the previous line
-                next if rfc822next[previousfn]
-                rfc822part += e + "\n" if LongFields.key?(previousfn)
-
-              else
-                # Check the end of headers in rfc822 part
-                next unless LongFields.key?(previousfn)
-                next unless e.empty?
-                rfc822next[previousfn] = true
+              if e.empty?
+                blanklines += 1
+                break if blanklines > 1
+                next
               end
+              rfc822list << e
 
             else
               # Before "message/rfc822"
-              next if readcursor & Indicators[:'deliverystatus'] == 0
+              next if readcursor & Indicators[:deliverystatus] == 0
               next if e.empty?
 
               # <kijitora@example.jp>:
@@ -243,16 +225,7 @@ module Sisimai
           require 'sisimai/smtp/status'
 
           dscontents.map do |e|
-            # Set default values if each value is empty.
-            e['agent'] = Sisimai::MTA::Qmail.smtpagent
-
-            if mhead['received'].size > 0
-              # Get localhost and remote host name from Received header.
-              r0 = mhead['received']
-              %w|lhost rhost|.each { |a| e[a] ||= '' }
-              e['lhost'] = Sisimai::RFC5322.received(r0[0]).shift if e['lhost'].empty?
-              e['rhost'] = Sisimai::RFC5322.received(r0[-1]).pop  if e['rhost'].empty?
-            end
+            e['agent']     = Sisimai::MTA::Qmail.smtpagent
             e['diagnosis'] = Sisimai::String.sweep(e['diagnosis']) || ''
 
             unless e['command']
@@ -260,7 +233,7 @@ module Sisimai
               ReSMTP.each_key do |r|
                 # Verify each regular expression of SMTP commands
                 next unless e['diagnosis'] =~ ReSMTP[r]
-                e['command'] = r.upcase
+                e['command'] = r.to_s.upcase
                 break
               end
 
@@ -295,12 +268,12 @@ module Sisimai
                   if e['alterrors']
                     # Check the value of "alterrors"
                     next unless e['alterrors'] =~ ReFailure[r]
-                    e['reason'] = r
+                    e['reason'] = r.to_s
                   end
                   break if e['reason']
 
                   next unless e['diagnosis'] =~ ReFailure[r]
-                  e['reason'] = r
+                  e['reason'] = r.to_s
                   break
                 end
 
@@ -308,7 +281,7 @@ module Sisimai
                   ReLDAP.each_key do |r|
                     # Verify each regular expression of LDAP errors
                     next unless e['diagnosis'] =~ ReLDAP[r]
-                    e['reason'] = r
+                    e['reason'] = r.to_s
                     break
                   end
                 end
@@ -320,11 +293,10 @@ module Sisimai
             end
 
             e['status'] = Sisimai::SMTP::Status.find(e['diagnosis'])
-            e['spec']   = e['reason'] == 'mailererror' ? 'X-UNIX' : 'SMTP'
-            e['action'] = 'failed' if e['status'] =~ /\A[45]/
             e.each_key { |a| e[a] ||= '' }
           end
 
+          rfc822part = Sisimai::RFC5322.weedout(rfc822list)
           return { 'ds' => dscontents, 'rfc822' => rfc822part }
         end
 

data/lib/sisimai/mta/sendmail.rb

@@ -24,8 +24,6 @@ module Sisimai
           :endof   => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
         }
         Indicators = Sisimai::MTA.INDICATORS
-        LongFields = Sisimai::RFC5322.LONGFIELDS
-        RFC822Head = Sisimai::RFC5322.HEADERFIELDS
 
         def description; return 'V8Sendmail: /usr/sbin/sendmail'; end
         def smtpagent;   return 'Sendmail'; end
@@ -54,12 +52,11 @@ module Sisimai
             return nil unless mhead['from'] =~ Re0[:from]
           end
 
-          dscontents = []; dscontents << Sisimai::MTA.DELIVERYSTATUS
+          dscontents = [Sisimai::MTA.DELIVERYSTATUS]
           hasdivided = mbody.split("\n")
           havepassed = ['']
-          rfc822next = { 'from' => false, 'to' => false, 'subject' => false }
-          rfc822part = ''     # (String) message/rfc822-headers part
-          previousfn = ''     # (String) Previous field name
+          rfc822list = []     # (Array) Each line in message/rfc822 part string
+          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
           commandtxt = ''     # (String) SMTP Command name begin with the string '>>>'
@@ -75,12 +72,13 @@ module Sisimai
 
           hasdivided.each do |e|
             # Save the current line for the next loop
-            havepassed << e; p = havepassed[-2]
+            havepassed << e
+            p = havepassed[-2]
 
             if readcursor == 0
               # Beginning of the bounce message or delivery status part
               if e =~ Re1[:begin]
-                readcursor |= Indicators[:'deliverystatus']
+                readcursor |= Indicators[:deliverystatus]
                 next
               end
             end
@@ -95,30 +93,16 @@ module Sisimai
 
             if readcursor & Indicators[:'message-rfc822'] > 0
               # After "message/rfc822"
-              if cv = e.match(/\A([-0-9A-Za-z]+?)[:][ ]*.+\z/)
-                # Get required headers only
-                lhs = cv[1].downcase
-                previousfn = ''
-                next unless RFC822Head.key?(lhs)
-
-                previousfn  = lhs
-                rfc822part += e + "\n"
-
-              elsif e =~ /\A[ \t]+/
-                # Continued line from the previous line
-                next if rfc822next[previousfn]
-                rfc822part += e + "\n" if LongFields.key?(previousfn)
-
-              else
-                # Check the end of headers in rfc822 part
-                next unless LongFields.key?(previousfn)
-                next unless e.empty?
-                rfc822next[previousfn] = true
+              if e.empty?
+                blanklines += 1
+                break if blanklines > 1
+                next
               end
+              rfc822list << e
 
             else
               # Before "message/rfc822"
-              next if readcursor & Indicators[:'deliverystatus'] == 0
+              next if readcursor & Indicators[:deliverystatus] == 0
               next if e.empty?
 
               if connvalues == connheader.keys.size
@@ -255,7 +239,6 @@ module Sisimai
               end
             end
           end
-
           return nil if recipients == 0
           require 'sisimai/string'
 
@@ -263,15 +246,6 @@ module Sisimai
             # Set default values if each value is empty.
             connheader.each_key { |a| e[a] ||= connheader[a] || '' }
 
-            if mhead['received'].size > 0
-              # Get localhost and remote host name from Received header.
-              r0 = mhead['received']
-              %w|lhost rhost|.each { |a| e[a] ||= '' }
-              e['lhost'] = Sisimai::RFC5322.received(r0[0]).shift if e['lhost'].empty?
-              e['rhost'] = Sisimai::RFC5322.received(r0[-1]).pop  if e['rhost'].empty?
-            end
-
-            e['spec']    ||= 'SMTP'
             e['agent']     = Sisimai::MTA::Sendmail.smtpagent
             e['command'] ||= commandtxt
             if e['command'].empty?
@@ -308,6 +282,7 @@ module Sisimai
             e.each_key { |a| e[a] ||= '' }
           end
 
+          rfc822part = Sisimai::RFC5322.weedout(rfc822list)
           return { 'ds' => dscontents, 'rfc822' => rfc822part }
         end
 

data/lib/sisimai/mta/surfcontrol.rb

@@ -19,8 +19,6 @@ module Sisimai
           :endof  => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
         }
         Indicators = Sisimai::MTA.INDICATORS
-        LongFields = Sisimai::RFC5322.LONGFIELDS
-        RFC822Head = Sisimai::RFC5322.HEADERFIELDS
 
         def description; return 'WebSense SurfControl'; end
         def smtpagent;   return 'SurfControl'; end
@@ -48,24 +46,24 @@ module Sisimai
           return nil unless mhead['x-mailer']
           return nil unless mhead['x-mailer'] =~ Re0[:'x-mailer']
 
-          dscontents = []; dscontents << Sisimai::MTA.DELIVERYSTATUS
+          dscontents = [Sisimai::MTA.DELIVERYSTATUS]
           hasdivided = mbody.split("\n")
-          havepassed = [''];
-          rfc822next = { 'from' => false, 'to' => false, 'subject' => false }
-          rfc822part = ''     # (String) message/rfc822-headers part
-          previousfn = ''     # (String) Previous field name
+          havepassed = ['']
+          rfc822list = []     # (Array) Each line in message/rfc822 part string
+          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
           v = nil
 
           hasdivided.each do |e|
             # Save the current line for the next loop
-            havepassed << e; p = havepassed[-2]
+            havepassed << e
+            p = havepassed[-2]
 
             if readcursor == 0
               # Beginning of the bounce message or delivery status part
               if e =~ Re1[:begin]
-                readcursor |= Indicators[:'deliverystatus']
+                readcursor |= Indicators[:deliverystatus]
                 next
               end
             end
@@ -80,30 +78,16 @@ module Sisimai
 
             if readcursor & Indicators[:'message-rfc822'] > 0
               # After "message/rfc822"
-              if cv = e.match(/\A([-0-9A-Za-z]+?)[:][ ]*.+\z/)
-                # Get required headers only
-                lhs = cv[1].downcase
-                previousfn = ''
-                next unless RFC822Head.key?(lhs)
-
-                previousfn  = lhs
-                rfc822part += e + "\n"
-
-              elsif e =~ /\A[ \t]+/
-                # Continued line from the previous line
-                next if rfc822next[previousfn]
-                rfc822part += e + "\n" if LongFields.key?(previousfn)
-
-              else
-                # Check the end of headers in rfc822 part
-                next unless LongFields.key?(previousfn)
-                next unless e.empty?
-                rfc822next[previousfn] = true
+              if e.empty?
+                blanklines += 1
+                break if blanklines > 1
+                next
               end
+              rfc822list << e
 
             else
               # Before "message/rfc822"
-              next if readcursor & Indicators[:'deliverystatus'] == 0
+              next if readcursor & Indicators[:deliverystatus] == 0
               next if e.empty?
 
               # Your message could not be sent.
@@ -160,29 +144,16 @@ module Sisimai
               end
             end
           end
-
           return nil if recipients == 0
           require 'sisimai/string'
-          require 'sisimai/smtp/status'
 
           dscontents.map do |e|
-            e['agent'] = Sisimai::MTA::SurfControl.smtpagent
-
-            if mhead['received'].size > 0
-              # Get localhost and remote host name from Received header.
-              r0 = mhead['received']
-              %w|lhost rhost|.each { |a| e[a] ||= '' }
-              e['lhost'] = Sisimai::RFC5322.received(r0[0]).shift if e['lhost'].empty?
-              e['rhost'] = Sisimai::RFC5322.received(r0[-1]).pop  if e['rhost'].empty?
-            end
+            e['agent']     = Sisimai::MTA::SurfControl.smtpagent
             e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
-
-            e['status'] = Sisimai::SMTP::Status.find(e['diagnosis'])
-            e['spec']   = e['reason'] == 'mailererror' ? 'X-UNIX' : 'SMTP'
-            e['action'] = 'failed' if e['status'] =~ /\A[45]/
             e.each_key { |a| e[a] ||= '' }
           end
 
+          rfc822part = Sisimai::RFC5322.weedout(rfc822list)
           return { 'ds' => dscontents, 'rfc822' => rfc822part }
         end