flowtag 2.1.0 → 2.1.1

data/bin/flowtag

@@ -30,7 +30,7 @@ require 'tk-double-slider'
 
 def select_cb(flows)
 	$flowtable.clear
-	$flowtable.addflows(flows.sort_by { |fl| fl[FlowDB::ST] })
+	$flowtable.addflows(flows.sort_by { |fl| fl[FlowTag::FlowDB::ST] })
 	$flowview.clear
 	$tag_entry.delete('@0','end')
 	$currflow = nil
@@ -88,19 +88,19 @@ def finish
 end
 if ARGV[0] == '-o'
 	outputdir = ARGV[1]
-	$fdb = FlowDB.new(ARGV[2],outputdir)
+	$fdb = FlowTag::FlowDB.new(ARGV[2],outputdir)
 else
-	$fdb = FlowDB.new(ARGV[0])
+	$fdb = FlowTag::FlowDB.new(ARGV[0])
 end
 pkt_min = byte_min = time_min = 2**32
 pkt_max = byte_max = time_max = 0
 $fdb.flows.each do |key,flow|
-	pkt_min = flow[FlowDB::PKTS] if flow[FlowDB::PKTS] < pkt_min
-	pkt_max = flow[FlowDB::PKTS] if flow[FlowDB::PKTS] > pkt_max
-	byte_min = flow[FlowDB::BYTES] if flow[FlowDB::BYTES] < byte_min
-	byte_max = flow[FlowDB::BYTES] if flow[FlowDB::BYTES] > byte_max
-	time_min = flow[FlowDB::ST] if flow[FlowDB::ST] < time_min
-	time_max = flow[FlowDB::ST] if flow[FlowDB::ST] > time_max
+	pkt_min = flow[FlowTag::FlowDB::PKTS] if flow[FlowTag::FlowDB::PKTS] < pkt_min
+	pkt_max = flow[FlowTag::FlowDB::PKTS] if flow[FlowTag::FlowDB::PKTS] > pkt_max
+	byte_min = flow[FlowTag::FlowDB::BYTES] if flow[FlowTag::FlowDB::BYTES] < byte_min
+	byte_max = flow[FlowTag::FlowDB::BYTES] if flow[FlowTag::FlowDB::BYTES] > byte_max
+	time_min = flow[FlowTag::FlowDB::ST] if flow[FlowTag::FlowDB::ST] < time_min
+	time_max = flow[FlowTag::FlowDB::ST] if flow[FlowTag::FlowDB::ST] > time_max
 end
 root = TkRoot.new() {
 	title "FlowTag v2.0"
@@ -129,7 +129,7 @@ right_bot_frame.grid(:row=>1,:column=>0,:sticky=>'news')
 tags_frame.grid(:row=>0,:column=>2,:sticky=>'new')
 
 # LEFT FRAME
-$flowtable = FlowTable.new(left_top_frame,$fdb.flows.values.sort_by { |fl| fl[FlowDB::ST] })
+$flowtable = FlowTag::FlowTable.new(left_top_frame,$fdb.flows.values.sort_by { |fl| fl[FlowTag::FlowDB::ST] })
 $flowtable.pack(:side=>'top',:expand=>1,:fill=>'both',:anchor=>'n')
 $flowtable.set_select_cb(proc { |idxs,flows| tableselect_cb(idxs,flows) })
 
@@ -163,10 +163,10 @@ end
 $tags_list.bind('<ListboxSelect>',proc { tag_select })
 
 # RIGHT FRAME
-$flowcanvas = FlowCanvas.new(right_top_frame,$fdb.flows.sort_by { |k,fl| fl[FlowDB::ST] })
-$timeslide = TkDoubleSlider.new(right_bot_frame, :min=>time_min, :max=>time_max, :low=>time_min, :high=>time_max, :snap => 300, :label=>'Time', :valuefmt => proc { |x| Time.at(x).strftime("%H:%M") }, :deltafmt => proc { |x| sprintf("%0.2f hours", (x/3600.0)) })
-$pktslide = TkDoubleSlider.new(right_bot_frame, :min=>1, :max=>pkt_max, :low=>1, :high=>pkt_max, :logbase => true, :snap => 1.0, :label=>'Packets')
-$byteslide = TkDoubleSlider.new(right_bot_frame, :min=>1, :max=>byte_max, :low=>1, :high=>byte_max, :logbase => true, :snap => 1.0, :label=>'Bytes')
+$flowcanvas = FlowTag::FlowCanvas.new(right_top_frame,$fdb.flows.sort_by { |k,fl| fl[FlowTag::FlowDB::ST] })
+$timeslide = Tk::DoubleSlider.new(right_bot_frame, :min=>time_min, :max=>time_max, :low=>time_min, :high=>time_max, :snap => 300, :label=>'Time', :valuefmt => proc { |x| Time.at(x).strftime("%H:%M") }, :deltafmt => proc { |x| sprintf("%0.2f hours", (x/3600.0)) })
+$pktslide = Tk::DoubleSlider.new(right_bot_frame, :min=>1, :max=>pkt_max, :low=>1, :high=>pkt_max, :logbase => true, :snap => 1.0, :label=>'Packets')
+$byteslide = Tk::DoubleSlider.new(right_bot_frame, :min=>1, :max=>byte_max, :low=>1, :high=>byte_max, :logbase => true, :snap => 1.0, :label=>'Bytes')
 $flowcanvas.pack
 $timeslide.pack(:side=>'top')
 $pktslide.pack

data/lib/flowtag/flowcanvas.rb

@@ -30,10 +30,10 @@ module FlowTag
 		end
 
 		def select_flow(sip,dip,sp,dp)
-			@pcp.set_tuple_state(@cflow,TK::ParallelCoordinates::STATE_NORMAL) if @cflow
+			@pcp.set_tuple_state(@cflow,Tk::ParallelCoordinates::STATE_NORMAL) if @cflow
 			key = dp.to_s+"|"+sip
 			@cflow = key
-			@pcp.set_tuple_state(key,TK::ParallelCoordinates::STATE_CURRENT)
+			@pcp.set_tuple_state(key,Tk::ParallelCoordinates::STATE_CURRENT)
 		end
 
 		def set_select_cb(callback)
@@ -64,9 +64,9 @@ module FlowTag
 					if fl[FlowDB::PKTS] < @pkt_low or fl[FlowDB::PKTS] > @pkt_high or 
 						fl[FlowDB::BYTES] < @byte_low or fl[FlowDB::BYTES] > @byte_high or 
 						fl[FlowDB::ST] < @time_low or fl[FlowDB::ST] > @time_high
-						@pcp.set_tuple_state(key,TK::ParallelCoordinates::STATE_FILTERED)
+						@pcp.set_tuple_state(key,Tk::ParallelCoordinates::STATE_FILTERED)
 					else
-						@pcp.set_tuple_state(key,TK::ParallelCoordinates::STATE_NORMAL)
+						@pcp.set_tuple_state(key,Tk::ParallelCoordinates::STATE_NORMAL)
 					end
 				end
 			end
@@ -102,7 +102,7 @@ module FlowTag
 					:list => hosts
 				}
 			]
