trisulrp 1.2.2 → 1.2.3

data/Gemfile

@@ -2,7 +2,8 @@ source "http://rubygems.org"
 # Add dependencies required to use your gem here.
 # Example:
 #   gem "activesupport", ">= 2.3.5"
-    gem "ruby-protocol-buffers", ">= 0.8.5"
+gem "ruby-protocol-buffers", ">= 0.8.5"
+
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do

data/VERSION

@@ -1 +1 @@
-1.2.2
+1.2.3

data/examples/strp.rb

@@ -1,20 +1,17 @@
 # Trisul Remote Protocol TRP Demo script
 # Akhil.M & Dhinesh.K (c) 2010 Unleash Networks
+# Testing change 
 require 'rubygems'
 
-require './trplib'
+require 'trisulrp'
 include TRPLib
 
 GUID_CG_APP       = "{C51B48D4-7876-479E-B0D9-BD9EFF03CE2E}" 
 
 raise "Usage : strp host port" unless ARGV.length==2
 
-# demo a counter group info request
 # get information about the application counter group 
-
 trp_conn=TRPLib::connect_trp(ARGV.shift,ARGV.shift,"Demo_Client.crt","Demo_Client.key")
-
-
 from_tm=to_tm=nil
 req=TRPLib::mk_counter_group_info_request(GUID_CG_APP)
 TRPLib::get_trp_response(trp_conn,req) do |resp|
@@ -24,15 +21,16 @@ TRPLib::get_trp_response(trp_conn,req) do |resp|
 	to_tm =  Time.at(resp.counter_group_info_response.group_details[0].time_interval.to.tv_sec)
 end
 
-# demo for each session id and their full info  
+# get all sessions for the host key 10.1.10.e8
 req=TRPLib::mk_key_session_activity_request("0A.01.A0.E8", from_tm, to_tm)
-    get_trp_response(trp_conn,req) do |resp|
-	TRPLib::print_key_session_activity_response(resp)
-	      resp.key_session_activity_response.sessions.each do|session|
+
+get_trp_response(trp_conn,req) do |resp|
+TRPLib::print_key_session_activity_response(resp)
+  resp.key_session_activity_response.sessions.each do|session|
 		 req=TRPLib::mk_session_item_request(session.slice_id,session.session_id)
-		     get_trp_response(trp_conn,req) do |resp|
-		      	 TRPLib::print_session_item_response(resp)
-		     end
-	      end
-    end
+		 get_trp_response(trp_conn,req) do |resp|
+				 TRPLib::print_session_item_response(resp)
+		 end
+  end
+end
 

data/lib/trp.pb.rb

@@ -15,6 +15,8 @@ module TRP
   class KeyStats < ::ProtocolBuffers::Message; end
   class KeyDetails < ::ProtocolBuffers::Message; end
   class SessionID < ::ProtocolBuffers::Message; end
+  class AlertID < ::ProtocolBuffers::Message; end
+  class ResourceID < ::ProtocolBuffers::Message; end
   class CounterGroupDetails < ::ProtocolBuffers::Message; end
   class Message < ::ProtocolBuffers::Message; end
   class HelloRequest < ::ProtocolBuffers::Message; end
@@ -51,6 +53,14 @@ module TRP
   class SessionGroupResponse < ::ProtocolBuffers::Message; end
   class ServerStatsRequest < ::ProtocolBuffers::Message; end
   class ServerStatsResponse < ::ProtocolBuffers::Message; end
+  class AlertItemRequest < ::ProtocolBuffers::Message; end
+  class AlertItemResponse < ::ProtocolBuffers::Message; end
+  class AlertGroupRequest < ::ProtocolBuffers::Message; end
+  class AlertGroupResponse < ::ProtocolBuffers::Message; end
+  class ResourceItemRequest < ::ProtocolBuffers::Message; end
+  class ResourceItemResponse < ::ProtocolBuffers::Message; end
+  class ResourceGroupRequest < ::ProtocolBuffers::Message; end
+  class ResourceGroupResponse < ::ProtocolBuffers::Message; end
 
   # enums
   module AuthLevel
