trisulrp 1.2.3 → 1.2.4

data/lib/{trp.proto → trisulrp/trp.proto}

@@ -1,6 +1,6 @@
 // Trisul Remote Protocol (TRP) definition
 // Based on Google Protocol Buffers
-// (c) 2010, Unleash Networks
+// (c) 2010-11, Unleash Networks
 //
 package TRP;
 
@@ -124,6 +124,8 @@ message Message {
 					RESOURCE_ITEM_RESPONSE=47;
 					RESOURCE_GROUP_REQUEST=48;
 					RESOURCE_GROUP_RESPONSE=49;
+					KEY_LOOKUP_REQUEST=50;
+					KEY_LOOKUP_RESPONSE=51;
 	}
 
 	required Command	trp_command=1;
@@ -169,6 +171,8 @@ message Message {
 	optional ResourceItemResponse resource_item_response=46;
 	optional ResourceGroupRequest resource_group_request=47;
 	optional ResourceGroupResponse resource_group_response=48;
+	optional KeyLookupRequest key_lookup_request=49;
+	optional KeyLookupResponse key_lookup_response=50;
 }
 
 ///////////////////////////////
@@ -277,7 +281,8 @@ message FilteredDatagramResponse{
 	required TimeInterval 	time_interval=3;                
 	required int64 			num_datagrams=4;               
 	required int64 			num_bytes=5;      
-	required string			contents=6;
+	required string			sha1=6;
+	required bytes			contents=7;
 }
 
 //////////////////////////////////////////
