log-courier 2.7.1 → 2.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3ef8d232349a4aeaabfab1481b1675ccd57fa9e10b965d87d7824c23d6f7791
-  data.tar.gz: 64942e87ac4da08392b7f48bdf0170914617696bebf41a3cb21a87596f8506b8
+  metadata.gz: c318bee7d97ff215d852e8980301665d48d8b81a17f6806e2ecbaaa596d9e43f
+  data.tar.gz: ad52cced8f9dad919a2521395db9fb442bb0535fed9b54ac555f9c140e70f917
 SHA512:
-  metadata.gz: e38df8efda4dcf97cac9bfee072c2c8dc46a4af6a4ee09233c0cc5562b3ee389f8e99b9ecbbdf3347f42bd498c44bf649ddfb86676ddd5e1ebd4db0cf4be1a94
-  data.tar.gz: fef73ad4bbc70488a2d6dbed07ae5c0ba3ec89c42806fa836ab25781ea995e5fd2783dbaf1b0f483a6c528da0f2f8e0dd2c3fd97668e94dd6827d1f128de3f8e
+  metadata.gz: 200421b7dae625c4cdd88bc08197a32db9f50248a2e661af785ebae47d84fdacde97413d8c67189fa3047c2611786e0a3fdc28d56547cc87c047c4e644f38cea
+  data.tar.gz: 9ca5c1ef8145659c92a17d9ff0671ac2cc14900ef8d0a052f330055c1c4c55595065a37e0be045642fcd061c029206302f716df2e48012584720fd3622abac60

data/lib/log-courier/client_tcp.rb

@@ -125,7 +125,7 @@ module LogCourier
     def handshake(io_control)
       return true if @options[:disable_handshake]
 
-      @socket.write ['HELO', 8, 0, 2, 7, 0, 'RYLC'].pack('A4NCCCCA4')
+      @socket.write ['HELO', 20, 0, 2, 7, 2, 'RYLC'].pack('A4NNNNNA4')
 
       signature, data = receive
       if signature != 'VERS'

data/lib/log-courier/protocol.rb

@@ -22,9 +22,9 @@ module LogCourier
   # Protocol
   module Protocol
     def self.parse_helo_vers(data)
-      data = "\x00\x00\x00\x00\x00\x00\x00\x00" if data.length < 8
+      data = "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00" if data.length < 8
 
-      flags, major_version, minor_version, patch_version, client = data.unpack('CCCCA4')
+      flags, major_version, minor_version, patch_version, client = data.unpack('NNNNA4')
       client = case client
                when 'LCOR'
                  'Log Courier'

data/lib/log-courier/server_tcp.rb

@@ -368,15 +368,15 @@ module LogCourier
       @helo = Protocol.parse_helo_vers(data)
       @logger&.info 'Remote identified', peer: @peer, client_version: @helo[:client_version]
 
-      # Flags 1 byte - EVNT flag = 0
+      # Flags 4 bytes - EVNT flag = 0
       # (Significant rewrite would be required to support streaming messages as currently we read
       #  first and then yield for processing. To support EVNT we have to move protocol parsing to
       #  the connection layer here so we can keep reading until we reach the end of the stream)
-      # Major Version 1 byte
-      # Minor Version 1 byte
-      # Patch Version 1 byte
+      # Major Version 4 bytes
+      # Minor Version 4 bytes
+      # Patch Version 4 bytes
       # Client String 4 bytes
-      data = [1, 2, 7, 0, 'RYLC'].pack('CCCCA4')
+      data = [0, 2, 7, 2, 'RYLC'].pack('NNNNA4')
       send 'VERS', data
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: log-courier
 version: !ruby/object:Gem::Version
-  version: 2.7.1
+  version: 2.7.2
 platform: ruby
 authors:
 - Jason Woods