gnms 2.1.0.rc1 → 2.1.0.rc2

data/lib/gui/debug_window.rb

@@ -13,7 +13,7 @@ class DebugWindow
     $debug_console_win.set_title "Debug console"
     $debug_console_win.resizable=false
     $debug_console_win.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)
 
     $debug_console_win.signal_connect("destroy") {

data/lib/gui/event_window.rb

@@ -232,14 +232,18 @@ def analyze_event()
    end
 end
 
+def clean()
+  @event_strings=[]
+  @filter_active=false
+  @filter_node=nil
+end
+
 def initialize()
 
   @statusbar=nil
   @in_statusbar = Mutex.new
   @list=nil
-  @event_strings=[]
-  @filter_active=false
-  @filter_node=nil
+  clean()
   
   #################################################
   #create thread to handle new events

data/lib/gui/help_window.rb

@@ -7,7 +7,7 @@ def help_window
   window = Gtk::Window.new
   window.set_size_request(500,300)
   window.set_title "Help"
-  icon_name="./pixmap/logo_icon.png"
+  icon_name="#{PIXMAP_PATH}/logo_icon.png"
   Gtk::Window.set_default_icon(icon_name)
   window.show
 

data/lib/gui/mib_browser.rb

@@ -198,7 +198,7 @@ class MibBrowser
 	frame.show
 	mibb.add frame
 	
-	icon_name="./pixmap/logo_icon.png"
+	icon_name="#{PIXMAP_PATH}/logo_icon.png"
 	if FileTest.exist?(icon_name)
 		Gtk::Window.set_default_icon(icon_name)
 	end

data/lib/gui/node_host_property.rb

@@ -2671,7 +2671,7 @@ eval IO.read("#{GNMSLIB}"+'/gui/sub/account_frame.rb')
   fill_port_list(node)
   fill_port_view(node)
 
-  if !($config.port_mon && $config.nmap_path != "")
+  if !$config.port_mon
 	 @treeview.set_sensitive false
 	 @treeview.show
 	 frame.set_label("This monitoring is disabled")
@@ -3496,7 +3496,7 @@ eval IO.read("#{GNMSLIB}"+'/gui/sub/account_frame.rb')
 
 	Thread.kill(@scan_port_th) unless @scan_port_th == nil
 	Gtk.thread_flush
-	if $config.port_mon && ($config.nmap_path != "")
+	if $config.port_mon
 	  #store services
 	  if defined?(@treeview)
 		  node.clear_service()

data/lib/gui/node_view.rb

@@ -122,9 +122,13 @@ class NodeView
   def reload_bg_text()
     to_size = get_node_size()
     siz = to_size + 3*@text.text.size
-    if siz > (@text.x2 - @text.x1)
+    xdiff = @text.x2 - @text.x1
+    if siz > xdiff
       @bg_text.width = siz
-    end    
+    else
+      @bg_text.width =  xdiff
+    end
+    @bg_text.width +=  5
     @bg_text.x = @text.x - @bg_text.width/2
     @bg_text.y = @icon.y + to_size + 5    
   end

data/lib/main.rb

@@ -269,7 +269,7 @@ def fill_ip_str(ip)
 end
 
 def get_map_width()
-  if $win.window != nil
+  if $win and $win.window != nil
     return $win.window.geometry[2]
   else
     return $root_width
@@ -277,7 +277,7 @@ def get_map_width()
 end
 
 def get_map_height()
-  if $win.window != nil
+  if $win and $win.window != nil
     return $win.window.geometry[3]
   else
     return $root_height
@@ -859,7 +859,7 @@ def set_map(mp=nil)
       if $config.nmap_path
         $config.nmap_vers=nmap_version()
         if $config.nmap_vers == nil
-          $log.warn("You should install NMAP version from http://www.insecure.org/nmap/ to access full features")
+          $log.warn("You should install NMAP version from http://www.insecure.org/nmap/ to access full scan features")
         else
           if  $config.nmap_vers.to_i() < 4
             $log.info("You should update NMAP to latest version from http://www.insecure.org/nmap/")
@@ -1032,6 +1032,7 @@ def set_map(mp=nil)
     def save_all_in_db()
        #save nodes
        set_busy()
+
        Thread.start {
 	  $host.each_key {|ip|
             $log.debug("Saving node host #{ip}")

data/lib/node_db.rb

@@ -27,6 +27,8 @@ def open_db(fic=SQLITE_DB)
         end
 	begin
 		$db = SQLite3::Database.new(fic)
+		$db.default_synchronous = 'off'
+		$db.synchronous = 'off'
 	rescue
 		$log.fatal("#{fic} database corrupted")
 		exit()
@@ -530,10 +532,10 @@ def db_add_account(ip, nodetype, accounts)
 			nodeaccountid=db_get_node_account_id(nodeid)
 	end
 	if nodeaccountid != 0
-		stmt2=$db.prepare("SELECT IFNULL(MAX(id),0)+1 AS cid FROM account")		
 		account_id = 1
+		stmt2=$db.prepare("SELECT IFNULL(MAX(id),0)+1 AS cid FROM account")		
 		rs = stmt2.execute
-		account_id =  rs.first.to_s.to_i
+		account_id =  rs.first.join("\t").to_s.to_i
 		stmt3=$db.prepare("INSERT INTO account VALUES (?, ?, ?, ?)")
 		stmt4=$db.prepare("INSERT INTO node_and_account VALUES (?, ?, ?)")
 	        $db.transaction

data/lib/node_listener.rb

@@ -517,68 +517,70 @@ def t_find_local_segment_sniffing()
         loop do
           cap.stream.each do |p|
             pkt = PacketFu::Packet.parse p
-            if pkt.is_arp?
-              #check if it's ethernet and arp reply
-              if pkt.arp_hw == 1 and pkt.arp_opcode == 2
-                ip_mac_t = Array.new
-                ip_mac_t.push([pkt.arp_saddr_ip, pkt.arp_saddr_mac])
-                ip_mac_t.push([pkt.arp_daddr_ip, pkt.arp_daddr_mac])
-                ip_mac_t.each {|ip, mac|
-                $log.debug("t_find_local_segment_sniffing: ARP reply founds ip=#{ip} mac=#{mac}")
-                if isValidIPv4(ip) and !exist_host(ip)
-                  if $network_map_always == 0
-                    choose_network_map(ip)
-                    while $network_map_result.nil?
-                      sleep(2)
+	    if $config.broadcast_ping_state and !$config.visible()
+              if pkt.is_arp?
+        	#check if it's ethernet and arp reply
+        	if pkt.arp_hw == 1 and pkt.arp_opcode == 2
+                  ip_mac_t = Array.new
+                  ip_mac_t.push([pkt.arp_saddr_ip, pkt.arp_saddr_mac])
+                  ip_mac_t.push([pkt.arp_daddr_ip, pkt.arp_daddr_mac])
+                  ip_mac_t.each {|ip, mac|
+                  $log.debug("t_find_local_segment_sniffing: ARP reply founds ip=#{ip} mac=#{mac}")
+                  if isValidIPv4(ip) and !exist_host(ip)
+                    if $network_map_always == 0
+                      choose_network_map(ip)
+                      while $network_map_result.nil?
+                	sleep(2)
+                      end
                     end
-                  end
-                  if !$network_map_result.nil? and !$network_map_result.empty?
-                    map = $network_map_result
-                    if $network.has_key?(map)
-                      addhostentry(ip, 24, map)
-                      sleep(2)
-                      if $host[ip]
-                        $host[ip].mac = mac
+                    if !$network_map_result.nil? and !$network_map_result.empty?
+                      map = $network_map_result
+                      if $network.has_key?(map)
+                	addhostentry(ip, 24, map)
+                	sleep(2)
+                	if $host[ip]
+                          $host[ip].mac = mac
+                	end
                       end
                     end
-                  end
-                  if $network_map_always == 0
-                    $network_map_result = nil
-                  end
-                end
-                }
-              end              
-            end
-            begin
-              if pkt.is_lldp?      
-                $log.debug("t_find_local_segment_sniffing: LLDP founds ip=#{pkt.lldp_address} mac=#{pkt.lldp_saddr_mac}")
-                if (pkt.lldp_address_type_readable == "IPv4") and isValidIPv4(pkt.lldp_address) and !exist_host(pkt.lldp_address)
-                  puts pkt.lldp_address
-                  if $network_map_always == 0
-                    choose_network_map(pkt.lldp_address)
-                    while $network_map_result.nil?
-                      sleep(2)
+                    if $network_map_always == 0
+                      $network_map_result = nil
                     end
                   end
-                  if !$network_map_result.nil? and !$network_map_result.empty?
-                    map = $network_map_result
-                    if $network.has_key?(map)
-                      addhostentry(pkt.lldp_address, 24, map)
-                      sleep(2)
-                      if $host[pkt.lldp_address]
-                        $host[pkt.lldp_address].mac = pkt.lldp_saddr_mac
-                        $host[pkt.lldp_address].name = pkt.lldp_system_name  
+                  }
+        	end              
+              end
+              begin
+        	if pkt.is_lldp?      
+                  $log.debug("t_find_local_segment_sniffing: LLDP founds ip=#{pkt.lldp_address} mac=#{pkt.lldp_saddr_mac}")
+                  if (pkt.lldp_address_type_readable == "IPv4") and isValidIPv4(pkt.lldp_address) and !exist_host(pkt.lldp_address)
+                    puts pkt.lldp_address
+                    if $network_map_always == 0
+                      choose_network_map(pkt.lldp_address)
+                      while $network_map_result.nil?
+                	sleep(2)
                       end
                     end
-                  end
-                  if $network_map_always == 0
-                    $network_map_result = nil
-                  end
-                end                
+                    if !$network_map_result.nil? and !$network_map_result.empty?
+                      map = $network_map_result
+                      if $network.has_key?(map)
+                	addhostentry(pkt.lldp_address, 24, map)
+                	sleep(2)
+                	if $host[pkt.lldp_address]
+                          $host[pkt.lldp_address].mac = pkt.lldp_saddr_mac
+                          $host[pkt.lldp_address].name = pkt.lldp_system_name  
+                	end
+                      end
+                    end
+                    if $network_map_always == 0
+                      $network_map_result = nil
+                    end
+                  end                
+        	end
+              rescue NoMethodError
+        	#current gem version does not support lldp patch i sent
               end
-            rescue NoMethodError
-              #current gem version does not support lldp patch i sent
-            end
+	    end
           end
         end
       }

data/plugins/PgsqlPercentConnectionMonitor.rb

@@ -3,7 +3,7 @@ require "#{GNMSLIB}"+'/monitor/custom_plugin'
 begin
 	require 'pg'
 rescue LoadError
-	$log.fatal("PgsqlPercentConnectionMonitor: you need to install ruby-pg library for ruby")
+	$log.fatal("PgsqlPercentConnectionMonitor: you need to install ruby-pg library")
 	$pg_lib_error=false
 	raise LoadError
 end

metadata

@@ -1,216 +1,210 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: gnms
-version: !ruby/object:Gem::Version
-  version: 2.1.0.rc1
+version: !ruby/object:Gem::Version 
+  hash: 769928891
   prerelease: 6
+  segments: 
+  - 2
+  - 1
+  - 0
+  - rc
+  - 2
+  version: 2.1.0.rc2
 platform: ruby
-authors:
+authors: 
 - David Maciejak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-03 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-01-16 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: facter
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: goocanvas
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: goocanvas
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: gdk_pixbuf2
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.1.7
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: gdk_pixbuf2
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.1.7
-- !ruby/object:Gem::Dependency
-  name: glib2
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 1
+        - 1
+        - 7
         version: 1.1.7
   type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: glib2
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.1.7
-- !ruby/object:Gem::Dependency
-  name: gtk2
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 1
+        - 1
+        - 7
         version: 1.1.7
   type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: gtk2
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 1
+        - 1
+        - 7
         version: 1.1.7
-- !ruby/object:Gem::Dependency
-  name: net-ssh
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :runtime
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: net-ssh
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: snmp
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: snmp
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: xmpp4r
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: xmpp4r
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: sqlite3
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pcaprub
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.11.3
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: pcaprub
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 53
+        segments: 
+        - 0
+        - 11
+        - 3
         version: 0.11.3
-- !ruby/object:Gem::Dependency
-  name: packetfu
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :runtime
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  name: packetfu
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: gruff
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id011
+- !ruby/object:Gem::Dependency 
+  name: gruff
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id012
 description: GNMS is a graphical tool used to monitor state of network elements
-email:
+email: 
 - david.maciejak@gmail.com
-executables:
+executables: 
 - gnms
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - LICENSE
 - README
 - gnms.gemspec
@@ -226,7 +220,6 @@ files:
 - pixmap/type/router.png
 - pixmap/type/device.png
 - pixmap/type/vm.png
-- pixmap/type/home.png
 - pixmap/type/switch.png
 - pixmap/os/sgi.xpm
 - pixmap/os/os2warp.gif
@@ -253,7 +246,6 @@ files:
 - pixmap/os/amiga.png
 - pixmap/bg/map_bg2.jpg
 - pixmap/bg/map_bg.jpg
-- pixmap/logo.jpg
 - sound/beep.wav
 - lib/contact.rb
 - lib/version.rb
@@ -297,8 +289,13 @@ files:
 - lib/monitor/custom_plugin.rb
 - lib/external/fog.rb
 - lib/external/jjmx.rb
+- lib/external/ping/icmp.rb
+- lib/external/ping/tcp.rb
+- lib/external/ping/udp.rb
+- lib/external/ping/ping.rb
 - lib/external/xmpp4r-simple.rb
 - lib/external/sms.rb
+- lib/external/ping.rb
 - lib/external/crypt/blowfish.rb
 - lib/external/crypt/cbc.rb
 - lib/external/crypt/blowfish-tables.rb
@@ -344,35 +341,47 @@ files:
 - plugins/DnsCheck.rb
 - plugins/TelnetCpuLoadMonitor.rb
 - plugins/SshFgtAvExpiredMonitor.rb
-- plugins/Defaultme.rb
 - plugins/FooMonitor.rb
 - plugins/PgsqlPercentConnectionMonitor.rb
 - plugins/MysqlShowStatusMonitor.rb
 - plugins/SshDiskMonitor.rb
 - plugins/SshCpuLoadMonitor.rb
 homepage: http://gnms.rubyforge.org/
-licenses:
+licenses: 
 - GPL-2.1
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 59
+      segments: 
+      - 1
+      - 8
+      - 6
       version: 1.8.6
-required_rubygems_version: !ruby/object:Gem::Requirement
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>'
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">"
+    - !ruby/object:Gem::Version 
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
       version: 1.3.1
 requirements: []
+
 rubyforge_project: gnms
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Gnome Network Management System
 test_files: []
+