sisimai 4.25.2-java → 4.25.8-java

data/lib/sisimai/lhost/verizon.rb

@@ -0,0 +1,164 @@
+module Sisimai::Lhost
+  # Sisimai::Lhost::Verizon parses a bounce email which created by
+  # Verizon Wireless.
+  # Methods in the module are called from only Sisimai::Message.
+  module Verizon
+    class << self
+      # Imported from p5-Sisimail/lib/Sisimai/Lhost/Verizon.pm
+      require 'sisimai/lhost'
+      Indicators = Sisimai::Lhost.INDICATORS
+
+      # Parse bounce messages from Verizon
+      # @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 = -1
+        while true
+          # Check the value of "From" header
+          # :'subject' => %r/Undeliverable Message/,
+          break unless mhead['received'].any? { |a| a.include?('.vtext.com (') }
+          match = 1 if mhead['from'] == 'post_master@vtext.com'
+          match = 0 if mhead['from'] =~ /[<]?sysadmin[@].+[.]vzwpix[.]com[>]?\z/
+          break
+        end
+        return nil if match < 0
+
+        dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
+        rebackbone = /^__BOUNDARY_STRING_HERE__/
+        readcursor = 0      # (Integer) Points the current cursor position
+        recipients = 0      # (Integer) The number of 'Final-Recipient' header
+        senderaddr = ''     # (String) Sender address in the message body
+        subjecttxt = ''     # (String) Subject of the original message
+
+        markingsof = {}     # (Hash) Delimiter patterns
+        startingof = {}     # (Hash) Delimiter strings
+        messagesof = {}     # (Hash) Error message patterns
+        v = nil
+
+        if match == 1
+          # vtext.com
+          markingsof = { message: %r/\AError:[ \t]/ }
+          messagesof = {
+            # The attempted recipient address does not exist.
+            'userunknown' => ['550 - Requested action not taken: no such user here'],
+          }
+          boundary00 = Sisimai::MIME.boundary(mhead['content-type']) || ''
+          rebackbone = Regexp.new('^' << Regexp.escape('--' << boundary00 << '--')) unless boundary00.empty?
+          emailsteak = Sisimai::RFC5322.fillet(mbody, rebackbone)
+          bodyslices = emailsteak[0].split("\n")
+
+          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]
+              next
+            end
+            next if (readcursor & Indicators[:deliverystatus]) == 0
+            next if e.empty?
+
+            # Message details:
+            #   Subject: Test message
+            #   Sent date: Wed Jun 12 02:21:53 GMT 2013
+            #   MAIL FROM: *******@hg.example.com
+            #   RCPT TO: *****@vtext.com
+            v = dscontents[-1]
+            if cv = e.match(/\A[ \t]+RCPT TO: (.*)\z/)
+              if v['recipient']
+                # There are multiple recipient addresses in the message body.
+                dscontents << Sisimai::Lhost.DELIVERYSTATUS
+                v = dscontents[-1]
+              end
+
+              v['recipient'] = cv[1]
+              recipients += 1
+              next
+
+            elsif cv = e.match(/\A[ \t]+MAIL FROM:[ \t](.+)\z/)
+              #   MAIL FROM: *******@hg.example.com
+              senderaddr = cv[1] if senderaddr.empty?
+
+            elsif cv = e.match(/\A[ \t]+Subject:[ \t](.+)\z/)
+              #   Subject:
+              subjecttxt = cv[1] if subjecttxt.empty?
+            else
+              # 550 - Requested action not taken: no such user here
+              v['diagnosis'] = e if e =~ /\A(\d{3})[ \t][-][ \t](.*)\z/
+            end
+          end
+        else
+          # vzwpix.com
+          startingof = { message: ['Message could not be delivered to mobile'] }
+          messagesof = { 'userunknown' => ['No valid recipients for this MM'] }
+          boundary00 = Sisimai::MIME.boundary(mhead['content-type'])
+          rebackbone = Regexp.new('^' << Regexp.escape('--' << boundary00 << '--')) unless boundary00.empty?
+          emailsteak = Sisimai::RFC5322.fillet(mbody, rebackbone)
+          bodyslices = emailsteak[0].split("\n")
+
+          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.start_with?(startingof[:message][0])
+              next
+            end
+            next if (readcursor & Indicators[:deliverystatus]) == 0
+            next if e.empty?
+
+            # Original Message:
+            # From: kijitora <kijitora@example.jp>
+            # To: 0000000000@vzwpix.com
+            # Subject: test for bounce
+            # Date:  Wed, 20 Jun 2013 10:29:52 +0000
+            v = dscontents[-1]
+            if cv = e.match(/\ATo:[ \t]+(.*)\z/)
+              if v['recipient']
+                # There are multiple recipient addresses in the message body.
+                dscontents << Sisimai::Lhost.DELIVERYSTATUS
+                v = dscontents[-1]
+              end
+              v['recipient'] = Sisimai::Address.s3s4(cv[1])
+              recipients += 1
+              next
+
+            elsif cv = e.match(/\AFrom:[ \t](.+)\z/)
+              # From: kijitora <kijitora@example.jp>
+              senderaddr = Sisimai::Address.s3s4(cv[1]) if senderaddr.empty?
+
+            elsif cv = e.match(/\ASubject:[ \t](.+)\z/)
+              #   Subject:
+              subjecttxt = cv[1] if subjecttxt.empty?
+            else
+              # Message could not be delivered to mobile.
+              # Error: No valid recipients for this MM
+              v['diagnosis'] = e if e =~ /\AError:[ \t]+(.+)\z/
+            end
+          end
+        end
+        return nil unless recipients > 0
+
+        # Set the value of "MAIL FROM:" and "From:"
+        emailsteak[1] << ('From: ' << senderaddr << "\n") unless emailsteak[1] =~ /^From: /
+        emailsteak[1] << ('Subject: ' << subjecttxt << "\n") unless emailsteak[1] =~ /^Subject: /
+
+        dscontents.each do |e|
+          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
+          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
+            break
+          end
+        end
+
+        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
+      end
+      def description; return 'Verizon Wireless: https://www.verizonwireless.com'; end
+    end
+  end
+end
+

