gnms 2.1.0 → 2.1.1

data/lib/cmd_parse.rb

@@ -62,21 +62,22 @@ def get_system_infor()
 end
 
 #
-#	download mac manufacturer list
+# download mac manufacturer list
 #
 def get_mac_manufacturer_list()
-  puts "in get_mac_manufacturer_list"
-  if ! mac_manufacturer_list_exist?()
+  if !mac_manufacturer_list_exist?()
     ieee_addr="standards.ieee.org"
     ieee_url="/develop/regauth/oui/oui.txt"
     local_file_path="#{CONF_DIR}"
     local_file_name="oui.txt"
-    Net::HTTP.version_1_1
+    if RUBY_VERSION.match("^1\.8")
+      Net::HTTP.version_1_1
+    end
     tf=Tempfile.new(local_file_name)
     begin
       Net::HTTP.start(ieee_addr, 80) do |http|
         response,=http.get(ieee_url)
-        response.body.each do |str|
+        response.body.split("\n").each do |str|
           str.chomp
           if str.match('base\s16')
             #line syntax is 'XXXXXX     (base 16)            name'
@@ -87,7 +88,7 @@ def get_mac_manufacturer_list()
         end
       end
     rescue Exception => msg
-      print #{msg.backtrace.join("\n")},"\n"
+      $log.error(msg.backtrace.join("\n"))
       tf.close(true)
       return -1
     end
@@ -418,7 +419,7 @@ end
 #	verify if jmx ref threshold value is ok
 #
 def test_monitored_jmx(ip)
-	$log.error "cmd_parse test_monitored_jmx #{ip}"
+	$log.debug "cmd_parse test_monitored_jmx #{ip}"
 	if $host[ip] && ($host[ip].jmx_monitoring.size() > 0)
 		max_severity=UNKNOWN
 		begin
@@ -574,7 +575,7 @@ end
 #
 # Return all host seems to be up (responding to icmp) from a given range IP addr
 def range_remote_ping(ip_begin, ip_end)
-  puts "in range_remote_ping"
+  #puts "in range_remote_ping"
   result=[]
   if $config.nmap_path == ""
     return result

data/lib/config_global.rb

@@ -27,7 +27,7 @@ DEFAULT_SOUND_FILE = "Just beep"
 	attr_reader :default_width, :default_height, :default_map, :show_label, :noshow_fqdn, :show_tooltips, :confirm_delete, :confirm_quit, :log_level
 	attr_reader :read_community, :write_community, :snmp_version, :snmp_port, :snmp_timeout, :snmp_retry, :mail_server_addr, :mail_server_port, :sms_device, :im_login, :im_password, :irc_server, :irc_port, :irc_channel
 	attr_accessor :level
-	attr_reader :find_node_state, :find_node_delay, :mac_state, :mac_delay, :mac_lock, :mac_manufacturer, :syslog_mon, :syslog_port, :snmptrap_mon, :snmptrap_port, :snmptrap_community
+	attr_reader :active_find_node_state, :active_find_node_delay, :passive_find_node_state, :passive_find_node_delay, :mac_state, :mac_delay, :mac_lock, :mac_manufacturer, :syslog_mon, :syslog_port, :snmptrap_mon, :snmptrap_port, :snmptrap_community
 	attr_reader :node_resolving, :node_resolving_delay
 	attr_reader :port_mon, :port_mon_delay, :snmp_mon, :snmp_mon_delay, :wmi_mon, :wmi_mon_delay, :custom_mon, :custom_mon_delay, :jmx_mon, :jmx_mon_delay
 	attr_reader :ping_path, :nmap_path, :ssh_path, :telnet_path, :browser_path, :vncviewer_path, :rdesktop_path, :xterm_path, :nmblookup_path, :xprobe_path, :wmic_path
@@ -86,7 +86,7 @@ def read_config_yaml()
 	  	$log.fatal("Error reading configuration file #{GLOBAL_CONF_FILE}")
 		exit()
 	  end
-
+          begin
 	  @default_width = db["general"]["default_width"]
 	  @default_height =  db["general"]["default_height"]
 	  @default_map = db["general"]["default_map"]
@@ -130,8 +130,10 @@ def read_config_yaml()
 	  @sms_num_by_level = db["notification"]["sms_num"]
 	  @im_dest_by_level = db["notification"]["im_dest"]
 	  
-	  @find_node_state = db["scan"]["find_node"]["state"]
-	  @find_node_delay = db["scan"]["find_node"]["delay"]
+	  @active_find_node_state = db["scan"]["active_find_node"]["state"]
+	  @active_find_node_delay = db["scan"]["active_find_node"]["delay"]
+	  @passive_find_node_state = db["scan"]["passive_find_node"]["state"]
+	  @passive_find_node_delay = db["scan"]["passive_find_node"]["delay"]  
 	  @mac_state = db["scan"]["mac"]["state"]
 	  @mac_delay = db["scan"]["mac"]["delay"]
 	  @mac_lock = db["scan"]["mac"]["lock"]