@@ -125,6 +135,20 @@ module TRP
     gen_methods! # new fields ignored after this point
   end
 
+  class AlertID < ::ProtocolBuffers::Message
+    required :int64, :slice_id, 1
+    required :int64, :alert_id, 2
+
+    gen_methods! # new fields ignored after this point
+  end
+
+  class ResourceID < ::ProtocolBuffers::Message
+    required :int64, :slice_id, 1
+    required :int64, :resource_id, 2
+
+    gen_methods! # new fields ignored after this point
+  end
+
   class CounterGroupDetails < ::ProtocolBuffers::Message
     required :string, :guid, 1
     required :string, :name, 2
@@ -180,6 +204,14 @@ module TRP
       SERVER_STATS_RESPONSE = 39
       SESSION_GROUP_REQUEST = 40
       SESSION_GROUP_RESPONSE = 41
+      ALERT_ITEM_REQUEST = 42
+      ALERT_ITEM_RESPONSE = 43
+      ALERT_GROUP_REQUEST = 44
+      ALERT_GROUP_RESPONSE = 45
+      RESOURCE_ITEM_REQUEST = 46
+      RESOURCE_ITEM_RESPONSE = 47
+      RESOURCE_GROUP_REQUEST = 48
+      RESOURCE_GROUP_RESPONSE = 49
     end
 
     required ::TRP::Message::Command, :trp_command, 1
@@ -217,6 +249,14 @@ module TRP
     optional ::TRP::ServerStatsResponse, :server_stats_response, 38
     optional ::TRP::SessionGroupRequest, :session_group_request, 39
     optional ::TRP::SessionGroupResponse, :session_group_response, 40
+    optional ::TRP::AlertItemRequest, :alert_item_request, 41
+    optional ::TRP::AlertItemResponse, :alert_item_response, 42
+    optional ::TRP::AlertGroupRequest, :alert_group_request, 43
+    optional ::TRP::AlertGroupResponse, :alert_group_response, 44
+    optional ::TRP::ResourceItemRequest, :resource_item_request, 45
+    optional ::TRP::ResourceItemResponse, :resource_item_response, 46
+    optional ::TRP::ResourceGroupRequest, :resource_group_request, 47
+    optional ::TRP::ResourceGroupResponse, :resource_group_response, 48
 
     gen_methods! # new fields ignored after this point
   end
@@ -538,4 +578,113 @@ module TRP
     gen_methods! # new fields ignored after this point
   end
 