data/lib/sisimai/lhost/x1.rb

@@ -0,0 +1,78 @@
+module Sisimai::Lhost
+  # Sisimai::Lhost::X1 parses a bounce email which created by Unknown MTA #1.
+  # Methods in the module are called from only Sisimai::Message.
+  module X1
+    class << self
+      # Imported from p5-Sisimail/lib/Sisimai/Lhost/X1.pm
+      require 'sisimai/lhost'
+
+      Indicators = Sisimai::Lhost.INDICATORS
+      ReBackbone = %r|^Received: from \d+[.]\d+[.]\d+[.]\d|.freeze
+      MarkingsOf = { message: %r/\AThe original message was received at (.+)\z/ }.freeze
+
+      # Parse bounce messages from Unknown MTA #1
+      # @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 unless mhead['subject'].start_with?('Returned Mail: ')
+        return nil unless mhead['from'].start_with?('"Mail Deliver System" ')
+
+        dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
+        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
+        datestring = ''     # (String) Date string
+        v = nil
+
+        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]
+            next
+          end
+          next if (readcursor & Indicators[:deliverystatus]) == 0
+          next if e.empty?
+
+          # The original message was received at Thu, 29 Apr 2010 23:34:45 +0900 (JST)
+          # from shironeko@example.jp
+          #
+          # ---The following addresses had delivery errors---
+          #
+          # kijitora@example.co.jp [User unknown]
+          v = dscontents[-1]
+
+          if cv = e.match(/\A([^ ]+?[@][^ ]+?)[ ]+\[(.+)\]\z/)
+            # kijitora@example.co.jp [User unknown]
+            if v['recipient']
+              # There are multiple recipient addresses in the message body.
+              dscontents << Sisimai::Lhost.DELIVERYSTATUS
+              v = dscontents[-1]
+            end
+            v['recipient'] = cv[1]
+            v['diagnosis'] = cv[2]
+            recipients += 1
+
+          elsif cv = e.match(MarkingsOf[:message])
+            # The original message was received at Thu, 29 Apr 2010 23:34:45 +0900 (JST)
+            datestring = cv[1]
+          end
+        end
+        return nil unless recipients > 0
+
+        dscontents.each do |e|
+          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
+          e['date']      = datestring || ''
+        end
+
+        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
+      end
+      def description; return 'Unknown MTA #1'; end
+    end
+  end
+end
+

data/lib/sisimai/lhost/x2.rb