@@ -172,6 +174,10 @@ def read_config_yaml()
  	  @label_bg = db["colors"]["label_bg"]	  
 	  @rgb = db["colors"]["rgb"]
 	  @image_path = db["colors"]["image_path"]
+	  rescue
+	          $log.error("Conf reset as issues found when loading configuration file at #{GLOBAL_CONF_FILE}")
+	  	  init_config_var()
+	  end
   else
 	  init_config_var()
   end
@@ -233,10 +239,14 @@ notification = {
 	}
 
 scan = {
-	'find_node' => {
-				'state' => @find_node_state,
-				'delay' => @find_node_delay.to_i,
+	'active_find_node' => {
+				'state' => @active_find_node_state,
+				'delay' => @active_find_node_delay.to_i,
 				},
+	'passive_find_node' => {
+				'state' => @passive_find_node_state,
+				'delay' => @passive_find_node_delay.to_i,
+				},				
 	'mac' => {
 			'state' => @mac_state,
 			'delay' => @mac_delay.to_i,
@@ -385,7 +395,8 @@ def initialize ()
 	@wmi_mon_delay = "60"
 	@custom_mon_delay = "60"
 	@jmx_mon_delay = "60"
-	@find_node_delay = "300"
+	@active_find_node_delay = "300"
+	@passive_find_node_delay = "300"	
 	@node_resolving = true
 	@node_resolving_delay = "120"
 	@mac_delay = "60"

data/lib/gui/config_window.rb

@@ -61,10 +61,14 @@ def save_config_yaml()
 	  }
 
   scan = {
-	  'find_node' => {
+	  'active_find_node' => {
 				  'state' => @button_bp.active?,
 				  'delay' => @entry_delay_bp.text.to_i,
 				  },
+	  'passive_find_node' => {
+				  'state' => @button_passive_fn.active?,
+				  'delay' => @entry_delay_passive_fn.text.to_i,
+				  },        
 	  'mac' => {
 			  'state' => @button_macf.active?,
 			  'delay' => @entry_delay_macf.text.to_i,
@@ -1020,26 +1024,25 @@ end
   vbox_frame.show
   frame = Gtk::Frame::new("Active")
   frame.border_width=10
-  #frame.set_size_request(200, 150)
   frame.show
   vbox_frame.add frame
   table = Gtk::Table.new(5,2,false)
   table.show
   frame.add table
 
-  #find hosts using broadcast ping, and if possible arp+lldp sniffing
+  #find nodes using broadcast ping, and port scanning
   @button_bp = Gtk::CheckButton.new "Find new nodes delay (in s)"
   @button_bp.set_size_request 10,-1
-  @button_bp.set_active @config.find_node_state
+  @button_bp.set_active @config.active_find_node_state
   @button_bp.show
 
   @entry_delay_bp = Gtk::Entry.new
   @entry_delay_bp.show
   @entry_delay_bp.set_size_request 5,-1
-  if @config.find_node_delay == "" || @config.find_node_delay == nil
+  if @config.active_find_node_delay == "" || @config.active_find_node_delay == nil
     @entry_delay_bp.set_text "300"
   else
-    @entry_delay_bp.set_text @config.find_node_delay.to_s
+    @entry_delay_bp.set_text @config.active_find_node_delay.to_s
   end
   @entry_delay_bp.set_sensitive @button_bp.active?
 
@@ -1087,8 +1090,8 @@ end
 	  @button_macm_dl = Gtk::Button.new("Download MAC manufacturer")
 		@button_macm_dl.signal_connect("clicked"){
 			Thread.start {
-				Gtk.thread_protect do
-					@button_macm_dl.label="Processing OUIs from IEEE"
+				@button_macm_dl.label="Processing OUIs from IEEE"
+        Gtk.thread_protect do
 					if get_mac_manufacturer_list() == 0
 	  					@button_macm.set_sensitive(true) unless !@button_macm
 	  					@button_macm.set_active @config.mac_manufacturer unless !@button_macm
@@ -1235,16 +1238,39 @@ end
   table.attach(@button_jmx,0,1,12,13)
   table.attach(@entry_delay_jmx,1,2,12,13)
 
-#passive monitoring
-
+  #passive monitoring
+  
   frame_passive = Gtk::Frame::new("Passive")
   frame_passive.border_width=10
   frame_passive.show
   vbox_frame.add frame_passive
-  table_passive = Gtk::Table.new(1,2,false)
+  table_passive = Gtk::Table.new(4,2,false)
   table_passive.show
   frame_passive.add table_passive
 
+  #find nodes using sniffing
+  @button_passive_fn = Gtk::CheckButton.new "Find new nodes delay (in s)"
+  @button_passive_fn.set_size_request 10,-1
+  @button_passive_fn.set_active @config.passive_find_node_state
+  @button_passive_fn.show
+
+  @entry_delay_passive_fn = Gtk::Entry.new
+  @entry_delay_passive_fn.show
+  @entry_delay_passive_fn.set_size_request 5,-1
+  if @config.passive_find_node_delay == "" || @config.passive_find_node_delay == nil
+    @entry_delay_passive_fn.set_text "300"
+  else
+    @entry_delay_passive_fn.set_text @config.passive_find_node_delay.to_s
+  end
+  @entry_delay_passive_fn.set_sensitive @button_passive_fn.active?
+
+  @button_passive_fn.signal_connect("toggled") {
+    @entry_delay_passive_fn.set_sensitive @button_passive_fn.active?
+  }
+
+  table_passive.attach(@button_passive_fn,0,1,0,1)
+  table_passive.attach(@entry_delay_passive_fn,1,2,0,1)  
+    
   @button_syslog_daemon = Gtk::CheckButton.new "Syslog server port"
   @button_syslog_daemon.set_active @config.syslog_mon
   @button_syslog_daemon.show
@@ -1264,8 +1290,8 @@ end
     @entry_syslog_daemon_port.set_sensitive @button_syslog_daemon.active?
   }
 
-  table_passive.attach(@button_syslog_daemon,0,1,0,1)
-  table_passive.attach(@entry_syslog_daemon_port,1,2,0,1)
+  table_passive.attach(@button_syslog_daemon,0,1,1,2)
+  table_passive.attach(@entry_syslog_daemon_port,1,2,1,2)
 
   @button_snmptrap_daemon = Gtk::CheckButton.new "SNMP Trap server port"
   @button_snmptrap_daemon.set_active @config.snmptrap_mon
@@ -1301,10 +1327,10 @@ end
     @entry_snmptrap_daemon_community.set_sensitive @button_snmptrap_daemon.active?
   }
 
-  table_passive.attach(@button_snmptrap_daemon,0,1,1,2)
-  table_passive.attach(@entry_snmptrap_daemon_port,1,2,1,2)
-  table_passive.attach(label_snmptrap_daemon_community,0,1,2,3)
-  table_passive.attach(@entry_snmptrap_daemon_community,1,2,2,3)
+  table_passive.attach(@button_snmptrap_daemon,0,1,2,3)
+  table_passive.attach(@entry_snmptrap_daemon_port,1,2,2,3)
+  table_passive.attach(label_snmptrap_daemon_community,0,1,3,4)
+  table_passive.attach(@entry_snmptrap_daemon_community,1,2,3,4)
 
 	hbox = Gtk::HBox.new(FALSE, 1)
 	hbox.add Gtk::Image.new(Gtk::Stock::EXECUTE, Gtk::IconSize::MENU)
@@ -1834,7 +1860,8 @@ button.signal_connect("clicked") do
   old_wmi_mon=@config.wmi_mon
   old_jmx_mon=@config.jmx_mon
   old_custom_mon=@config.custom_mon
-  old_ping_state=@config.find_node_state
+  old_active_find_node_state=@config.active_find_node_state
+  old_passive_find_node_state=@config.passive_find_node_state
   old_mac_state=@config.mac_state
   old_node_resolving=@config.node_resolving
   old_syslog_mon=@config.syslog_mon
@@ -1932,17 +1959,24 @@ button.signal_connect("clicked") do
 						del_monitoring_thread("JMX monitoring")
 					end
 				end	
-				if old_ping_state != @button_bp.active?
+				if old_active_find_node_state != @button_bp.active?
 					if @button_bp.active?
 						add_monitoring_thread("Local ping", t_find_local_segment_pinging())
-						add_monitoring_thread("Local sniffing", t_find_local_segment_sniffing())
 						add_monitoring_thread("Remote ping", t_find_remote_new_host())
 					else
 						del_monitoring_thread("Local ping")
-						del_monitoring_thread("Local sniffing")
 						del_monitoring_thread("Remote ping")
 					end
 				end
+        if old_passive_find_node_state != @button_passive_fn.active?
+          if @button_passive_fn.active?
+            add_monitoring_thread("Local sniffing", t_find_local_segment_sniffing())            
+	    add_monitoring_thread("SSDP query", t_find_ssdp_discovery())
+          else
+	    del_monitoring_thread("Local sniffing")
+            del_monitoring_thread("SSDP query")            
+          end
+        end
 				if old_mac_state != @button_macf.active?
 					if @button_macf.active?
 						add_monitoring_thread("Find mac",tmacip())

data/lib/gui/node_host_property.rb

@@ -45,7 +45,7 @@ end
 	 severity=nil
 	 
     addportwin=Gtk::Window.new
-
+    addportwin.set_icon("#{PIXMAP_PATH}/logo_icon.png")
 	 if mode
 		 if @treeview.selection.selected == nil
 			return
@@ -233,26 +233,26 @@ end
 	
 	end
 
-def add_monitored_snmp(mode=nil)
-	 oidref=nil
-	 operator=nil
-	 threshold=nil
-	 severity=nil
+  def add_monitored_snmp(mode=nil)
+    oidref=nil
+    operator=nil
+    threshold=nil
+    severity=nil
 
     addsnmpwin=Gtk::Window.new
-
-	 if mode
-		 if @snmpview.selection.selected == nil
-			return
-		 end
-		 title="Edit monitored SNMP OID"
-		 iter=@snmpview.selection.selected
-		 oidref=iter[1]
-		 operator=iter[2]
-	    threshold=iter[3]
-	    severity=iter[4]
-  	 else
-		 title="Add monitored SNMP OID"
+    addsnmpwin.set_icon("#{PIXMAP_PATH}/logo_icon.png")
+    if mode
+      if @snmpview.selection.selected == nil
+        return
+      end
+      title="Edit monitored SNMP OID"
+      iter=@snmpview.selection.selected
+      oidref=iter[1]
+      operator=iter[2]
+      threshold=iter[3]
+      severity=iter[4]
+    else
+      title="Add monitored SNMP OID"
     end
 
     addsnmpwin.set_title(title)
@@ -261,7 +261,7 @@ def add_monitored_snmp(mode=nil)
 
     addsnmpwin.signal_connect("key_press_event") {|w,e|
       if e.keyval == Gdk::Keyval::GDK_Escape
-			addsnmpwin.destroy
+        addsnmpwin.destroy
       end
     }
 
@@ -279,56 +279,56 @@ def add_monitored_snmp(mode=nil)
     table = Gtk::Table.new(4,2,false)
     table.show
 
-	 label_oidref = Gtk::Label.new "OID Ref"
+    label_oidref = Gtk::Label.new "OID Ref"
     label_oidref.show
-  	 entry_oidref = Gtk::ComboBox.new
-         OIDRef::get_oid_refs_name().each {|oid|
-            entry_oidref.append_text(oid)
-         }
-         if oidref
-            ind = OIDRef::get_oid_refs_name().index(oidref)
-            entry_oidref.set_active(ind) if ind
-         else
-            entry_oidref.set_active(0)
-         end
-	 entry_oidref.set_size_request(150,-1)
-	 entry_oidref.show
-	 bbox=Gtk::HButtonBox.new
-	 bbox.show
-	 bbox.add entry_oidref
+    entry_oidref = Gtk::ComboBox.new
+    OIDRef::get_oid_refs_name().each {|oid|
+      entry_oidref.append_text(oid)
+    }
+    if oidref
+      ind = OIDRef::get_oid_refs_name().index(oidref)
+      entry_oidref.set_active(ind) if ind
+    else
+      entry_oidref.set_active(0)
+    end
+    entry_oidref.set_size_request(150,-1)
+    entry_oidref.show
+    bbox=Gtk::HButtonBox.new
+    bbox.show
+    bbox.add entry_oidref
     table.attach(label_oidref,0,1,0,1)
     table.attach(bbox,1,2,0,1)
 
-	 label_operator = Gtk::Label.new "Operator"
+    label_operator = Gtk::Label.new "Operator"
     label_operator.show
-  	 entry_operator = Gtk::ComboBox.new
-         SnmpMonitoring::TESTOP.each {|ope|
-            entry_operator.append_text(ope)
-         }
-         if operator
-            ind = SnmpMonitoring::TESTOP.index(operator)
-            entry_operator.set_active(ind) if ind
-         else
-            entry_operator.set_active(0)
-         end
+    entry_operator = Gtk::ComboBox.new
+    SnmpMonitoring::TESTOP.each {|ope|
+      entry_operator.append_text(ope)
+    }
+    if operator
+      ind = SnmpMonitoring::TESTOP.index(operator)
+      entry_operator.set_active(ind) if ind
+    else
+      entry_operator.set_active(0)
+    end
 
-	 entry_operator.set_size_request(150,-1)
-	 entry_operator.show
-	 bbox=Gtk::HButtonBox.new
-	 bbox.show
-	 bbox.add entry_operator
+    entry_operator.set_size_request(150,-1)
+    entry_operator.show
+    bbox=Gtk::HButtonBox.new
+    bbox.show
+    bbox.add entry_operator
     table.attach(label_operator,0,1,1,2)
     table.attach(bbox,1,2,1,2)
 
-	 entry_threshold = Gtk::Entry.new
-	 entry_threshold.set_text(threshold) unless threshold==nil
+    entry_threshold = Gtk::Entry.new
+    entry_threshold.set_text(threshold) unless threshold==nil
     label_threshold = Gtk::Label.new "Threshold"
-	 label_threshold.show
-	 entry_threshold.set_size_request(150,-1)
-	 entry_threshold.show
-	 bbox=Gtk::HButtonBox.new
-	 bbox.show
-	 bbox.add entry_threshold
+    label_threshold.show
+    entry_threshold.set_size_request(150,-1)
+    entry_threshold.show
+    bbox=Gtk::HButtonBox.new
+    bbox.show
+    bbox.add entry_threshold
     table.attach(label_threshold,0,1,2,3)
     table.attach(bbox,1,2,2,3)
 
@@ -338,109 +338,109 @@ def add_monitored_snmp(mode=nil)
     $status[0..3].each {|sev|
       entry_sev.append_text(sev)
     }
-   entry_sev.signal_connect("changed") {
-     entry_sev.child.set_background_gdk(@color_style[entry_sev.active])
-   }
-   ind = 0
-   if severity
+    entry_sev.signal_connect("changed") {
+      entry_sev.child.set_background_gdk(@color_style[entry_sev.active])
+    }
+    ind = 0
+    if severity
       ind = $status[0..3].index(severity)
       entry_sev.set_active(ind) if ind
-   else
-      entry_sev.set_active(ind)            
-   end
-   entry_sev.child.set_background_gdk(@color_style[ind])
-  
-   entry_sev.set_size_request(150,-1)
-   entry_sev.show
-	 bbox=Gtk::HButtonBox.new
-	 bbox.show
-	 bbox.add entry_sev
+    else
+      entry_sev.set_active(ind)
+    end
+    entry_sev.child.set_background_gdk(@color_style[ind])
+
+    entry_sev.set_size_request(150,-1)
+    entry_sev.show
+    bbox=Gtk::HButtonBox.new
+    bbox.show
+    bbox.add entry_sev
     table.attach(label_sev,0,1,3,4)
     table.attach(bbox,1,2,3,4)
 
     ok_button = Gtk::Button.new(Gtk::Stock::OK)
     ok_button.show
     ok_button.signal_connect("clicked") {
-		if mode
-			#here we just modify this service
-			iter=@snmpview.selection.selected
-			iter[1] = entry_oidref.active_text
-			iter[2] = entry_operator.active_text
-			iter[3] = entry_threshold.text
-			iter[4] = entry_sev.active_text
-     		addsnmpwin.destroy()
-		else
-			if isInteger(entry_threshold.text)
-					#need to test if already exists
-					error_detected=0
-					@snmpview.model.each {|model, path, iter|
-						if "#{iter[1]}" == "#{entry_oidref.active_text}"
-							error_detected=1
-							break
-						end
-				 	}
-					if error_detected == 0
-					  iter=@snmpview.model.append
-					  iter[0] = 1
-					  iter[1] = entry_oidref.active_text
-					  iter[2] = entry_operator.active_text
-					  iter[3] = entry_threshold.text
-					  iter[4] = entry_sev.active_text
-      			  addsnmpwin.destroy()
-					else
-						 errorEntry(addsnmpwin, "OID Ref already set")
-					end
-			else
-				 errorEntry(addsnmpwin, "Threshold #{entry_threshold.text} need to be an integer")
-			end
-		end
+      if mode
+        #here we just modify this service
+        iter=@snmpview.selection.selected
+        iter[1] = entry_oidref.active_text
+        iter[2] = entry_operator.active_text
+        iter[3] = entry_threshold.text
+        iter[4] = entry_sev.active_text
+        addsnmpwin.destroy()
+      else
+        if isInteger(entry_threshold.text)
+          #need to test if already exists
+          error_detected=0
+          @snmpview.model.each {|model, path, iter|
+            if "#{iter[1]}" == "#{entry_oidref.active_text}"
+              error_detected=1
+              break
+            end
+          }
+          if error_detected == 0
+            iter=@snmpview.model.append
+            iter[0] = 1
+            iter[1] = entry_oidref.active_text
+            iter[2] = entry_operator.active_text
+            iter[3] = entry_threshold.text
+            iter[4] = entry_sev.active_text
+            addsnmpwin.destroy()
+          else
+            errorEntry(addsnmpwin, "OID Ref already set")
+          end
+        else
+          errorEntry(addsnmpwin, "Threshold #{entry_threshold.text} need to be an integer")
+        end
+      end
     }
 
     cancel_button = Gtk::Button.new(Gtk::Stock::CANCEL)
     cancel_button.show
     cancel_button.signal_connect("clicked") {
-  	    addsnmpwin.destroy 
+      addsnmpwin.destroy
     }
 
-	 bbox =Gtk::HBox::new(FALSE, 10)
-	 bbox.border_width=10
-	 bbox.show
+    bbox =Gtk::HBox::new(FALSE, 10)
+    bbox.border_width=10
+    bbox.show
 
-	 ok_button.set_flags(Gtk::Widget::CAN_DEFAULT)
-	 bbox.pack_start(ok_button, TRUE, TRUE, 0)
-	 cancel_button.set_flags(Gtk::Widget::CAN_DEFAULT)
-	 bbox.pack_start(cancel_button, TRUE, TRUE, 0)
+    ok_button.set_flags(Gtk::Widget::CAN_DEFAULT)
+    bbox.pack_start(ok_button, TRUE, TRUE, 0)
+    cancel_button.set_flags(Gtk::Widget::CAN_DEFAULT)
+    bbox.pack_start(cancel_button, TRUE, TRUE, 0)
 
-	 vbox.add(table)
-	 separator = Gtk::HSeparator::new()
-	 separator.show
-	 vbox_root.pack_start(separator, FALSE, TRUE, 0)
-	 vbox_root.pack_start(bbox, FALSE, TRUE, 0)
+    vbox.add(table)
+    separator = Gtk::HSeparator::new()
+    separator.show
+    vbox_root.pack_start(separator, FALSE, TRUE, 0)
+    vbox_root.pack_start(bbox, FALSE, TRUE, 0)
 
     addsnmpwin.show
-end
+  end
 
 
-def add_monitored_wmi(mode=nil)
-	 wmiref=nil
-	 operator=nil
-	 value=nil
-	 severity=nil
+  def add_monitored_wmi(mode=nil)
+    wmiref=nil
+    operator=nil
+    value=nil
+    severity=nil
 
     addwmiwin=Gtk::Window.new
-
-	 if mode
-		 if @wmiview.selection.selected == nil
-			return
-		 end
-		 title="Edit monitored WMI Ref"
-		 iter=@wmiview.selection.selected
-		 wmiref=iter[1]
-		 operator=iter[2]
-	    value=iter[3]
-	    severity=iter[4]
-  	 else
-		 title="Add monitored WMI Ref"
+    addwmiwin.set_icon("#{PIXMAP_PATH}/logo_icon.png")
+    if mode
+      if @wmiview.selection.selected == nil
+        return
+      end
+      title="Edit monitored WMI Ref"
+      iter=@wmiview.selection.selected
+      wmiref=iter[1]
+      operator=iter[2]
+      value=iter[3]
+      severity=iter[4]
+    else
+      title="Add monitored WMI Ref"
     end
 
     addwmiwin.set_title(title)
@@ -449,7 +449,7 @@ def add_monitored_wmi(mode=nil)
 
     addwmiwin.signal_connect("key_press_event") {|w,e|
       if e.keyval == Gdk::Keyval::GDK_Escape
-			addwmiwin.destroy
+        addwmiwin.destroy
       end
     }
 
@@ -471,13 +471,13 @@ def add_monitored_wmi(mode=nil)
     label_wmiref.show
     entry_wmiref = Gtk::ComboBox.new
     WMIRef::get_wmi_refs_name().each {|ref|
-            entry_wmiref.append_text(ref)
+      entry_wmiref.append_text(ref)
     }
     if wmiref
-       ind = WMIRef::get_wmi_refs_name().index(wmiref)
-       entry_wmiref.set_active(ind) if ind
+      ind = WMIRef::get_wmi_refs_name().index(wmiref)
+      entry_wmiref.set_active(ind) if ind
     else
-       entry_wmiref.set_active(0)
+      entry_wmiref.set_active(0)
     end
     entry_wmiref.set_size_request(150, -1)
     entry_wmiref.show
@@ -487,125 +487,125 @@ def add_monitored_wmi(mode=nil)
     table.attach(label_wmiref,0,1,0,1)
     table.attach(bbox,1,2,0,1)
 
-	 label_operator = Gtk::Label.new "Operator"
+    label_operator = Gtk::Label.new "Operator"
     label_operator.show
-  	 entry_operator = Gtk::ComboBox.new
-         WmiMonitoring::TESTOP.each {|ope|
-            entry_operator.append_text(ope)
-         }
-         if operator
-            ind = WmiMonitoring::TESTOP.index(operator)
-            entry_operator.set_active(ind) if ind
-         else
-            entry_operator.set_active(0)
-         end
+    entry_operator = Gtk::ComboBox.new
+    WmiMonitoring::TESTOP.each {|ope|
+      entry_operator.append_text(ope)
+    }
+    if operator
+      ind = WmiMonitoring::TESTOP.index(operator)
+      entry_operator.set_active(ind) if ind
+    else
+      entry_operator.set_active(0)
+    end
 
-	 entry_operator.set_size_request(150, -1)
-	 entry_operator.show
-	 bbox=Gtk::HButtonBox.new
-	 bbox.show
-	 bbox.add entry_operator
+    entry_operator.set_size_request(150, -1)
+    entry_operator.show
+    bbox=Gtk::HButtonBox.new
+    bbox.show
+    bbox.add entry_operator
     table.attach(label_operator,0,1,1,2)
     table.attach(bbox,1,2,1,2)
 
-	 entry_value = Gtk::Entry.new
-	 entry_value.set_text(value) unless value==nil
+    entry_value = Gtk::Entry.new
+    entry_value.set_text(value) unless value==nil
     label_value = Gtk::Label.new "Value"
-	 label_value.show
-	 entry_value.set_size_request(150, -1)
-	 entry_value.show
-	 bbox=Gtk::HButtonBox.new
-	 bbox.show
-	 bbox.add entry_value
+    label_value.show
+    entry_value.set_size_request(150, -1)
+    entry_value.show
+    bbox=Gtk::HButtonBox.new
+    bbox.show
+    bbox.add entry_value
     table.attach(label_value,0,1,2,3)
     table.attach(bbox,1,2,2,3)
 
-	 label_sev = Gtk::Label.new "Severity"
+    label_sev = Gtk::Label.new "Severity"
     label_sev.show
-  	 entry_sev = Gtk::ComboBox.new
-         $status[0..3].each {|sev|
-            entry_sev.append_text(sev)
-     }    
-   entry_sev.signal_connect("changed") {
-     entry_sev.child.set_background_gdk(@color_style[entry_sev.active])
-   }
-   ind = 0
-   if severity
+    entry_sev = Gtk::ComboBox.new
+    $status[0..3].each {|sev|
+      entry_sev.append_text(sev)
+    }
+    entry_sev.signal_connect("changed") {
+      entry_sev.child.set_background_gdk(@color_style[entry_sev.active])
+    }
+    ind = 0
+    if severity
       ind = $status[0..3].index(severity)
       entry_sev.set_active(ind) if ind
-   else
-      entry_sev.set_active(ind)            
-   end
-   entry_sev.child.set_background_gdk(@color_style[ind])        
-	 entry_sev.set_size_request(150, -1)
-	 entry_sev.show
-	 bbox=Gtk::HButtonBox.new
-	 bbox.show
-	 bbox.add entry_sev
+    else
+      entry_sev.set_active(ind)
+    end
+    entry_sev.child.set_background_gdk(@color_style[ind])
+    entry_sev.set_size_request(150, -1)
+    entry_sev.show
+    bbox=Gtk::HButtonBox.new
+    bbox.show
+    bbox.add entry_sev
     table.attach(label_sev,0,1,3,4)
     table.attach(bbox,1,2,3,4)
 
     ok_button = Gtk::Button.new(Gtk::Stock::OK)
     ok_button.show
     ok_button.signal_connect("clicked") {
-		if mode
-			#here we just modify this service
-			iter=@wmiview.selection.selected
-			iter[1] = entry_wmiref.active_text
-			iter[2] = entry_operator.active_text
-			iter[3] = entry_value.text
-			iter[4] = entry_sev.active_text
-     		addwmiwin.destroy()
-		else
-			if entry_value.text != ""
-				#need to test if already exists
-				error_detected=0
-				@wmiview.model.each {|model, path, iter|
-				if "#{iter[1]}" == "#{entry_wmiref.active_text}"
-					error_detected=1
-					break
-				end
-				}
-				if error_detected == 0
-					iter=@wmiview.model.append
-					iter[0] = 1
-					iter[1] = entry_wmiref.active_text
-					iter[2] = entry_operator.active_text
-					iter[3] = entry_value.text
-					iter[4] = entry_sev.active_text
-    					addwmiwin.destroy()
-				else
-					 errorEntry(addwmiwin, "WMI Ref already set")
-				end
-			else
-				errorEntry(addwmiwin, "WMI Ref, you must set a value")
-			end
-		end
+      if mode
+        #here we just modify this service
+        iter=@wmiview.selection.selected
+        iter[1] = entry_wmiref.active_text
+        iter[2] = entry_operator.active_text
+        iter[3] = entry_value.text
+        iter[4] = entry_sev.active_text
+        addwmiwin.destroy()
+      else
+        if entry_value.text != ""
+          #need to test if already exists
+          error_detected=0
+          @wmiview.model.each {|model, path, iter|
+            if "#{iter[1]}" == "#{entry_wmiref.active_text}"
+              error_detected=1
+              break
+            end
+          }
+          if error_detected == 0
+            iter=@wmiview.model.append
+            iter[0] = 1
+            iter[1] = entry_wmiref.active_text
+            iter[2] = entry_operator.active_text
+            iter[3] = entry_value.text
+            iter[4] = entry_sev.active_text
+            addwmiwin.destroy()
+          else
+            errorEntry(addwmiwin, "WMI Ref already set")
+          end
+        else
+          errorEntry(addwmiwin, "WMI Ref, you must set a value")
+        end
+      end
     }
 
     cancel_button = Gtk::Button.new(Gtk::Stock::CANCEL)
     cancel_button.show
     cancel_button.signal_connect("clicked") {
-  	    addwmiwin.destroy 
+      addwmiwin.destroy
     }
 
-	 bbox =Gtk::HBox::new(FALSE, 10)
-	 bbox.border_width=10
-	 bbox.show
+    bbox =Gtk::HBox::new(FALSE, 10)
+    bbox.border_width=10
+    bbox.show
 
-	 ok_button.set_flags(Gtk::Widget::CAN_DEFAULT)
-	 bbox.pack_start(ok_button, TRUE, TRUE, 0)
-	 cancel_button.set_flags(Gtk::Widget::CAN_DEFAULT)
-	 bbox.pack_start(cancel_button, TRUE, TRUE, 0)
+    ok_button.set_flags(Gtk::Widget::CAN_DEFAULT)
+    bbox.pack_start(ok_button, TRUE, TRUE, 0)
+    cancel_button.set_flags(Gtk::Widget::CAN_DEFAULT)
+    bbox.pack_start(cancel_button, TRUE, TRUE, 0)
 
-	 vbox.add(table)
-	 separator = Gtk::HSeparator::new()
-	 separator.show
-	 vbox_root.pack_start(separator, FALSE, TRUE, 0)
-	 vbox_root.pack_start(bbox, FALSE, TRUE, 0)
+    vbox.add(table)
+    separator = Gtk::HSeparator::new()
+    separator.show
+    vbox_root.pack_start(separator, FALSE, TRUE, 0)
+    vbox_root.pack_start(bbox, FALSE, TRUE, 0)
 
     addwmiwin.show
-end
+  end
 
 def add_monitored_jmx(node, mode=nil)
 	jmxref=nil
@@ -615,7 +615,7 @@ def add_monitored_jmx(node, mode=nil)
 	jmxattr_h=Hash.new
 
     addjmxwin=Gtk::Window.new
-
+    addjmxwin.set_icon("#{PIXMAP_PATH}/logo_icon.png")
 	 if mode
 		 if @jmxview.selection.selected == nil
 			return
@@ -1022,6 +1022,7 @@ def add_monitored_snmptrap(mode=nil)
     end
 
     addsnmptrapwin=Gtk::Window.new
+    addsnmptrapwin.set_icon("#{PIXMAP_PATH}/logo_icon.png")
     addsnmptrapwin.set_title(title)
     addsnmptrapwin.set_size_request(340, -1)
     addsnmptrapwin.set_modal(true)
@@ -1170,6 +1171,7 @@ def add_monitored_syslog(mode=nil)
   end
 
   addsyslogwin=Gtk::Window.new
+  addsyslogwin.set_icon("#{PIXMAP_PATH}/logo_icon.png")
   addsyslogwin.set_title(title)
   addsyslogwin.set_size_request(340, -1)
   addsyslogwin.set_modal(true)
@@ -1407,8 +1409,10 @@ def fill_port_list(node)
 	end
 end
 
-def scan_port_now(node)
-    
+#
+# scan all ports
+#
+def scan_ports_now(node)   
 	@scan_port_th=Thread.new {
 		labelwait=Gtk::Label.new("Waiting scanning ports ...")
 		labelwait.show
@@ -1425,6 +1429,28 @@ def scan_port_now(node)
  }
 end
 
+#
+# scan only one port
+#
+def scan_port_now(node)
+ if @treeview.selection.selected != nil
+   iter = @treeview.selection.selected
+   proto = iter[1]
+   port = iter[2]
+   msgbody = "#{proto.upcase}/#{port} seems down"
+   #check if port is up
+   if scan_port(node.ip, proto, port) == 1
+     msgbody = "#{proto.upcase}/#{port} seems up"
+   end
+   dialog = Gtk::MessageDialog.new(@window, Gtk::Dialog::MODAL,
+                    Gtk::MessageDialog::INFO,
+                    Gtk::MessageDialog::BUTTONS_OK,
+                    msgbody)
+   dialog.set_icon("#{PIXMAP_PATH}/logo_icon.png")
+   dialog.signal_connect('response') { dialog.destroy }
+   dialog.show
+ end
+end
 
 ###############################################################
   def initialize (node)
@@ -2634,13 +2660,20 @@ eval IO.read("#{GNMSLIB}"+'/gui/sub/account_frame.rb')
 	item_edit_serv.signal_connect("activate") { edit_monitored_service() }
 	menu_port.append(item_edit_serv)
 
-	scan_port_serv = Gtk::ImageMenuItem.new("Scan ports")
+	scan_port_serv = Gtk::ImageMenuItem.new("Test service")
  	image_scan_port_serv = Gtk::Image.new() 
- 	image_scan_port_serv.set_stock(Gtk::Stock::REFRESH) 
+ 	image_scan_port_serv.set_stock(Gtk::Stock::DIALOG_QUESTION) 
 	scan_port_serv.set_image(image_scan_port_serv)
 	scan_port_serv.signal_connect("activate") { scan_port_now(node) }
 	menu_port.append(scan_port_serv)
 
+	scan_ports_serv = Gtk::ImageMenuItem.new("Scan all ports")
+ 	image_scan_ports_serv = Gtk::Image.new() 
+ 	image_scan_ports_serv.set_stock(Gtk::Stock::REFRESH) 
+	scan_ports_serv.set_image(image_scan_ports_serv)
+	scan_ports_serv.signal_connect("activate") { scan_ports_now(node) }
+	menu_port.append(scan_ports_serv)
+
 	item_sw_serv = Gtk::MenuItem.new("Switch selection")
 	item_sw_serv.signal_connect("activate") { toggle_select_port() }
 	menu_port.append(item_sw_serv)
@@ -2657,15 +2690,16 @@ eval IO.read("#{GNMSLIB}"+'/gui/sub/account_frame.rb')
 		 if @treeview.selection.selected==nil 
 			 item_edit_serv.set_sensitive(false)
 			 item_del_serv.set_sensitive(false)
-
+			 scan_port_serv.set_sensitive(false)
 		 else
 			 item_edit_serv.set_sensitive(true)
 			 item_del_serv.set_sensitive(true)
+			 scan_port_serv.set_sensitive(true)
 		 end
 		 if $config.nmap_vers.to_f() == 0.0
-		   scan_port_serv.set_sensitive(false)
+		   scan_ports_serv.set_sensitive(false)
 		 else
-		   scan_port_serv.set_sensitive(true)
+		   scan_ports_serv.set_sensitive(true)
 		 end
    	 menu_port.popup(nil, nil, event.button, event.time)
 	  elsif (@treeview.selection.selected!=nil) && (event.event_type == Gdk::Event::BUTTON2_PRESS)