esmtp.rb in ronin-0.1.3

- old
+ new

@@ -1,11 +1,11 @@
 #
 #--
 # Ronin - A ruby development platform designed for information security
 # and data exploration tasks.
 #
-# Copyright (c) 2006-2008 Hal Brodigan (postmodern.mod3 at gmail.com)
+# Copyright (c) 2006-2009 Hal Brodigan (postmodern.mod3 at gmail.com)
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
@@ -28,12 +28,12 @@
   module Sessions
     module ESMTP
       include Session
 
       setup_session do
-        parameter :esmtp_host, :description => 'ESMTP host'
-        parameter :esmtp_port, :description => 'ESMTP port'
+        parameter :host, :description => 'ESMTP host'
+        parameter :port, :description => 'ESMTP port'
 
         parameter :esmtp_login, :description => 'ESMTP login'
         parameter :esmtp_user, :description => 'ESMTP user'
         parameter :esmtp_password, :description => 'ESMTP password'
       end
@@ -43,19 +43,17 @@
       def esmtp_message(options={},&block)
         Network::SMTP.message(options,&block)
       end
 
       def esmtp_connect(options={},&block)
-        unless @esmtp_host
-          raise(ParamNotFound,"Missing parameter #{describe_param(:esmtp_host).dump}",caller)
-        end
+        require_params :host
 
-        options[:port] ||= @esmtp_port
+        options[:port] ||= @port
         options[:login] ||= @esmtp_login
         options[:user] ||= @esmtp_user
         options[:password] ||= @esmtp_password
 
-        return ::Net.esmtp_connect(@esmtp_host,options,&block)
+        return ::Net.esmtp_connect(@host,options,&block)
       end
 
       def esmtp_session(options={},&block)
         esmtp_connect(options) do |sess|
           block.call(sess) if block