@@ -298,7 +303,7 @@ message ControlledContextResponse{
 ///////////////////////////////////////
 // SearchkeysRequest
 message SearchKeysRequest{
-	optional int64 			context=1;                    
+	optional int64 			context=1[default=0];                    
 	required string 		counter_group=2;        
 	required string 		pattern=3;        
 	required int64 			maxitems=4;
@@ -315,7 +320,7 @@ message SearchKeysResponse{
 /////////////////////////////////////
 /// CounterGroupInfoRequest
 message CounterGroupInfoRequest{
-	optional int64 		   context=1;
+	optional int64 		   context=1[default=0];
     optional string 	   counter_group=2;
 }
 
@@ -329,34 +334,39 @@ message CounterGroupInfoResponse{
 /////////////////////////////////////
 // SessionItemRequest
 message SessionItemRequest{
-	optional int64 			context=1;            
-	required string 		session_group=2;
-	optional string 		session_key=3;
-	optional SessionID		session_id=4;
+	optional int64 			context=1[default=0];            
+	optional string 		session_group=2[default="{99A78737-4B41-4387-8F31-8077DB917336}"];
+	repeated string 		session_keys=3;
+	repeated SessionID		session_ids=4;
 }
 
 ////////////////////////////////////
 // SessionItemResponse
 message SessionItemResponse{
-	optional int64 			context=1;            
+	optional int64 			context=1[default=0];            
 	required string 		session_group=2;
-	optional string 		session_key=3;
-	optional SessionID		session_id=4;
-	optional string 		user_label=5;
-	required TimeInterval 	time_interval=6;
-	required int64 			state=7;
-	required int64 			az_bytes=8;
-	required int64 			za_bytes=9;
-	required KeyDetails     key1A=10;
-	required KeyDetails     key2A=11;
-	required KeyDetails     key1Z=12;
-	required KeyDetails     key2Z=13;
+
+	message Item {
+		optional string 		session_key=1;
+		optional SessionID		session_id=2;
+		optional string 		user_label=3;
+		required TimeInterval 	time_interval=4;
+		required int64 			state=5;
+		required int64 			az_bytes=6;
+		required int64 			za_bytes=7;
+		required KeyDetails     key1A=8;
+		required KeyDetails     key2A=9;
+		required KeyDetails     key1Z=10;
+		required KeyDetails     key2Z=11;
+	}
+
+	repeated Item			items=3;
 }
 
 //////////////////////////////////////////
 // BulkCounterItemRequest
 message BulkCounterItemRequest{
-	optional int64 			context=1;
+	optional int64 			context=1[default=0];
 	required string 		counter_group=2;
 	required int64 			meter=3;
 	required TimeInterval 	time_interval=4;
@@ -373,7 +383,7 @@ message BulkCounterItemResponse{
 ///////////////////////////////////////////
 /// TopperSnapshotRequest
 message TopperSnapshotRequest{
-	optional int64 			context=1;
+	optional int64 			context=1[default=0];
 	required string 		counter_group=2;
 	required int64 			meter=3;
 	required TimeInterval 	Time=4;
@@ -397,7 +407,7 @@ message TopperSnapshotResponse{
 /// UpdatekeysRequest
 /// Response = OKResponse or ErrorResponse
 message UpdateKeyRequest{
-	optional int64 			context=1;
+	optional int64 			context=1[default=0];
 	required string 		counter_group=2;
 	required string 		key=4;
 	required string 		label=5;
@@ -407,12 +417,12 @@ message UpdateKeyRequest{
 ///////////////////////////////////
 // KeySessionActivityrequest
 message KeySessionActivityRequest{
-	optional int64 			context=1;
-	required string 		session_group=2;
+	optional int64 			context=1[default=0];
+	optional string 		session_group=2[default="{99A78737-4B41-4387-8F31-8077DB917336}"];
 	required string 		key=3;
-	required int64 			maxitems=4;
-	required int64 			volume_filter=5;
-	required int64 			duration_filter=6;
+	optional int64 			maxitems=4[default=100];
+	optional int64 			volume_filter=5[default=0];
+	optional int64 			duration_filter=6[default=0];
 	required TimeInterval 	time_interval=7;
 }
 
@@ -427,8 +437,8 @@ message KeySessionActivityResponse{
 /////////////////////////////////////
 // SessionTrackerRequest
 message SessionTrackerRequest {
-	optional int64 			context=1;
-	required string 		session_group=2;
+	optional int64 			context=1[default=0];
+	optional string 		session_group=2[default="{99A78737-4B41-4387-8F31-8077DB917336}"];
 	required int64 			tracker_id=3 [default=1];
 	optional int64 			maxitems=4 [default=100];
 	required TimeInterval 	time_interval=5;
@@ -445,8 +455,8 @@ message SessionTrackerResponse{
 ///////////////////////////////////
 // SessionGroupRequest
 message SessionGroupRequest {
-	optional int64 			context=1;
-	required string 		session_group=2;
+	optional int64 			context=1[default=0];
+	optional string 		session_group=2[default="{99A78737-4B41-4387-8F31-8077DB917336}"];
 	optional int64 			tracker_id=3;
 	optional string 		key_filter=4;
 	optional int64			maxitems=5 [default=100];
@@ -487,33 +497,36 @@ message ServerStatsResponse{
 /////////////////////////////////////
 // AlertItemRequest
 message AlertItemRequest{
-	optional int64 			context=1;            
+	optional int64 			context=1[default=0];            
 	required string 		alert_group=2;
-	optional AlertID		alert_id=3;
+	repeated AlertID		alert_ids=3;
 }
 ////////////////////////////////////
 // AlertItemResponse
 message AlertItemResponse{
 	optional int64 			context=1;            
 	required string 		alert_group=2;
-	optional int64 			sensor_id=3;
-	required Timestamp	 	time=4;
-	optional string 		source_ip=5;
-	optional string	 		source_port=6;
-	optional string 		destination_ip=7;
-	optional string 		destination_port=8;
-	required string 		sigid=9;
-	required string 		classification=10;
-	required string 		priority=11;
-	required Timestamp 		dispatch_time=12;
-	required string 		aux_message1=13;
-	required string 		aux_message2=14;
+	message Item {
+		optional int64 			sensor_id=1;
+		required Timestamp	 	time=2;
+		optional string 		source_ip=3;
+		optional string	 		source_port=4;
+		optional string 		destination_ip=5;
+		optional string 		destination_port=6;
+		required string 		sigid=7;
+		required string 		classification=8;
+		required string 		priority=9;
+		required Timestamp 		dispatch_time=10;
+		required string 		aux_message1=11;
+		required string 		aux_message2=12;
+	}
+	repeated Item 			items=3;
 }
 
 ////////////////////////////////////
 // AlertGroupQueryRequest
 message AlertGroupRequest {
-	optional int64 			context=1;            
+	optional int64 			context=1[default=0];            
 	required string 		alert_group=2;
 	required TimeInterval	time_interval=3;
 	optional int64 			maxitems=5 [default=10];
@@ -539,7 +552,7 @@ message AlertGroupResponse {
 /////////////////////////////////////
 // ResourceRequest - mutliple 
 message ResourceItemRequest{
-	optional int64 			context=1;            
+	optional int64 			context=1[default=0];            
 	required string 		resource_group=2;
 	repeated ResourceID		resource_ids=3;
 }
@@ -564,7 +577,7 @@ message ResourceItemResponse{
 ////////////////////////////////////
 // ResourceGroupRequest
 message ResourceGroupRequest {
-	optional int64 			context=1;            
+	optional int64 			context=1[default=0];            
 	required string 		resource_group=2;
 	required TimeInterval	time_interval=3;
 	optional int64 			maxitems=4 [default=10];
@@ -583,3 +596,25 @@ message ResourceGroupResponse {
 	required string 		resource_group=2;
 	repeated ResourceID		resources=3;
 }
+
+
+
+/////////////////////////////////////////////
+// KeyLookup - mutliple keys from a single CG
+message KeyLookupRequest {
+	optional int64 			context=1[default=0];            
+	required string 		counter_group=2;
+	repeated string			keys=3;
+}
+
+
+/////////////////////////////////////////////
+// KeyLookup 
+message KeyLookupResponse {
+	optional int64 			context=1;            
+	required string 		counter_group=2;
+	repeated KeyDetails		key_details=3;
+}
+
+
+

data/lib/trisulrp.rb

@@ -1,15 +1,16 @@
 $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
-# =TRISUL TRP 
+# =TrisulRP - Trisul Remote Protocol 
 # #
 # # 
 # # Author:: Vivek Rajagopalan
 # # Date:: 30 Dec 2010
-
-module TRP
+module TrisulRP
 end
 
 require 'rubygems'
-require 'trplib.rb'
-require 'trp.pb'
+require 'trisulrp/trp.pb'
+require 'trisulrp/guids.rb'
+require 'trisulrp/keys.rb'
+require 'trisulrp/protocol.rb'

data/test/Demo_Client.key

@@ -1,18 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-Proc-Type: 4,ENCRYPTED
-DEK-Info: DES-EDE3-CBC,7E940EA047D15229
-
-09BdQhvn3kS2Toh8qUKVSf+VOTGNFqNqlg4jI0XjAvPvv+AlMFpkd4Sp5NFomJjZ
-PhPH9ShrJAeOZGI/LzC0wt3vBu4nADKWLAchJ393eRQOwQ2suMZVD9Kg6r6jmW+I
-1x7BN+ZnemaBLwmABM9LWdPSBlAqn3WurrrhrstWiv8oPs9ulY9kApwZohvMpM5W
-JW0JbfdPFoO2DIhYdNwLbfGMfbaXzFkUGXztWq5g7xPsDRqP29beiC8uT8Z7xk66
-Eluo9w2iNWC64KD3/wca59j5ljGs3l6O4PoyUfCcJ/rf57g08UWsYcr9seaU9aAV
-lkKkntXwphjXgt8YfArzDXMCZaaA1ZdxtDR9KG9I+IXBbEXq4LFSDcZZbfjk9UKy
-IT+IjFCxodFN6hkYZSFpAQWHDSj+VA5Jy64DoBLZZ+LMpwUObgidmhX2gLCjr8x8
-Ur6Pbi27HGB2ByNXzQFjjOyc3ZVHotDiab2KMjU9MvoyNSKvDNnqSzleSQlEz3uA
-hX0QJAncPnjT6Na2NGtWdP3i2BybIbHJCy9PHosSoWa/iqK8ZOohj2weuclzkNPS
-X7nbYBabRgsk+VyVksDEEIxOL9QSeWeXRd5u+E9tyA4/9k6bMn9meXIA8JJZbHqQ
-9whz5JBEivzaMUXuS3SuYAN0qs5H0CPkY3o/Zz2vwauPD5Sgj4yZ8g3LFfWYCUXj
-3FTQbUdPZLbymdgrto4XYt99Bdt0PbfVAAecjxGM5mlRsvw0tVkU6rn2F6PFJPtd
-OL8voxUdgGfXemPGokYhVnZfJF6ch9pqYPRO1seE3zg=
+MIICWwIBAAKBgQC3+D5b5aaHtuNdkavx42B0eNfnOVHBWV8pQuADttXwNu6Ujt82
+ApqjlSq446p+dYQ2ame4uMk9zDYlgPNkn3eK9zfB7Lq1KGphs1Qmp4lze0eN/GcA
+2jWRYh7KHTNUudIc6OLcmY4l3HveIefOo35oB63JOnFgbUXyNPJ3HDGKMQIDAQAB
+AoGAc9oxsv95EqgaoJcW1/ofiNl85VDUalVUtxA1MEGYknCVaBpc+I9FQNS0FcDR
+YlexDe+OJ+a+XFtYkd+V5v0BcwDlJhuyBRUQNFURUZL7XHaT6Ppj6Xmz00Y8zaxT
+5BIteHR3jCdkggCfOa0mG4QD4ax0J/FlMepbp7b4p7k5Au0CQQDomrmzVmIdS5Pl
+khGRRMk4OCdHDuOl/KFALJbGohuxRR5U3vggusgMb0BM51aRfhKq9+tmIpk0kCv4
++MRYBySbAkEAynk8MwO3Lr3n6pELYKj4LuX+TjJh9ZiWQIz9AydBkXOgeW325rMj
+0im+VtFJHqpIUlJVEHZucscxEB/w64yrIwJAUFUvkVpiJE/30i9yVcN14y6xkf74
+bFklr642nH9cJQsEALfI5jTb5j9965Fx+mmaNOXOrMWCN/8a0K/Jz8UXxQJAOYqE
+yja3G4iK3UXFRv4eMi3YvN5iqopnwQaQbRH991k19OyEa4HjnzmPx1qI/jcEgKi3
+VgtiTio/zkZVkIuUowJAUx0rfsJgMl1wIJhrKSPjLWcT12P2nZc3wgzS3IvHOc7j
+ANFiajPo3y0qV3AJHbSnz8FejOCDUHLttA5kvsF4dw==
 -----END RSA PRIVATE KEY-----

data/test/test_alerts.rb

@@ -0,0 +1,84 @@
+# Trisul Remote Protocol TRP Demo script
+# Akhil.M & Dhinesh.K (c) 2010 Unleash Networks
+# Testing change 
+require 'rubygems'
+
+require './helper'
+include TRPLib
+
+GUID_CG_APP       = "{C51B48D4-7876-479E-B0D9-BD9EFF03CE2E}" 
+
+AG_IDS   = "{9AFD8C08-07EB-47E0-BF05-28B4A7AE8DC9}"
+CG_SIGDS = "{A0FA9464-B496-4A20-A9AB-4D2D09AFF902}"
+
+CG_HOSTS = "{4CD742B1-C1CA-4708-BE78-0FCA2EB01A86}" 
+CG_APPS  = "{C51B48D4-7876-479E-B0D9-BD9EFF03CE2E}" 
+
+
+class TestTrisulrp < Test::Unit::TestCase
+
+	def setup
+		if @trp_conn.nil?
+		@trp_conn=TRPLib::connect_trp("127.0.0.1",
+									  12001,
+									  "Demo_Client.crt",
+									  "Demo_Client.key")
+		end
+	end
+
+
+	def test_query_alerts
+
+		target_ip = "0A.02.C7.EB"  # 10.2.199.235"
+		tm_arr = TRPLib::get_available_time(@trp_conn)
+
+		# The Request 
+		# ----------
+     	req =TRP::Message.new(:trp_command => TRP::Message::Command::ALERT_GROUP_REQUEST)
+     	req.alert_group_request =TRP::AlertGroupRequest.new( :context => 0, 
+														     :alert_group  => AG_IDS,
+															 :source_ip => target_ip,
+															 :maxitems  => 1000,
+															 :time_interval => TRPLib.mk_time_interval(tm_arr)
+														   )
+
+		# The Response
+		# ------------
+		get_trp_response(@trp_conn,req) do |resp|
+
+			follow_up = TRP::Message.new(:trp_command => TRP::Message::Command::ALERT_ITEM_REQUEST)
+			follow_up.alert_item_request = TRP::AlertItemRequest.new(:alert_group  => AG_IDS)
+			resp.alert_group_response.alerts.each do |al|
+				follow_up.alert_item_request.alert_ids << TRP::AlertID.new(:slice_id => al.slice_id, :alert_id => al.alert_id)
+			end
+
+			get_trp_response(@trp_conn,follow_up) do | resp2 |
+
+				  resp=resp2.alert_item_response
+				  resolv_candidates = resp.items.collect { |item| [item.source_ip, item.source_port, item.destination_ip, item.destination_port,item.sigid]  }
+				  resolv_arr = resolv_candidates.transpose
+
+
+				  sip_names   = TRPLib::get_labels_for_keys(@trp_conn,CG_HOSTS, resolv_arr[0])
+				  sport_names = TRPLib::get_labels_for_keys(@trp_conn,CG_APPS,  resolv_arr[1])
+				  dip_names   = TRPLib::get_labels_for_keys(@trp_conn,CG_HOSTS, resolv_arr[2])
+				  dport_names = TRPLib::get_labels_for_keys(@trp_conn,CG_APPS,  resolv_arr[3])
+				  sigid_names = TRPLib::get_labels_for_keys(@trp_conn,CG_SIGDS, resolv_arr[4])
+
+				  resp.items.each do |item|
+							print "#{Time.at(item.time.tv_sec)} "
+							print "#{sip_names[item.source_ip]}".ljust(28)
+							print "#{sport_names[item.source_port]}".ljust(11)
+							print "#{dip_names[item.destination_ip]}".ljust(28)
+							print "#{dport_names[item.destination_port]}".ljust(11)
+							print "#{sigid_names[item.sigid]}".rjust(10)
+							print "\n"
+				  end 
+			end
+		end
+
+	
+	end
+end
+
+

data/test/test_cap.rb

@@ -0,0 +1,55 @@
+# Trisul Remote Protocol TRP Demo script
+# Akhil.M & Dhinesh.K (c) 2010 Unleash Networks
+# Testing change 
+require 'rubygems'
+
+require './helper'
+include TRPLib
+require 'guidmap'
+
+
+class TestCap < Test::Unit::TestCase
+
+	def setup
+		@trp_conn=TRPLib::connect("127.0.0.1",
+								  12001,
+								  "Demo_Client.crt",
+								  "Demo_Client.key")
+	end
+
+
+	def test_dpi
+
+	 target_sess = TRP::SessionID.new(:slice_id => 2, :session_id => 207) 
+	 #target_sess = TRP::SessionID.new(:slice_id => 2, :session_id => 4375 ) 
+
+	 # get session time 
+     req =TRP::Message.new(:trp_command => TRP::Message::Command::SESSION_ITEM_REQUEST )
+     req.session_item_request  = 
+	 			TRP::SessionItemRequest.new(:session_ids  =>  [target_sess])
+
+	 resp=TRPLib::get_trp_response(@trp_conn,req) do |resp|
+	 	si = resp.session_item_response.items[0]
+
+	 	follow_up = TRP::Message.new(:trp_command => TRP::Message::Command::FILTERED_DATAGRAMS_REQUEST)
+		follow_up.filtered_datagram_request = TRP::FilteredDatagramRequest.new(
+							:filter_expression  => "#{GUIDMap::SG_TCP}=#{si.session_key}",
+							:time_interval => si.time_interval )
+	 	TRPLib::get_trp_response(@trp_conn,follow_up) do |resp|
+			fdr=resp.filtered_datagram_response
+
+			p "Number of bytes = #{fdr.num_bytes}\n"
+			p "Number of pkts  = #{fdr.num_datagrams}\n"
+			p "Hash            = #{fdr.sha1}\n"
+
+			File.open("t.pcap","wb") do |f|
+					f.write(fdr.contents)
+			end
+		end
+
+	 end
+end
+
+end
+
+

data/test/test_key_flows.rb

@@ -0,0 +1,61 @@
+# Trisul Remote Protocol TRP Demo script
+# Akhil.M & Dhinesh.K (c) 2010 Unleash Networks
+# Testing change 
+require 'rubygems'
+
+
+require './helper'
+include TRPLib
+
+GUID_CG_APP       = "{C51B48D4-7876-479E-B0D9-BD9EFF03CE2E}" 
+
+class TestTrisulrp < Test::Unit::TestCase
+
+	def setup
+		@trp_conn=TRPLib::connect_trp("127.0.0.1",
+									  12001,
+									  "Demo_Client.crt",
+									  "Demo_Client.key")
+	end
+
+
+	def test_flows_for_host
+
+	 target_key =  "0A.01.3C.BB"
+
+	 tmarr  = TRPLib::get_available_time(@trp_conn)
+
+     # create a new command of type CounterItemRequest
+     req =TRP::Message.new(:trp_command => TRP::Message::Command::KEY_SESS_ACTIVITY_REQUEST )
+
+     req.key_session_activity_request = 
+	 			TRP::KeySessionActivityRequest.new( :key =>  target_key ,
+	 	                                            :time_interval => TRPLib::mk_time_interval(tmarr))
+	 TRPLib::get_trp_response(@trp_conn,req) do |resp|
+
+		all_sids = resp.key_session_activity_response.sessions.collect { |ai| TRP::SessionID.new(:slice_id => ai.slice_id, :session_id => ai.session_id ) }
+
+	 	follow_up = TRP::Message.new(:trp_command => TRP::Message::Command::SESSION_ITEM_REQUEST)
+		follow_up.session_item_request = TRP::SessionItemRequest.new(:session_ids => all_sids)
+	 	TRPLib::get_trp_response(@trp_conn,follow_up) do |resp|
+			resp.session_item_response.items.each do |item|
+				print "#{item.state} "
+				print "#{Time.at(item.time_interval.from.tv_sec)} "
+				print "#{item.time_interval.to.tv_sec-item.time_interval.from.tv_sec} ".rjust(8)
+				print "#{item.key1A.label}".ljust(28)
+				print "#{item.key2A.label}".ljust(11)
+				print "#{item.key1Z.label}".ljust(28)
+				print "#{item.key2Z.label}".ljust(11)
+				print "#{item.az_bytes}".rjust(10)
+				print "#{item.za_bytes}".rjust(10)
+				print "\n"
+			end
+
+
+		end
+	 end
+end
+
+end
+
+

data/test/test_resources.rb

@@ -0,0 +1,76 @@
+# Trisul Remote Protocol TRP Demo script
+# Akhil.M & Dhinesh.K (c) 2010 Unleash Networks
+# Testing change 
+require 'rubygems'
+
+
+require './helper'
+include TRPLib
+
+GUID_CG_APP       = "{C51B48D4-7876-479E-B0D9-BD9EFF03CE2E}" 
+
+class TestTrisulrp < Test::Unit::TestCase
+
+	def setup
+		if @trp_conn.nil?
+		@trp_conn=TRPLib::connect_trp("127.0.0.1",
+									  12001,
+									  "Demo_Client.crt",
+									  "Demo_Client.key")
+		end
+	end
+
+
+	def itest_resource_items 
+		req=TRPLib::mk_resource_item_request(1,[574,575])
+		get_trp_response(@trp_conn,req) do |resp|
+				TRPLib::print_resource_item_response(resp)
+		end
+	end
+
+	def test_query_resources
+
+		target_ip = "0A.02.C7.EB"  # 10.2.199.235"
+		tm_arr = TRPLib::get_available_time(@trp_conn)
+
+
+		# The Request 
+		# ----------
+     	req =TRP::Message.new(:trp_command => TRP::Message::Command::RESOURCE_GROUP_REQUEST)
+     	req.resource_group_request =TRP::ResourceGroupRequest.new( :context => 0, 
+																   :resource_group => "{4EF9DEB9-4332-4867-A667-6A30C5900E9E}",
+																   :uri_pattern => "dll",
+																   :maxitems  => 1000,
+																   :time_interval => TRPLib.mk_time_interval(tm_arr)
+																  )
+
+		# The Response
+		# ------------
+		get_trp_response(@trp_conn,req) do |resp|
+
+			follow_up = TRP::Message.new(:trp_command => TRP::Message::Command::RESOURCE_ITEM_REQUEST)
+			follow_up.resource_item_request = TRP::ResourceItemRequest.new(:context => 0, :resource_group => "{4EF9DEB9-4332-4867-A667-6A30C5900E9E}")
+			resp.resource_group_response.resources.each do |res|
+				follow_up.resource_item_request.resource_ids << TRP::ResourceID.new(:slice_id => res.slice_id, :resource_id => res.resource_id)
+			end
+
+			get_trp_response(@trp_conn,follow_up) do | resp2 |
+
+				  resp=resp2.resource_item_response
+				  resp.items.each do |item|
+							print "#{Time.at(item.time.tv_sec)} "
+							print "#{item.source_ip}".ljust(28)
+							print "#{item.source_port}".ljust(11)
+							print "#{item.destination_ip}".ljust(28)
+							print "#{item.destination_port}".ljust(11)
+							print "#{item.uri}".rjust(10)
+							print "\n"
+				  end 
+			end
+		end
+
+	
+	end
+end
+
+

data/test/test_trisulrp.rb

@@ -1,7 +1,16 @@
-require 'helper'
+require './helper'
+
+include TrisulRP::Protocol
 
 class TestTrisulrp < Test::Unit::TestCase
-  should "probably rename this file and start testing for real" do
-    flunk "hey buddy, you should probably rename this file and start testing for real"
-  end
+
+	def test_basic
+
+	    TrisulRP::Protocol.connect("127.0.0.1", 12001, 
+								   "Demo_Client.crt", "Demo_Client.key") do |conn|
+			TrisulRP::Protocol.get_available_time(conn)
+		end
+
+	end
+
 end

data/trisulrp.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{trisulrp}
-  s.version = "1.2.3"
+  s.version = "1.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["vivek"]
-  s.date = %q{2011-01-03}
+  s.date = %q{2011-01-06}
   s.description = %q{This gem deals about the trisul remote protocol}
   s.email = %q{vivek_rajagopal@yahoo.com}
   s.extra_rdoc_files = [
@@ -25,12 +25,18 @@ Gem::Specification.new do |s|
     "VERSION",
     "examples/strp.rb",
     "lib/trisulrp.rb",
-    "lib/trp.pb.rb",
-    "lib/trp.proto",
-    "lib/trplib.rb",
+    "lib/trisulrp/guids.rb",
+    "lib/trisulrp/keys.rb",
+    "lib/trisulrp/protocol.rb",
+    "lib/trisulrp/trp.pb.rb",
+    "lib/trisulrp/trp.proto",
     "test/Demo_Client.crt",
     "test/Demo_Client.key",
     "test/helper.rb",
+    "test/test_alerts.rb",
+    "test/test_cap.rb",
+    "test/test_key_flows.rb",
+    "test/test_resources.rb",
     "test/test_trisulrp.rb",
     "trisulrp.gemspec"
   ]
@@ -42,6 +48,10 @@ Gem::Specification.new do |s|
   s.test_files = [
     "examples/strp.rb",
     "test/helper.rb",
+    "test/test_alerts.rb",
+    "test/test_cap.rb",
+    "test/test_key_flows.rb",
+    "test/test_resources.rb",
     "test/test_trisulrp.rb"
   ]