gnms 2.1.0.rc1 → 2.1.0.rc2

data/lib/external/ping/tcp.rb

@@ -0,0 +1,83 @@
+require File.join(File.dirname(__FILE__), 'ping')
+
+# The Net module serves as a namespace only.
+module Net
+
+  # With a TCP ping simply try to open a connection. If we are successful,
+  # assume success. In either case close the connection to be polite.
+  #
+  class Ping::TCP < Ping
+    @@service_check = false
+
+    # Returns whether or not Errno::ECONNREFUSED is considered a successful
+    # ping. The default is false.
+    # 
+    def self.service_check
+      @@service_check
+    end
+
+    # Sets whether or not an Errno::ECONNREFUSED should be considered a
+    # successful ping.
+    # 
+    def self.service_check=(bool)
+      unless bool.kind_of?(TrueClass) || bool.kind_of?(FalseClass)
+        raise ArgumentError, 'argument must be true or false'
+      end
+      @@service_check = bool
+    end
+
+    # This method attempts to ping a host and port using a TCPSocket with
+    # the host, port and timeout values passed in the constructor.  Returns
+    # true if successful, or false otherwise.
+    # 
+    # Note that, by default, an Errno::ECONNREFUSED return result will be
+    # considered a failed ping.  See the documentation for the
+    # Ping::TCP.service_check= method if you wish to change this behavior.
+    # 
+    def ping(host=@host)
+      super(host)
+
+      bool = false
+      tcp = nil
+      start_time = Time.now
+
+      begin
+        Timeout.timeout(@timeout){
+          begin
+            tcp = TCPSocket.new(host, @port)
+          rescue Errno::ECONNREFUSED => err
+            if @@service_check
+              bool = true
+            else
+              @exception = err
+            end
+          rescue Exception => err
+            @exception = err
+          else
+            bool = true
+          end
+        }
+      rescue Timeout::Error => err
+        @exception = err
+      ensure
+        tcp.close if tcp
+      end
+
+      # There is no duration if the ping failed
+      @duration = Time.now - start_time if bool
+
+      bool
+    end
+
+    alias ping? ping
+    alias pingecho ping
+      
+    # Class method aliases. DEPRECATED.
+    class << self
+      alias econnrefused service_check
+      alias econnrefused= service_check=
+      alias ecr service_check
+      alias ecr= service_check=         
+    end
+  end
+end

data/lib/external/ping/udp.rb

@@ -0,0 +1,125 @@
+require File.join(File.dirname(__FILE__), 'ping')
+
+# The Net module serves as a namespace only.
+module Net
+
+  # The Ping::UDP class encapsulates methods for UDP pings.
+  class Ping::UDP < Ping
+    @@service_check = true
+      
+    # Returns whether or not the connect behavior should enforce remote
+    # service availability as well as reachability. The default is true.
+    #
+    def self.service_check
+      @@service_check
+    end
+      
+    # Set whether or not the connect behavior should enforce remote
+    # service availability as well as reachability. If set to false
+    # then Errno::ECONNREFUSED or Errno::ECONNRESET will be considered
+    # a successful ping, meaning no actual data handshaking is required.
+    # By default, if either of those errors occurs it is considered a failed
+    # ping.
+    #
+    def self.service_check=(bool)
+      unless bool.kind_of?(TrueClass) || bool.kind_of?(FalseClass)
+        raise ArgumentError, 'argument must be true or false'
+      end
+      @@service_check = bool         
+    end
+      
+    # The maximum data size that can be sent in a UDP ping.
+    MAX_DATA = 64
+      
+    # The data to send to the remote host. By default this is 'ping'.
+    # This should be MAX_DATA size characters or less.
+    # 
+    attr_reader :data
+      
+    # Creates and returns a new Ping::UDP object.  This is effectively
+    # identical to its superclass constructor.
+    # 
+    def initialize(host=nil, port=nil, timeout=5)
+      @data = 'ping'
+
+      super(host, port, timeout)
+
+      @bind_host = nil
+      @bind_port = nil
+    end
+      
+    # Sets the data string sent to the remote host. This value cannot have
+    # a size greater than MAX_DATA.
+    # 
+    def data=(string)
+       if string.size > MAX_DATA
+         err = "cannot set data string larger than #{MAX_DATA} characters"
+         raise ArgumentError, err
+       end
+         
+       @data = string
+    end
+
+    # Associates the local end of the UDP connection with the given +host+
+    # and +port+. This is essentially a wrapper for UDPSocket#bind.
+    #
+    def bind(host, port)
+      @bind_host = host
+      @bind_port = port
+    end
+
+    # Sends a simple text string to the host and checks the return string. If
+    # the string sent and the string returned are a match then the ping was
+    # successful and true is returned. Otherwise, false is returned.
+    #
+    def ping(host = @host)
+      super(host)
+
+      bool  = false
+      udp   = UDPSocket.open
+      array = []
+
+      if @bind_host
+        udp.bind(@bind_host, @bind_port)
+      end
+
+      start_time = Time.now
+
+      begin
+        Timeout.timeout(@timeout){
+          udp.connect(host, @port)
+          udp.send(@data, 0)
+          array = udp.recvfrom(MAX_DATA)
+        }
+      rescue Errno::ECONNREFUSED, Errno::ECONNRESET => err
+        if @@service_check
+          @exception = err
+        else
+          bool = true
+        end
+      #
+      #gnms add this rescue
+      #
+      #
+      rescue Timeout::Error
+        bool = true
+      rescue Exception => err
+        @exception = err
+      else
+        if array[0] == @data
+          bool = true
+        end
+      ensure
+        udp.close if udp
+      end
+
+      # There is no duration if the ping failed
+      @duration = Time.now - start_time if bool
+
+      bool
+    end
+
+    alias ping? ping
+    alias pingecho ping
+  end
+end

