trisulrp 3.1.1 → 3.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c2e757a7bc1175c201b874b019355dcc7767195
-  data.tar.gz: 726025203f6357c6d9534a3fcacd96323681a3d8
+  metadata.gz: d746529a58169ecd21dfc22df6da7df45ff2fec6
+  data.tar.gz: 37da2b8faabed36ecba2b3abd13225b96337efa6
 SHA512:
-  metadata.gz: 879228c4ceffd86ea132bed1c2262351d6d40a373d992761a272ceecee97df0ba32286a66b8e2a951203365dd2a6ddbe3250a37aa464aa320f387345ab5dae7d
-  data.tar.gz: 47ae512ff07dda3f2af5e1db5296f611c4700bdea578150e4596ae70b9b3c282bf661bde4a63933e186040f57870f60b0b6b43b8cfdfb1485159a7c5137ef718
+  metadata.gz: 3660641d24970edef7fcd9107e75b114ef3d2c0c1ae1f648929a450ae1d26f6641887c41b6318b19cf6d6de49187ce599a6399d7b77c39bf099f93a9c525f112
+  data.tar.gz: 3904ccf3b5ed2d2dce3d75a6f7c56b907561298e953656498c3370f86b9bba77cccb415044440e61864d061e6cf631daa87a54fb6d6cfa64620a6e5f8cee4d0d

data/VERSION

@@ -1 +1 @@
-3.1.1
+3.1.7

data/lib/trisulrp/protocol.rb

@@ -196,6 +196,47 @@ module TrisulRP::Protocol
 
   end
 
+  # returns response str 
+  def get_response_zmq_raw(endpoint, trp_request_buf , timeout_seconds = -1 )
+
+
+	ctx=ZMQ::Context.new
+	sock = ctx.socket(ZMQ::REQ)
+
+	# time out for context termination
+	sock.setsockopt(ZMQ::LINGER, 5*1_000)
+
+	# Initialize a poll set
+	poller = ZMQ::Poller.new
+	poller.register(sock, ZMQ::POLLIN)
+  
+	sock.connect(endpoint)
+	sock.send_string(trp_request_buf)
+
+	ret = poller.poll(timeout_seconds * 1_000 )
+	  if  ret == -1 
+			sock.close
+			ctx.terminate 
+			raise "zeromq poll error #{endpoint} " 
+	  end
+	  if  ret == 0 
+			sock.close
+			ctx.terminate 
+			raise "no registerted sockets #{endpoint} " 
+	  end
+
+	poller.readables.each do |rsock|
+
+		#in 
+		dataarray=""
+		rsock.recv_string(dataarray)
+		rsock.close
+		ctx.terminate 
+		return dataarray
+    end
+
+  end
+
 
 
   # Query the total time window available in Trisul
@@ -275,24 +316,27 @@ module TrisulRP::Protocol
 	end
 
   	params.each do |k,v|
-		f = msg.get_field(k)
-		if v.is_a? String 
-			if f.is_a? Protobuf::Field::MessageField and f.type_class.to_s == "TRP::KeyT"
-				params[k] = TRP::KeyT.new( :label => v )
-			elsif f.is_a? Protobuf::Field::Int64Field 
-				params[k] = v.to_i
-			elsif f.is_a? Protobuf::Field::StringField and f.rule == :repeated  
-				params[k] = v.split(',') 
-            elsif f.is_a? Protobuf::Field::BoolField
-				params[k] = ( v == "true")
-			end
-        elsif v.is_a? BigDecimal  or v.is_a? Float 
-			if f.is_a? Protobuf::Field::Int64Field 
-			    params[k] = v.to_i
-            end
-		end
-
-	end
+      f = msg.get_field(k)
+      if v.is_a? String 
+        if f.is_a? Protobuf::Field::MessageField and f.type_class.to_s == "TRP::KeyT"
+          params[k] = TRP::KeyT.new( :label => v )
+        elsif f.is_a? Protobuf::Field::Int64Field 
+          params[k] = v.to_i
+        elsif f.is_a? Protobuf::Field::StringField and f.rule == :repeated  
+          params[k] = v.split(',') 
+        elsif f.is_a? Protobuf::Field::BoolField
+          params[k] = ( v == "true")
+        end
+      elsif v.is_a? BigDecimal  or v.is_a? Float 
+        if f.is_a? Protobuf::Field::Int64Field 
+            params[k] = v.to_i
+        end
+      elsif v.is_a?Array and f.is_a?Protobuf::Field::MessageField and f.type_class.to_s == "TRP::KeyT"
+        v.each_with_index do |v1,idx|
+          v[idx]= TRP::KeyT.new( :label => v1 ) if v1.is_a?String
+        end
+      end
+	 end
 
   end
 
@@ -335,13 +379,13 @@ module TrisulRP::Protocol
    params  =in_params.dup
    opts = {:trp_command=> cmd_id}
    if params.has_key?(:destination_node)