+  class AlertItemRequest < ::ProtocolBuffers::Message
+    optional :int64, :context, 1
+    required :string, :alert_group, 2
+    optional ::TRP::AlertID, :alert_id, 3
+
+    gen_methods! # new fields ignored after this point
+  end
+
+  class AlertItemResponse < ::ProtocolBuffers::Message
+    optional :int64, :context, 1
+    required :string, :alert_group, 2
+    optional :int64, :sensor_id, 3
+    required ::TRP::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 ::TRP::Timestamp, :dispatch_time, 12
+    required :string, :aux_message1, 13
+    required :string, :aux_message2, 14
+
+    gen_methods! # new fields ignored after this point
+  end
+
+  class AlertGroupRequest < ::ProtocolBuffers::Message
+    optional :int64, :context, 1
+    required :string, :alert_group, 2
+    required ::TRP::TimeInterval, :time_interval, 3
+    optional :int64, :maxitems, 5, :default => 10
+    optional :string, :source_ip, 6
+    optional :string, :source_port, 7
+    optional :string, :destination_ip, 8
+    optional :string, :destination_port, 9
+    optional :string, :sigid, 10
+    optional :string, :classification, 11
+    optional :string, :priority, 12
+    optional :string, :aux_message1, 13
+    optional :string, :aux_message2, 14
+
+    gen_methods! # new fields ignored after this point
+  end
+
+  class AlertGroupResponse < ::ProtocolBuffers::Message
+    optional :int64, :context, 1
+    required :string, :alert_group, 2
+    repeated ::TRP::AlertID, :alerts, 3
+
+    gen_methods! # new fields ignored after this point
+  end
+
+  class ResourceItemRequest < ::ProtocolBuffers::Message
+    optional :int64, :context, 1
+    required :string, :resource_group, 2
+    repeated ::TRP::ResourceID, :resource_ids, 3
+
+    gen_methods! # new fields ignored after this point
+  end
+
+  class ResourceItemResponse < ::ProtocolBuffers::Message
+    # forward declarations
+    class Item < ::ProtocolBuffers::Message; end
+
+    # nested messages
+    class Item < ::ProtocolBuffers::Message
+      required ::TRP::Timestamp, :time, 1
+      required ::TRP::ResourceID, :resource_id, 2
+      optional :string, :source_ip, 3
+      optional :string, :source_port, 4
+      optional :string, :destination_ip, 5
+      optional :string, :destination_port, 6
+      optional :string, :uri, 7
+      optional :string, :userlabel, 8
+
+      gen_methods! # new fields ignored after this point
+    end
+
+    optional :int64, :context, 1
+    required :string, :resource_group, 2
+    repeated ::TRP::ResourceItemResponse::Item, :items, 3
+
+    gen_methods! # new fields ignored after this point
+  end
+
+  class ResourceGroupRequest < ::ProtocolBuffers::Message
+    optional :int64, :context, 1
+    required :string, :resource_group, 2
+    required ::TRP::TimeInterval, :time_interval, 3
+    optional :int64, :maxitems, 4, :default => 10
+    optional :string, :source_ip, 5
+    optional :string, :source_port, 6
+    optional :string, :destination_ip, 7
+    optional :string, :destination_port, 8
+    optional :string, :uri_pattern, 9
+    optional :string, :userlabel_pattern, 10
+
+    gen_methods! # new fields ignored after this point
+  end
+
+  class ResourceGroupResponse < ::ProtocolBuffers::Message
+    optional :int64, :context, 1
+    required :string, :resource_group, 2
+    repeated ::TRP::ResourceID, :resources, 3
+
+    gen_methods! # new fields ignored after this point
+  end
+
 end

data/lib/trp.proto

@@ -4,7 +4,7 @@
 //
 package TRP;
 