data/lib/gnms.rb

@@ -188,6 +188,7 @@ end
 #
 def verify_system_conf()
 	ruby_cmd_version = RUBY_VERSION 
+        $log.info("Using Ruby version #{RUBY_VERSION}")
 	ruby_version="^1\.[89]"
 	if ruby_cmd_version.match(ruby_version)
 		if (defined? Gtk) and !Gtk.check_version(2,4,0)

data/lib/gui/about_window.rb

@@ -16,7 +16,7 @@ class AboutWindow
 	about.set_title "About GNMS"
 	about.resizable=false
 	about.window_position=Gtk::Window::POS_CENTER
-	icon_name="./pixmap/logo_icon.png"
+        icon_name="#{PIXMAP_PATH}/logo_icon.png"
 	Gtk::Window.set_default_icon(icon_name)
 	about.show
 

data/lib/gui/base_window.rb

@@ -485,13 +485,13 @@ node_network_icon_radio_actions=[
 		set_map_display_view_user_defined()
 		height=e.height
 		if !$canvas.fullscreen?()
-			height-=@main_bar.height_request
+			height -= @main_bar.height_request
 		else
 			#we need to store $win size!
 			$root_width=$win.window.geometry[2]
 			$root_height=$win.window.geometry[3]
 		end
-		$canvas.set_size(e.width,height)
+		$canvas.set_size(e.width, height)
    	false
     }
  
@@ -654,6 +654,8 @@ def new_map()
   if confirm_initdb_window()
     thread_stopping()
     save()
+    $event_win.clean
+    $event_win.filter_by_node()
     init_map()
     thread_starting()
   end

data/lib/gui/canvas_map.rb

@@ -21,6 +21,10 @@ class CanvasMap < Gtk::VBox
     end
   end
 
+  def bounds()
+    return @canvas.bounds
+  end
+
   #
   #	set the background image
   #
@@ -167,17 +171,39 @@ class CanvasMap < Gtk::VBox
         n.node_view.move_right()
       }
     when Gdk::Keyval::GDK_Up
-      #canvas.y1 = y - 10
-      #canvas.scroll_to(x, canvas.y1)      
-    when Gdk::Keyval::GDK_Down
-      #canvas.y1 = y + 10
-      #canvas.scroll_to(x, canvas.y1)
+      #canvas root group scroll_to or translate are pain in the ass to handle
+      #so we are just here moving each node one by one ...
+      if $map.nil?
+        $network[ROOTMAPADDR].node_view.move_up()
+      else
+	$network[$map].get_node().each_value {|node|
+          node.node_view.move_up()
+	}
+      end
+    when Gdk::Keyval::GDK_Down    
+      if $map.nil?
+        $network[ROOTMAPADDR].node_view.move_down()
+      else
+	$network[$map].get_node().each_value {|node|
+          node.node_view.move_down()
+	}
+      end
     when Gdk::Keyval::GDK_Left
-      #canvas.x1 = x - 10
-      #canvas.scroll_to(canvas.x1, y)
+      if $map.nil?
+        $network[ROOTMAPADDR].node_view.move_left()
+      else
+	$network[$map].get_node().each_value {|node|
+          node.node_view.move_left()
+	}
+      end
     when Gdk::Keyval::GDK_Right
-      #canvas.x1 = x + 10
-      #canvas.scroll_to(canvas.x1, y)
+      if $map.nil?
+        $network[ROOTMAPADDR].node_view.move_right()
+      else
+	$network[$map].get_node().each_value {|node|
+          node.node_view.move_right()
+	}
+      end
     when Gdk::Keyval::GDK_Page_Up
       set_map($network[$map].map) unless $map == nil
     when Gdk::Keyval::GDK_Page_Down
@@ -226,8 +252,9 @@ end
   def set_size(w, h)
     if @bg_image_enable && (@img != nil)
       @img.width = @canvas.x2 - @canvas.x1