-     opts[:destination_node] = params.delete(:destination_node)
+     opts[:destination_node] = params[:destination_node]
    end
    if params.has_key?(:probe_id)
-     opts[:probe_id] = params.delete(:probe_id)
+     opts[:probe_id] = params[:probe_id]
    end
    if params.has_key?(:run_async)
-     opts[:run_async] = params.delete(:run_async)
+     opts[:run_async] = params[:run_async]
    end
     req = TRP::Message.new(opts)
     case cmd_id
@@ -432,6 +476,9 @@ module TrisulRP::Protocol
     when TRP::Message::Command::NODE_CONFIG_REQUEST
 	  fix_TRP_Fields( TRP::NodeConfigRequest, params)
       req.node_config_request = TRP::NodeConfigRequest.new(params)
+    when TRP::Message::Command::FILE_REQUEST
+	  fix_TRP_Fields( TRP::FileRequest, params)
+      req.file_request = TRP::FileRequest.new(params)
     else
       raise "Unknown TRP command ID"
     end
@@ -525,6 +572,8 @@ module TrisulRP::Protocol
         resp.node_config_response
     when TRP::Message::Command::ASYNC_RESPONSE
         resp.async_response
+    when TRP::Message::Command::FILE_RESPONSE
+        resp.file_response
     else
      
       raise "#{resp.trp_commandi.to_i} Unknown TRP command ID"

data/lib/trisulrp/trp.pb.rb

@@ -464,6 +464,7 @@ module TRP
     required :string, :station_id, 1
     optional :string, :station_id_request, 2
     optional :string, :message, 3
+    optional :int64, :local_timestamp, 4
   end
 
   class ErrorResponse
@@ -790,6 +791,8 @@ module TRP
     optional :string, :message, 1
     optional ::TRP::NodeConfigRequest::IntelFeed, :add_feed, 2
     optional ::TRP::NodeConfigRequest::IntelFeed, :process_new_feed, 3
+    optional :bool, :get_all_nodes, 4, :default => true
+    repeated ::TRP::NameValue, :query_config, 5
   end
 
   class NodeConfigResponse
@@ -804,6 +807,7 @@ module TRP
     repeated ::TRP::NodeConfigResponse::Node, :hubs, 2
     repeated ::TRP::NodeConfigResponse::Node, :probes, 3
     repeated :string, :feeds, 4
+    repeated ::TRP::NameValue, :config_values, 5
   end
 
   class ContextCreateRequest
@@ -857,7 +861,7 @@ module TRP
     optional :string, :profile, 2
     optional :string, :params, 3
     optional :bytes, :push_config_blob, 4
-    optional :string, :query_config, 5
+    repeated ::TRP::NameValue, :query_config, 5
     repeated ::TRP::NameValue, :set_config_values, 6
   end
 
@@ -876,7 +880,7 @@ module TRP
     repeated :string, :endpoints_flush, 6
     repeated :string, :endpoints_query, 7
     repeated :string, :endpoints_pub, 8
-    optional :string, :config_value, 10
+    repeated ::TRP::NameValue, :config_values, 10
     repeated ::TRP::ContextConfigResponse::Layer, :layers, 11
   end
 
@@ -884,9 +888,11 @@ module TRP
     required :string, :context_name, 1
     optional :int64, :max_bytes, 2, :default => 100000000
     optional ::TRP::CompressionType, :compress_type, 3, :default => ::TRP::CompressionType::UNCOMPRESSED
-    optional :string, :save_file, 4
-    required ::TRP::TimeInterval, :time_interval, 5
-    required :string, :filter_expression, 6
+    optional ::TRP::TimeInterval, :time_interval, 4
+    optional :string, :save_file_prefix, 5
+    optional :string, :filter_expression, 6
+    repeated :string, :merge_pcap_files, 7
+    optional :bool, :delete_after_merge, 8, :default => true
   end
 
   class PcapResponse
@@ -916,6 +922,7 @@ module TRP
     required :string, :context_name, 1
     repeated ::TRP::SessionT, :sessions, 2
     repeated :string, :hints, 3
+    optional :string, :probe_id, 4
   end
 
   class ProbeStatsRequest
@@ -956,6 +963,8 @@ module TRP
     required :string, :uri, 1
     required :int64, :position, 2
     optional :string, :params, 3
+    optional :string, :context_name, 4
+    optional :bool, :delete_on_eof, 5, :default => false
   end
 
   class FileResponse
@@ -964,6 +973,7 @@ module TRP
     optional :int64, :position, 3
     optional :bytes, :content, 4
     optional :string, :request_params, 5
+    optional :string, :context_name, 6
   end
 
 end

data/lib/trisulrp/trp.proto

@@ -373,6 +373,7 @@ message HelloResponse{
   required string       station_id=1;
   optional string       station_id_request=2;
   optional string       message=3;
+  optional int64		local_timestamp=4;
 }
 
 ///////////////////////////////