-			@pcp = TK::ParallelCoordinates.new(parent, 500, 360, model)
+			@pcp = Tk::ParallelCoordinates.new(parent, 500, 360, model)
 			@pcp.set_select_cb( proc { |tuples| cb_select(tuples) } )
 			@flow_keys = {}
 			@pkt_low = @byte_low = @pkt_high = @byte_high = @time_high = 0
@@ -117,7 +117,7 @@ module FlowTag
 				@time_low = fl[FlowDB::ST] if fl[FlowDB::ST] < @time_low
 				@time_high = fl[FlowDB::ST] if fl[FlowDB::ST] > @time_high
 				next if skip
-				@pcp.addtuple(key,TK::ParallelCoordinates::STATE_NORMAL,[fl[FlowDB::DP],fl[FlowDB::SIP]])
+				@pcp.addtuple(key,Tk::ParallelCoordinates::STATE_NORMAL,[fl[FlowDB::DP],fl[FlowDB::SIP]])
 			end
 		end
 	end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: flowtag
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 2
   - 1
-  - 0
-  version: 2.1.0
+  - 1
+  version: 2.1.1
 platform: ruby
 authors: 
 - Chris Lee
@@ -37,7 +37,7 @@ cert_chain:
   6yhklP75
   -----END CERTIFICATE-----
 
-date: 2011-03-08 00:00:00 -05:00
+date: 2011-03-09 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 

metadata.gz.sig

@@ -1 +1,2 @@
-'mnN�V���&���KA� �6#ָ�(�g�6��Zj"�����1�Y��zq1�"�X,k����QK�nY��u�2����Ɏ6�o��fO%Z
���ȭC��"lX�_�I���Wbn=ϤO>K�t�o�"�B�n4?��B���g��`aD�Ͽ�P#��픳�2�<䷛��L�}��͟��������O-�/]���$���74a�eCXEq8V�-�`^
+yC)��NR$4jC����F�䐡 U*������#E6��i�X* k^쇌���FM��~~��#j��W4pJ�\X��Hh�Z%���1C=+��e�'��7T
+_l�ا��{Zf����i��Lp������8S��c"l9