-      @img.height = @canvas.y2 - @canvas.y1
+      @img.height = @canvas.y2 - @canvas.y1      
     end
+    @canvas.set_bounds(0, 0, get_map_width(), get_map_height()) if $win
   end
 
   def initialize()

data/lib/gui/config_window.rb

@@ -1,6 +1,7 @@
 class ConfigWindow
 
 	def initialize(cfg)
+	        @window = nil
 		@config=cfg
 		@old_sev_level=@config.level
 		@old_contact=nil
@@ -319,24 +320,25 @@ def ConfigWindow::contact_selection_window(alarm, contact_selected_array, contac
 	contact_window.show
 end
 
-
+def visible()
+  return @window.visible? if @window
+  return false  
+end
 
 #
 #	main config window will all the frames
 #
 def show()
-window = Gtk::Window.new(Gtk::Window::TOPLEVEL)
-window.set_title("Preference")
-window.set_size_request(580,560)
-window.border_width=0
-window.set_modal true
-window.resizable=false
-
-#window.set_allow_shrink true
-#window.set_allow_grow false
-window.signal_connect("key_press_event") {|w,e|
+  @window = Gtk::Window.new(Gtk::Window::TOPLEVEL)
+  @window.set_title("Preference")
+  @window.set_size_request(580,560)
+  @window.border_width=0
+  @window.set_modal true
+  @window.resizable=false
+
+  @window.signal_connect("key_press_event") {|w,e|
   if e.keyval == Gdk::Keyval::GDK_Escape
-	cancel_action(window)
+	cancel_action()
   end
 }
 
@@ -347,7 +349,7 @@ $contact.each_key {|id|
 } unless !$contact
 
 box1 = Gtk::VBox.new(FALSE, 0)
-window.add(box1)
+@window.add(box1)
 box1.show
 
 box2 = Gtk::VBox.new(FALSE, 10)
@@ -1109,7 +1111,7 @@ end
     @button_macm.set_sensitive @button_macf.active? unless !mac_manufacturer_list_exist?()
   }
 
-  @button_nr = Gtk::CheckButton.new "Node Resolving delay (in s)"
+  @button_nr = Gtk::CheckButton.new "Node resolving delay (in s)"
   @button_nr.set_active @config.node_resolving
   @button_nr.show
 
@@ -1135,12 +1137,8 @@ end
   table.attach(@button_nr,0,1,6,7)
   table.attach(@entry_delay_nr,1,2,6,7)
 
-  @button_pm = Gtk::CheckButton.new "Host/Port Monitoring delay (in s)"
-  if @config.nmap_path == ""
-  	@button_pm.set_active false
-  else
-  	@button_pm.set_active @config.port_mon
-  end
+  @button_pm = Gtk::CheckButton.new "Host/Port monitoring delay (in s)"
+  @button_pm.set_active @config.port_mon
   @button_pm.show
 
   @entry_delay_pm = Gtk::Entry.new
@@ -1162,9 +1160,7 @@ end
   end
 
   @button_pm.signal_connect("toggled") {
-  	if @config.nmap_path != ""
-	    @entry_delay_pm.set_sensitive @button_pm.active?
-	end
+    @entry_delay_pm.set_sensitive @button_pm.active?
   }
   table.attach(@button_pm,0,1,8,9)
   table.attach(@entry_delay_pm,1,2,8,9)
@@ -2096,18 +2092,19 @@ button.signal_connect("clicked") do
 					  $log.info("Thread autosave map already active")
 				  end
 			  end
-			  window.destroy
+			  @window.destroy
+			  @window = nil
 			else
-				errorEntry(window, "Bad auto save value need to be greater than 1")
+				errorEntry(@window, "Bad auto save value need to be greater than 1")
 			end
 			else
-				errorEntry(window, "Bad SNMP trap server port")
+				errorEntry(@window, "Bad SNMP trap server port")
 			end
 		else
-			errorEntry(window, "Bad Syslog server port")
+			errorEntry(@window, "Bad Syslog server port")
 		end
 	else
-		errorEntry(window, "Bad delay value")
+		errorEntry(@window, "Bad delay value")
 	end
 end
 
@@ -2118,18 +2115,18 @@ button.show
 
 button = Gtk::Button::new(Gtk::Stock::CANCEL)
 button.signal_connect("clicked") do
-	cancel_action(window)
+	cancel_action()
 end
 box2.pack_start(button, TRUE, TRUE, 0)
 button.set_flags(Gtk::Widget::CAN_DEFAULT);
 button.grab_default
 button.show
 
-window.show
+@window.show
 
 end
 
-def cancel_action(win)
+def cancel_action()
   #restore accounts
   contact_temp=$contact.dup
   $contact.clear  
@@ -2144,7 +2141,8 @@ def cancel_action(win)
   }
   
   if FileTest.exist?(GLOBAL_CONF_FILE)
-    win.destroy
+    @window.destroy
+    @window = nil
   end
 end