@@ -812,8 +813,11 @@ message NodeConfigRequest {
 		repeated string	 	uri=4;				// individual files in config//.. for FileRequest download 
 	}
 
-	optional IntelFeed add_feed=2;
-	optional IntelFeed process_new_feed=3;
+	optional IntelFeed 		add_feed=2;
+	optional IntelFeed 		process_new_feed=3;
+	optional bool	   		get_all_nodes=4[default=true];
+	repeated NameValue	   	query_config=5;
+
 }
 
 message NodeConfigResponse {
@@ -825,10 +829,11 @@ message NodeConfigResponse {
 		required string	public_key=4;
 	}
 
-	repeated Node		domains=1;
-	repeated Node		hubs=2;
-	repeated Node		probes=3;
-	repeated string		feeds=4;
+	repeated Node				domains=1;
+	repeated Node				hubs=2;
+	repeated Node				probes=3;
+	repeated string				feeds=4;
+	repeated NameValue	   		config_values=5;
 }
 
 
@@ -905,8 +910,7 @@ message ContextConfigRequest {
      optional  string         profile=2;
      optional  string         params=3;
 	 optional  bytes		  push_config_blob=4;     // push this .. 
-	 optional  string		  query_config=5;  		  // push this .. 
-
+	 repeated  NameValue	  query_config=5;    	  // query, leave the .value field blank
 	 repeated  NameValue	  set_config_values=6;    // push this ..  (name=value;name=value ..)
 }
 
@@ -928,7 +932,7 @@ message ContextConfigResponse {
 	repeated  string		  	endpoints_flush=6;
 	repeated  string		  	endpoints_query=7;
 	repeated  string		  	endpoints_pub=8;
-	optional  string		  	config_value=10;  // response to query config .. 
+	repeated  NameValue	  		config_values=10;    	  // query, leave the .value field blank
 	repeated  Layer 		  	layers=11;
 
 }
@@ -937,16 +941,24 @@ message ContextConfigResponse {
 // PcapReqiest
 //  NOTE - only one of the various filters are supported
 //  sending > 1 will result in error 
+//	
+// Modes
+//	1.  nothing set => PCAP file in contents
+//	2.  save_file_prefix set =>  file download token
+//	3.  merge_pcap_files => file download token 
 // 
 message PcapRequest {
 	required string				context_name=1;
     optional int64              max_bytes=2[default=100000000]; // 100MB , can increase to 0.75 Filesystem freespace
     optional CompressionType    compress_type=3[default=UNCOMPRESSED];              
-    optional string             save_file=4;
-	required TimeInterval       time_interval=5;                   
-	required string             filter_expression=6;
+	optional TimeInterval       time_interval=4;                // not needed for merge option 
+    optional string             save_file_prefix=5;
+	optional string             filter_expression=6;
+	repeated string				merge_pcap_files=7;
+	optional bool			    delete_after_merge=8[default=true];
 }
 
+
 /////////////////////////////////////
 // FileredDatagaramResponse
 message PcapResponse  {
@@ -957,7 +969,7 @@ message PcapResponse  {
     optional int64          num_bytes=5;      
     optional string         sha1=6;
     optional bytes          contents=7;
-	optional string			save_file=8;
+	optional string			save_file=8;		//use FileRequest framework to download 
 }
 
 ////////////////////////////////////
@@ -980,6 +992,7 @@ message GrepResponse  {
 	required string			context_name=1;
     repeated SessionT       sessions=2;
     repeated string         hints=3;
+	optional string			probe_id=4;
 }
 
 //////////////////////////////////
@@ -1031,6 +1044,8 @@ message FileRequest  {
 	required string 		uri=1;
     required int64          position=2;
 	optional string			params=3;	// local meaning sentback n response
+	optional string			context_name=4;
+	optional bool			delete_on_eof=5[default=false];
 }
 
 //////////////////////////////////
@@ -1043,6 +1058,7 @@ message FileResponse  {
      optional  int64        position=3;
      optional  bytes        content=4;
      optional  string       request_params =5; 
+	 optional string		context_name=6;
 }
 
 

data/lib/trisulrp.rb

@@ -10,6 +10,10 @@ module TrisulRP
 end
 
 require 'rubygems'
+
+require 'protobuf'
+::Protobuf.ignore_unknown_fields=true
+
 require 'trisulrp/trp.pb'
 require 'trisulrp/guids.rb'
 require 'trisulrp/keys.rb'

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.1 ruby lib
+# stub: trisulrp 3.1.7 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "trisulrp"
-  s.version = "3.1.1"
+  s.version = "3.1.7"
 
   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-08-02"
+  s.date = "2016-08-25"
   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.1
+  version: 3.1.7
 platform: ruby
 authors:
 - vivek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-02 00:00:00.000000000 Z
+date: 2016-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: protobuf