-message Timestamp{
+message Timestamp  {
   required int64            tv_sec=1;
   required int64            tv_usec=2 [default=0];
 }
@@ -42,6 +42,15 @@ message SessionID {
 	required int64			session_id=2;
 }
 
+message AlertID {
+	required int64			slice_id=1;
+	required int64			alert_id=2;
+}
+
+message ResourceID {
+	required int64			slice_id=1;
+	required int64			resource_id=2;
+}
 message CounterGroupDetails {
     required string 		guid=1;
     required string 		name=2;
@@ -107,6 +116,14 @@ message Message {
                     SERVER_STATS_RESPONSE=39;     						   			
 					SESSION_GROUP_REQUEST=40;
 					SESSION_GROUP_RESPONSE=41;
+					ALERT_ITEM_REQUEST=42;
+					ALERT_ITEM_RESPONSE=43;
+					ALERT_GROUP_REQUEST=44;
+					ALERT_GROUP_RESPONSE=45;
+					RESOURCE_ITEM_REQUEST=46;
+					RESOURCE_ITEM_RESPONSE=47;
+					RESOURCE_GROUP_REQUEST=48;
+					RESOURCE_GROUP_RESPONSE=49;
 	}
 
 	required Command	trp_command=1;
@@ -144,7 +161,14 @@ message Message {
 	optional ServerStatsResponse server_stats_response=38;
 	optional SessionGroupRequest session_group_request=39;
 	optional SessionGroupResponse session_group_response=40;
-
+	optional AlertItemRequest alert_item_request=41;
+	optional AlertItemResponse alert_item_response=42;
+	optional AlertGroupRequest alert_group_request=43;
+	optional AlertGroupResponse alert_group_response=44;
+	optional ResourceItemRequest resource_item_request=45;
+	optional ResourceItemResponse resource_item_response=46;
+	optional ResourceGroupRequest resource_group_request=47;
+	optional ResourceGroupResponse resource_group_response=48;
 }
 
 ///////////////////////////////
@@ -460,3 +484,102 @@ message ServerStatsResponse{
 	required TimeInterval 	time_interval=13;
 }
 
+/////////////////////////////////////
+// AlertItemRequest
+message AlertItemRequest{
+	optional int64 			context=1;            
+	required string 		alert_group=2;
+	optional AlertID		alert_id=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;
+}
+
+////////////////////////////////////
+// AlertGroupQueryRequest
+message AlertGroupRequest {
+	optional int64 			context=1;            
+	required string 		alert_group=2;
+	required TimeInterval	time_interval=3;
+	optional int64 			maxitems=5 [default=10];
+	optional string 		source_ip=6;
+	optional string	 		source_port=7;
+	optional string 		destination_ip=8;
+	optional string 		destination_port=9;
+	optional string 		sigid=10;
+	optional string 		classification=11;
+	optional string 		priority=12;
+	optional string 		aux_message1=13;
+	optional string 		aux_message2=14;
+}
+
+/////////////////////////////////////
+// AlertGroupResponse 
+message AlertGroupResponse {
+	optional int64 			context=1;
+	required string 		alert_group=2;
+	repeated AlertID		alerts=3;
+}
+
+/////////////////////////////////////
+// ResourceRequest - mutliple 
+message ResourceItemRequest{
+	optional int64 			context=1;            
+	required string 		resource_group=2;
+	repeated ResourceID		resource_ids=3;
+}
+////////////////////////////////////
+// ResourceItemResponse
+message ResourceItemResponse{
+	optional int64 			context=1;            
+	required string 		resource_group=2;
+	message Item {
+		required Timestamp	 	time=1;
+		required ResourceID		resource_id=2;
+		optional string 		source_ip=3;
+		optional string	 		source_port=4;
+		optional string 		destination_ip=5;
+		optional string 		destination_port=6;
+		optional string 		uri=7;
+		optional string 		userlabel=8;
+	}
+	repeated Item			items=3;
+}
+
+////////////////////////////////////
+// ResourceGroupRequest
+message ResourceGroupRequest {
+	optional int64 			context=1;            
+	required string 		resource_group=2;
+	required TimeInterval	time_interval=3;
+	optional int64 			maxitems=4 [default=10];
+	optional string 		source_ip=5;
+	optional string	 		source_port=6;
+	optional string 		destination_ip=7;
+	optional string 		destination_port=8;
+	optional string 		uri_pattern=9;
+	optional string 		userlabel_pattern=10;
+}
+
+/////////////////////////////////////
+// ResourceGroupResponse  
+message ResourceGroupResponse {
+	optional int64 			context=1;
+	required string 		resource_group=2;
+	repeated ResourceID		resources=3;
+}

data/lib/trplib.rb

@@ -327,7 +327,4 @@ def print_session_tracker_response(resp_in)
        
 	end	
 
-
-
-
 end

data/trisulrp.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{trisulrp}
-  s.version = "1.2.2"
+  s.version = "1.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["vivek"]
-  s.date = %q{2010-12-31}
+  s.date = %q{2011-01-03}
   s.description = %q{This gem deals about the trisul remote protocol}
   s.email = %q{vivek_rajagopal@yahoo.com}
   s.extra_rdoc_files = [

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: trisulrp
 version: !ruby/object:Gem::Version 
-  hash: 27
   prerelease: false
   segments: 
   - 1
   - 2
-  - 2
-  version: 1.2.2
+  - 3
+  version: 1.2.3
 platform: ruby
 authors: 
 - vivek
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-31 00:00:00 +05:30
+date: 2011-01-03 00:00:00 +05:30
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,7 +24,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 53
         segments: 
         - 0
         - 8
@@ -41,7 +39,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -55,7 +52,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 1
         - 0
@@ -71,7 +67,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 1
         - 5
@@ -87,7 +82,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -101,7 +95,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 53
         segments: 
         - 0
         - 8
@@ -150,7 +143,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 113684307
       segments: 
       - 0
       version: "0"
@@ -159,7 +152,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"