trisulrp 3.1.8 → 3.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9ec7eceb754bcae4093722e2daf39ded5f038ef
-  data.tar.gz: 9f2e44ad8b65f18c6f1cc366f263f540efcb5897
+  metadata.gz: 8a80ac5c8d010546f72f43d0ca8fe943fab65efc
+  data.tar.gz: b2eb01d960d26429a6c335beeaa6c6ccf5099d26
 SHA512:
-  metadata.gz: ba2c12aca2cb5c76bcdc2f42cbc60340459252b0313d14e086f97936dd342f75e2a4b5956db40539823b23dc2a2fd0f9f5690a1fa2da45fe2010b46d436d357f
-  data.tar.gz: 7963b2af67bc2a50bac47a1c3c4e15c5ea1d43da7b3b2e8000331c4bac6f3343431b264a02c4b8db52e544d7d6923f0aeb3448dc02dbc87910e0a08481d7d75b
+  metadata.gz: 7cbffac3de814341c645c485f0eef0d3c3bc70780b0da80c3300ce8e9b12e24754681786ec7cea54c16e55a217e9e35874970f3224496e07036dc0c4e99365b6
+  data.tar.gz: e822fac8f5a674ab084928f34aad57b7fdffb139e5c510bda678c050a2dfe00a44168abf985220f854c10df13548c75e320662c8a3b28dbd8aaaf3d12a70d166

data/VERSION

@@ -1 +1 @@
-3.1.8
+3.1.11

data/lib/trisulrp/protocol.rb

@@ -237,6 +237,35 @@ module TrisulRP::Protocol
 
   end
 
+  # used in Trisul Domain
+  # send trp_request as async, then poll for completion and return
+  # this does not block the domain network
+  #
+  def get_response_zmq_async(endpoint, trp_request, timeout_seconds = -1 )
+
+		# first get a  resp.token ASYNC, then poll for it 
+		trp_request.run_async=true
+		resp=get_response_zmq(endpoint, trp_request, timeout_seconds)
+
+		trp_resp_command_id = resp.instance_variable_get("@trp_resp_command_id")
+
+		while trp_resp_command_id == TRP::Message::Command::ASYNC_RESPONSE do
+			async_req = TrisulRP::Protocol.mk_request(
+							TRP::Message::Command::ASYNC_REQUEST,
+							{
+								token:resp.token,
+								destination_node:trp_request.destination_node,
+								sleep:2 
+							}
+						)
+			resp=get_response_zmq(endpoint,async_req, timeout_seconds)
+			trp_resp_command_id = resp.instance_variable_get("@trp_resp_command_id")
+		end
+
+		return resp
+
+  end
+
 
 
   # Query the total time window available in Trisul

data/lib/trisulrp/trp.pb.rb

@@ -25,6 +25,7 @@ module TRP
   class PcapFormat < ::Protobuf::Enum
     define :LIBPCAP, 1
     define :UNSNIFF, 2
+    define :LIBPCAPNOFILEHEADER, 3
   end
 
   class DomainNodeType < ::Protobuf::Enum
@@ -353,11 +354,13 @@ module TRP
     optional ::TRP::KeyT, :classification, 9
     optional ::TRP::KeyT, :priority, 10
     optional ::TRP::Timestamp, :dispatch_time, 11
-    optional :string, :aux_message1, 12
-    optional :string, :aux_message2, 13
+    optional :string, :dispatch_message1, 12
+    optional :string, :dispatch_message2, 13
     optional :int64, :occurrances, 14, :default => 1
     optional :string, :group_by_key, 15
     optional :string, :probe_id, 16
+    optional :string, :alert_status, 17
+    optional :int64, :acknowledge_flag, 18
   end
 
   class ResourceT
@@ -894,6 +897,7 @@ module TRP
     optional :string, :filter_expression, 6
     repeated :string, :merge_pcap_files, 7
     optional :bool, :delete_after_merge, 8, :default => true
+    optional ::TRP::PcapFormat, :format, 9, :default => ::TRP::PcapFormat::LIBPCAP
   end
 
   class PcapResponse

data/lib/trisulrp/trp.proto

@@ -127,19 +127,21 @@ message AlertT{
 	optional int64          sensor_id=1;
 	required Timestamp      time=2;
 	required string 		alert_id=3;
-	optional KeyT     source_ip=4;
-	optional KeyT     source_port=5;
-	optional KeyT     destination_ip=6;
-	optional KeyT     destination_port=7;
-	optional KeyT     sigid=8;
-	optional KeyT     classification=9;
-	optional KeyT     priority=10;
+	optional KeyT           source_ip=4;
+	optional KeyT           source_port=5;
+	optional KeyT           destination_ip=6;
+	optional KeyT           destination_port=7;
+	optional KeyT           sigid=8;
+	optional KeyT           classification=9;
+	optional KeyT           priority=10;
 	optional Timestamp      dispatch_time=11;
-	optional string         aux_message1=12;
-	optional string         aux_message2=13;
+	optional string         dispatch_message1=12;
+	optional string         dispatch_message2=13;
 	optional int64          occurrances=14[default=1];
 	optional string         group_by_key=15;
 	optional string			probe_id=16;
+	optional string         alert_status=17;
+	optional int64          acknowledge_flag=18;
 }
 
 
@@ -192,6 +194,7 @@ enum CompressionType {
 enum  PcapFormat {
     LIBPCAP=1;
     UNSNIFF=2;
+    LIBPCAPNOFILEHEADER=3;
 }
 
 enum DomainNodeType
@@ -957,6 +960,7 @@ message PcapRequest {
 	optional string             filter_expression=6;
 	repeated string				merge_pcap_files=7;
 	optional bool			    delete_after_merge=8[default=true];
+    optional PcapFormat         format=9[default=LIBPCAP];                                 
 }
 
 

data/trisulrp.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: trisulrp 3.1.8 ruby lib
+# stub: trisulrp 3.1.11 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "trisulrp"
-  s.version = "3.1.8"
+  s.version = "3.1.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["vivek"]
-  s.date = "2016-09-22"
+  s.date = "2016-12-23"
   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: 3.1.8
+  version: 3.1.11
 platform: ruby
 authors:
 - vivek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-22 00:00:00.000000000 Z
+date: 2016-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: protobuf