@@ -0,0 +1,71 @@
+module Sisimai::Lhost
+  # Sisimai::Lhost::X2 parses a bounce email which created by Unknown MTA #2.
+  # Methods in the module are called from only Sisimai::Message.
+  module X2
+    class << self
+      # Imported from p5-Sisimail/lib/Sisimai/Lhost/X2.pm
+      require 'sisimai/lhost'
+
+      Indicators = Sisimai::Lhost.INDICATORS
+      ReBackbone = %r|^--- Original message follows[.]|.freeze
+      StartingOf = { message: ['Unable to deliver message to the following address'] }.freeze
+
+      # Parse bounce messages from Unknown MTA #2
+      # @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 unless mhead['from'].include?('MAILER-DAEMON@')
+        return nil unless mhead['subject'] =~ %r/\A(?>Delivery failure|fail(?:ure|ed) delivery)/
+
+        dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
+        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
+        v = nil
+
+        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.start_with?(StartingOf[:message][0])
+            next
+          end
+          next if (readcursor & Indicators[:deliverystatus]) == 0
+          next if e.empty?
+
+          # Message from example.com.
+          # Unable to deliver message to the following address(es).
+          #
+          # <kijitora@example.com>:
+          # This user doesn't have a example.com account (kijitora@example.com) [0]
+          v = dscontents[-1]
+
+          if cv = e.match(/\A[<]([^ ]+[@][^ ]+)[>]:\z/)
+            # <kijitora@example.com>:
+            if v['recipient']
+              # There are multiple recipient addresses in the message body.
+              dscontents << Sisimai::Lhost.DELIVERYSTATUS
+              v = dscontents[-1]
+            end
+            v['recipient'] = cv[1]
+            recipients += 1
+          else
+            # This user doesn't have a example.com account (kijitora@example.com) [0]
+            v['diagnosis'] ||= ''
+            v['diagnosis'] << ' ' << e
+          end
+        end
+        return nil unless recipients > 0
+
+        dscontents.each { |e| e['diagnosis'] = Sisimai::String.sweep(e['diagnosis']) }
+        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
+      end
+      def description; return 'Unknown MTA #2'; end
+    end
+  end
+end
+

data/lib/sisimai/lhost/x3.rb

@@ -0,0 +1,92 @@
+module Sisimai::Lhost
+  # Sisimai::Lhost::X3 parses a bounce email which created by Unknown MTA #3.
+  # Methods in the module are called from only Sisimai::Message.
+  module X3
+    class << self
+      # Imported from p5-Sisimail/lib/Sisimai/Lhost/X3.pm
+      require 'sisimai/lhost'
+
+      Indicators = Sisimai::Lhost.INDICATORS
+      ReBackbone = %r|^Content-Type:[ ]message/rfc822|.freeze
+      StartingOf = { message: ['      This is an automatically generated Delivery Status Notification.'] }.freeze
+
+      # Parse bounce messages from Unknown MTA #3
+      # @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 unless mhead['subject'].start_with?('Delivery status notification')
+        return nil unless mhead['from'].start_with?('Mail Delivery System')
+
+        dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
+        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
+        v = nil
+
+        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.start_with?(StartingOf[:message][0])
+            next
+          end
+          next if (readcursor & Indicators[:deliverystatus]) == 0
+          next if e.empty?
+
+          # ============================================================================
+          #      This is an automatically generated Delivery Status Notification.
+          #
+          # Delivery to the following recipients failed permanently:
+          #
+          #   * kijitora@example.com
+          #
+          #
+          # ============================================================================
+          #                             Technical details:
+          #
+          # SMTP:RCPT host 192.0.2.8: 553 5.3.0 <kijitora@example.com>... No such user here
+          #
+          #
+          # ============================================================================
+          v = dscontents[-1]
+
+          if cv = e.match(/\A[ \t]+[*][ ]([^ ]+[@][^ ]+)\z/)
+            #   * kijitora@example.com
+            if v['recipient']
+              # There are multiple recipient addresses in the message body.
+              dscontents << Sisimai::Lhost.DELIVERYSTATUS
+              v = dscontents[-1]
+            end
+            v['recipient'] = cv[1]
+            recipients += 1
+          else
+            # Detect error message
+            if cv = e.match(/\ASMTP:([^ ]+)[ ](.+)\z/)
+              # SMTP:RCPT host 192.0.2.8: 553 5.3.0 <kijitora@example.com>... No such user here
+              v['command'] = cv[1].upcase
+              v['diagnosis'] = cv[2]
+
+            elsif cv = e.match(/\ARouting: (.+)/)
+              # Routing: Could not find a gateway for kijitora@example.co.jp
+              v['diagnosis'] = cv[1]
+            end
+          end
+        end
+        return nil unless recipients > 0
+
+        dscontents.each do |e|
+          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
+          e['status']    = Sisimai::SMTP::Status.find(e['diagnosis']) || ''
+        end
+
+        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
+      end
+      def description; return 'Unknown MTA #3'; end
+    end
+  end
+end
+

data/lib/sisimai/{bite/email → lhost}/x4.rb

@@ -1,17 +1,15 @@
-module Sisimai::Bite::Email
-  # Sisimai::Bite::Email::X4 parses a bounce email which created by some qmail
-  # clone.  Methods in the module are called from only Sisimai::Message.
+module Sisimai::Lhost
+  # Sisimai::Lhost::X4 parses a bounce email which created by some qmail clone.
+  # Methods in the module are called from only Sisimai::Message.
   module X4
     class << self
