trisulrp 2.0.2 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3a837960aa8bad2a85a89334b12ef67d879a1b0
-  data.tar.gz: 53d31d34049c4852714bf66339141baae43f629c
+  metadata.gz: 6e3d5ec5c5c5a153c3ad182292e7d7e2b67b1598
+  data.tar.gz: 65e73a1228e3f94459b69518db2aac2095e06fb0
 SHA512:
-  metadata.gz: 40d725a191e2d1761e474d541bdc5af9e5095beba0582f7f07c4e0a45384932dac8cb6235531bb5189a0af51a58f406f73279c5c4ffa52b6cb4bf331cae781e1
-  data.tar.gz: 18b3ded64e3bc27053061847c733cb6f46eb6d07495c0c5cf19a2f548ac2b994614be511048b06857ae379e7c7d51ce574e04f6e0cef04e893f7cfff1d7c48ed
+  metadata.gz: 68333ba5a7e17c805b1ed89fa63ee57739b8d7c5d657ad683cb129f4fd6ac1adcffae735a04eaf778d9e046daaed1ca3c6e70302662ad299b24ae3a244dc1588
+  data.tar.gz: 3c0d676a7929abf9386519827dab7cfba14a1d46577157c975238eae9faf93839480fb3ccf6589f0331d63a207193842286e46f9212aaaff469ac360bf15c221

data/VERSION

@@ -1 +1 @@
-2.0.2
+2.0.4

data/lib/trisulrp/protocol.rb

@@ -114,7 +114,10 @@ module TrisulRP::Protocol
     dataarray=conn.read(datalen)
     resp =TRP::Message.new
     resp.parse dataarray
-    raise resp.error_response if resp.trp_command == TRP::Message::Command::ERROR_RESPONSE
+    if resp.trp_command == TRP::Message::Command::ERROR_RESPONSE
+		print "TRP ErrorResponse: #{resp.error_response.error_message}\n"
+		raise resp.error_response 
+	end
     yield unwrap_response(resp) if block_given?
     return unwrap_response(resp)
   end

data/lib/trisulrp/trp.pb.rb

@@ -433,21 +433,21 @@ module TRP
       set_fully_qualified_name "TRP.FilteredDatagramRequest.BySession"
 
       optional :string, :session_group, 1, :default => "{99A78737-4B41-4387-8F31-8077DB917336}"
-      required ::TRP::SessionID, :session_id, 2
+      repeated ::TRP::SessionID, :session_ids, 2
     end
 
     class ByAlert < ::ProtocolBuffers::Message
       set_fully_qualified_name "TRP.FilteredDatagramRequest.ByAlert"
 
       optional :string, :alert_group, 1, :default => "{9AFD8C08-07EB-47E0-BF05-28B4A7AE8DC9}"
-      required ::TRP::AlertID, :alert_id, 2
+      repeated ::TRP::AlertID, :alert_ids, 2
     end
 
     class ByResource < ::ProtocolBuffers::Message
       set_fully_qualified_name "TRP.FilteredDatagramRequest.ByResource"
 
       required :string, :resource_group, 1
-      required ::TRP::ResourceID, :resource_id, 2
+      repeated ::TRP::ResourceID, :resource_ids, 2
     end
 
     optional :int64, :max_packets, 1, :default => 0

data/lib/trisulrp/trp.proto

@@ -1,7 +1,7 @@
 // Trisul Remote Protocol (TRP) definition
 // Based on Google Protocol Buffers
 // (c) 2010-11, Unleash Networks (http://www.unleashnetworks.com)
-// $Rev: 6921 $
+// $Rev: 6929 $
 package TRP;
 
 message Timestamp  {
@@ -317,12 +317,12 @@ message FilteredDatagramRequest{
 		required TimeInterval   time_interval=1;                   
 		required string         filter_expression=2;
 	}
-	optional ByFilterExpr 	filter_expression=4;
+	optional ByFilterExpr 		filter_expression=4;
 
 	// by session
 	message BySession   {
     	optional string         session_group=1[default="{99A78737-4B41-4387-8F31-8077DB917336}"];
-		required SessionID		session_id=2;
+		repeated SessionID		session_ids=2;
 	}
 	optional BySession			session=5;
 
@@ -330,18 +330,19 @@ message FilteredDatagramRequest{
 	// by alert
 	message ByAlert     {
 		optional string			alert_group=1[default="{9AFD8C08-07EB-47E0-BF05-28B4A7AE8DC9}"];
-		required AlertID		alert_id=2;
+		repeated AlertID		alert_ids=2;
 	}
 	optional ByAlert			alert=6;
 
 	// by resource
 	message ByResource  {
 		required string			resource_group=1;
-		required ResourceID		resource_id=2;
+		repeated ResourceID		resource_ids=2;
 	}
 	optional ByResource			resource=7;
 
     optional PcapDisposition    disposition=8[default=DOWNLOAD];              
+
 }
 
 /////////////////////////////////////

data/trisulrp.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "trisulrp"
-  s.version = "2.0.2"
+  s.version = "2.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["vivek"]
-  s.date = "2014-05-31"
+  s.date = "2014-06-14"
   s.description = "This gem deals about the trisul remote protocol"
   s.email = "vivek_rajagopal@yahoo.com"
   s.extra_rdoc_files = [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trisulrp
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.4
 platform: ruby
 authors:
 - vivek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-31 00:00:00.000000000 Z
+date: 2014-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-protocol-buffers