-      # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/X4.pm
+      # Imported from p5-Sisimail/lib/Sisimai/Lhost/X4.pm
       # MTA module for qmail clones
-      require 'sisimai/bite/email'
+      require 'sisimai/lhost'
 
-      Indicators = Sisimai::Bite::Email.INDICATORS
-      StartingOf = {
-        error:  ['Remote host said:'],
-        rfc822: ['--- Below this line is a copy of the message.', '--- Original message follows.'],
-      }.freeze
+      Indicators = Sisimai::Lhost.INDICATORS
+      ReBackbone = %r/^---[ ](?:Below this line is a copy of the message|Original message follows)[.]/.freeze
+      StartingOf = { error:  ['Remote host said:'] }.freeze
       MarkingsOf = {
         #  qmail-remote.c:248|    if (code >= 500) {
         #  qmail-remote.c:249|      out("h"); outhost(); out(" does not like recipient.\n");
@@ -119,24 +117,14 @@ module Sisimai::Bite::Email
         ],
       }.freeze
 
-      def description; return 'Unknown MTA #4'; end
-      def smtpagent;   return Sisimai::Bite.smtpagent(self); end
-      def headerlist;  return []; end
-
       # Parse bounce messages from Unknown MTA #4
-      # @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
-      def scan(mhead, mbody)
+      # @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)
         # Pre process email headers and the body part of the message which generated
-        # by qmail, see http://cr.yp.to/qmail.html
+        # by qmail, see https://cr.yp.to/qmail.html
         #   e.g.) Received: (qmail 12345 invoked for bounce); 29 Apr 2009 12:34:56 -0000
         #         Subject: failure notice
         tryto  = %r/\A[(]qmail[ ]+\d+[ ]+invoked[ ]+for[ ]+bounce[)]/
@@ -145,77 +133,55 @@ module Sisimai::Bite::Email
         match += 1 if mhead['received'].any? { |a| a =~ tryto }
         return nil unless match > 0
 
-        dscontents = [Sisimai::Bite.DELIVERYSTATUS]
-        hasdivided = mbody.split("\n")
-        rfc822list = []     # (Array) Each line in message/rfc822 part string
-        blanklines = 0      # (Integer) The number of blank lines
+        dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
+        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
         v = nil
 
-        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
-            if e =~ MarkingsOf[:message]
-              readcursor |= Indicators[:deliverystatus]
-              next
-            end
+            readcursor |= Indicators[:deliverystatus] if e =~ MarkingsOf[:message]
+            next
           end
+          next if (readcursor & Indicators[:deliverystatus]) == 0
+          next if e.empty?
 
-          if (readcursor & Indicators[:'message-rfc822']) == 0
-            # Beginning of the original message part
-            if e.start_with?(StartingOf[:rfc822][0], StartingOf[:rfc822][1])
-              readcursor |= Indicators[:'message-rfc822']
-              next
-            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?
+          # <kijitora@example.jp>:
+          # 192.0.2.153 does not like recipient.
+          # Remote host said: 550 5.1.1 <kijitora@example.jp>... User Unknown
+          # Giving up on 192.0.2.153.
+          v = dscontents[-1]
 
+          if cv = e.match(/\A(?:To[ ]*:)?[<](.+[@].+)[>]:[ ]*\z/)
             # <kijitora@example.jp>:
-            # 192.0.2.153 does not like recipient.
-            # Remote host said: 550 5.1.1 <kijitora@example.jp>... User Unknown
-            # Giving up on 192.0.2.153.
-            v = dscontents[-1]
-
-            if cv = e.match(/\A(?:To[ ]*:)?[<](.+[@].+)[>]:[ ]*\z/)
-              # <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'] = cv[1]
-              recipients += 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]
+            recipients += 1
 
-            elsif dscontents.size == recipients
-              # Append error message
-              next if e.empty?
-              v['diagnosis'] ||= ''
-              v['diagnosis'] << e + ' '
-              v['alterrors'] = e if e.start_with?(StartingOf[:error][0])
+          elsif dscontents.size == recipients
+            # Append error message
+            next if e.empty?
+            v['diagnosis'] ||= ''
+            v['diagnosis'] << e + ' '
+            v['alterrors'] = e if e.start_with?(StartingOf[:error][0])
 
-              next if v['rhost']
-              next unless cv = e.match(ReHost)
-              v['rhost'] = cv[1]
-            end
+            next if v['rhost']
+            next unless cv = e.match(ReHost)
+            v['rhost'] = cv[1]
           end
         end
         return nil unless recipients > 0
 
         dscontents.each do |e|
-          e['agent']     = self.smtpagent
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
 
           unless e['command']
@@ -277,13 +243,11 @@ module Sisimai::Bite::Email
               end
             end
           end
-          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 'Unknown MTA #4'; end
     end
   end
 end