net-tns 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c79686c4bd0a8d905987a42092ec1fa49cb140fa
-  data.tar.gz: 5a95a383671604fb14980ea2cfe099055f488db5
+  metadata.gz: abd5c0ddbf15b9a4e4c3c37795d88dfc92357a45
+  data.tar.gz: 83401b9ffebe9ad974a918443196f5bf1493b9a3
 SHA512:
-  metadata.gz: c135287fde902c9019eb0da3c5b38c71fb94d13ee90e4625f622bd7c8d71df0ca690c362c971843621da788f73476437aa281c04bb5698ebc073b3d2da35c8f5
-  data.tar.gz: afdce9a532326bb42af0fc093d6b08f2d4a26bc32369fd2c14c9014524b0b7f911a08e3f5241aa0f85896d021dbb4c80370ca567fb1a8a139a30de21a0b4920a
+  metadata.gz: a0b363f8c3c8fb3a156e33f695d7b1220f296b809c787d9e25c66da3ff6ece1706138586fb01219280980e1efce901141dc4460876503631b718aa6a0fd8d34d
+  data.tar.gz: f943432ae2af1f05f1f2b7f9e66c53416ba585d99f5fdb63d30158dd3a1302aa6e1150e164738d8bdb221a34f531229dbec95b24e4ecc3eb7469a9adc743a18e

data/bin/{tns_sid_enumeration.rb → tns_sid_probing.rb}

@@ -27,12 +27,14 @@ end
 
 
 dictionary = [
-  "ORCL",
+  "CLRExtProc",
   "ORACLE",
   "ORADB",
-  "XE",
-  "TEST",
+  "ORCL",
   "PLSExtProc",
+  "TEST",
+  "XDB",
+  "XE"
 ]
 
 sids = Set.new

data/lib/net/tns/client.rb

@@ -47,7 +47,7 @@ module Net
         begin
           conn = Connection.new(opts)
           conn.open_socket()
-          request = ConnectPacket.new(:data => "(CONNECT_DATA=(COMMAND=STATUS))")
+          request = ConnectPacket.new(:data => "(CONNECT_DATA=(COMMAND=STATUS)(VERSION=186647552))")
 
           status_response_raw = ""
           begin
@@ -58,6 +58,8 @@ module Net
             # a data length that is greater than the available data.
           end
 
+          response = conn.send_and_receive(ResendPacket.new())
+          status_response_raw += response.data
           # Successful responses are typically spread across multiple Data packets.
           while ( response = conn.receive_tns_packet() )
             break unless response.is_a?(DataPacket)

data/lib/net/tns/connection.rb

@@ -5,6 +5,7 @@ module Net
   module TNS
     class Connection
       attr_reader :tns_protocol_version
+      attr_reader :tns_sdu
 
       def initialize(opts={})
         @socket = nil
@@ -75,11 +76,15 @@ module Net
         end
 
         response = send_and_receive(connect_packet)
-        unless response.is_a?(AcceptPacket)
+        unless response.is_a?(AcceptPacket) || response.is_a?(RedirectPacket)
           raise Exceptions::ProtocolException.new("Unexpected response to Connect packet: #{response.class}")
         end
-
+        if response.is_a?(RedirectPacket)
+          # CLR extproc on 12c will end up here
+          return
+        end
         @tns_protocol_version = response.version.to_i
+        @tns_sdu = response.sdu_size.to_i
         negotiate_ano()
       end
 

data/lib/net/tns/gem_version.rb

@@ -1,5 +1,5 @@
 module Net
   module TNS
-    VERSION = "1.1.1"
+    VERSION = "1.1.2"
   end
 end

data/lib/net/tns/packet.rb

@@ -13,7 +13,7 @@ module Net
     end
 
     class Packet < BinData::Record
-      SESSION_DATA_UNIT_SIZE = 2048
+      SESSION_DATA_UNIT_SIZE = 8192
       MAX_PAYLOAD_SIZE = SESSION_DATA_UNIT_SIZE - Header::LENGTH
 
       # BinData fields

data/lib/net/tns/packets/connect_packet.rb

@@ -9,7 +9,7 @@ module Net
       uint16be  :minimum_version,   :initial_value => Net::TNS::Version::ALL_VERSIONS.min
       uint16be  :service_flags
       # session data unit size
-      uint16be  :sdu_size,          :initial_value => 0x0800
+      uint16be  :sdu_size,          :initial_value => Net::TNS::Packet::SESSION_DATA_UNIT_SIZE
       # maximum transmission data unit size
       uint16be  :maximum_tdu_size,  :initial_value => 0x7fff
       uint16be  :protocol_flags,    :initial_value => 0xc608

data/lib/net/tti/capabilities.rb

@@ -0,0 +1,40 @@
+
+module Net
+  module TTI
+    class Capabilities
+      def initialize(caps_bytes=[])
+        @caps_bytes = caps_bytes
+      end
+
+      def self.from_byte_array(bytes)
+        Capabilities.new(bytes)
+      end
+
+      def self.from_binary_string(string)
+        Capabilities.new( string.unpack("C*") )
+      end
+
+      def [](index)
+        @caps_bytes[index]
+      end
+
+      def []=(index, value)
+        @caps_bytes[index] = value
+      end
+
+      def length
+        @caps_bytes.length
+      end
+
+      def to_binary_s
+        @caps_bytes.pack("C*")
+      end
+
+      # Returns hexified bytes, delimited by spaces
+      # e.g. [0x01,0x41,0x81,0xa1] -> "01 41 81 a1"
+      def to_hexified_s
+        to_binary_s.scan(/../).join(" ")
+      end
+    end
+  end
+end

data/lib/net/tti/client.rb

@@ -56,8 +56,9 @@ module Net
       end
 
       def get_pre_auth_request(username)
-        pre_auth_request = Authentication.create_pre_auth_request( @tti_conn.conn_params.architecture )
+        pre_auth_request = Authentication.create_pre_auth_request()
         pre_auth_request.username = username
+        pre_auth_request.add_parameter("AUTH_TERMINAL", "unknown")
         return pre_auth_request
       end
 
@@ -68,17 +69,24 @@ module Net
         when Net::TNS::Version::VERSION_10G
           enc_password, enc_client_session_key = Net::TTI::Crypto.get_10g_auth_values( username, password, auth_sesskey )
         when Net::TNS::Version::VERSION_11G
-          auth_vfr_data = pre_auth_response.auth_vfr_data
-          enc_password, enc_client_session_key = Net::TTI::Crypto.get_11g_auth_values( password, auth_sesskey, auth_vfr_data )
+          case auth_sesskey.length
+          when 32
+            enc_password, enc_client_session_key = Net::TTI::Crypto.get_10g_auth_values( username, password, auth_sesskey )
+          when 48
+            auth_vfr_data = pre_auth_response.auth_vfr_data
+            enc_password, enc_client_session_key = Net::TTI::Crypto.get_11g_auth_values( password, auth_sesskey, auth_vfr_data )
+          else
+            raise Exceptions::ProtocolException.new("Unexpected AUTH_SESSKEY length #{auth_sesskey.length}")
+          end
         else
           raise Exceptions::UnsupportedTNSVersion.new( @tti_conn.conn_params.tns_version )
         end
 
-        auth_request = Authentication.create_auth_request( @tti_conn.conn_params.architecture )
+        auth_request = Authentication.create_auth_request()
         auth_request.username = username
-        auth_request.enc_client_session_key = enc_client_session_key
         auth_request.enc_password = enc_password
-
+        auth_request.enc_client_session_key = enc_client_session_key
+        auth_request.add_parameter("AUTH_TERMINAL", "unknown")
         return auth_request
       end
 

data/lib/net/tti/connection.rb

@@ -7,13 +7,23 @@ module Net
       attr_accessor :platform
       attr_accessor :architecture
       attr_accessor :ttc_version
+      attr_accessor :ttc_server
       attr_accessor :tns_version
+      attr_accessor :character_set
+      attr_accessor :server_flags
+      attr_accessor :server_compiletime_capabilities
+      attr_accessor :server_runtime_capabilities
 
       def to_s
         return "Platform: #{@platform||nil}" +
           "; Architecture: #{@architecture||nil}" +
-          "; TTC? Version: #{@ttc_version||nil}" +
-          "; TNS Version: #{@tns_version||nil}"
+          "; TNS Version: #{@tns_version||nil}" +
+          "; TTC server version: #{@ttc_version||nil}" +
+          "; TTC server string: #{@ttc_server||nil}" +
+          "; Server character set: #{@character_set||nil}" +
+          "; Server flags: #{@server_flags||nil}" +
+          "; Server Compiletime Capabilities: #{@server_compiletime_capabilities.to_hexified_s}" +
+          "; Server Runtime Capabilities: #{@server_runtime_capabilities.to_hexified_s}"
       end
     end
 
@@ -39,7 +49,7 @@ module Net
         proto_nego_response.populate_connection_parameters( @conn_params )
 
         Net::TTI.logger.debug("Sending data type negotiation request")
-        dt_nego_request = DataTypeNegotiationRequest.create_request( @conn_params.platform )
+        dt_nego_request = DataTypeNegotiationRequest.create_request( @conn_params )
         dt_nego_response_raw = send_and_receive( dt_nego_request )
 
         return nil
@@ -61,7 +71,7 @@ module Net
         Net::TTI.logger.debug( "Connection#send_tti_message called with #{raw_message.length}-byte #{tti_message.class} message" )
 
         # Split the message into multiple packets if necessary
-        max_data = Net::TNS::DataPacket.max_data_length
+        max_data = @tns_connection.tns_sdu - 12 # 12 = 10 (HEADER) + 2 (FLAGS)
         raw_message.scan(/.{1,#{max_data}}/m).each do |raw_message_part|
           tns_packet = Net::TNS::DataPacket.new()
           tns_packet.data = raw_message_part
@@ -79,7 +89,7 @@ module Net
         while ( true )
           receive_count += 1
           if ( receive_count >= 3 )
-            raise Exceptions::TNSException.new( "Maximum receive attempts exceeded - too many Markers received." )
+            raise Exceptions::ProtocolException.new( "Maximum receive attempts exceeded - too many Markers received." )
           end
 
           Net::TTI.logger.debug("Attempting to receive packet (try ##{receive_count})")
@@ -90,7 +100,7 @@ module Net
             # carried into an additional packet. We wouldn't need to do this if
             # we could fully parse every message (or at least know lengths to
             # read). I'm looking at you, DataTypeNegotiationResponse.
-            if tns_packet.num_bytes > 2000
+            if @tns_connection.tns_protocol_version <= 313 && tns_packet.num_bytes > 1900
               begin
                 max_message_length -= message_data.length
                 message_data += receive_tti_message(waiting_for_error_message, max_message_length)

data/lib/net/tti/data_types/chunked_string.rb

@@ -47,6 +47,7 @@ module Net
               value_index += MAX_CHUNK_LENGTH
             end
             binary_string << [MULTI_CHUNK_TERMINATOR].pack("C")
+            return binary_string
           else
             return [value.length, value].pack("Ca*")
           end

data/lib/net/tti/data_types/flags.rb

@@ -0,0 +1,36 @@
+require "bindata"
+
+module Net
+  module TTI
+    module DataTypes
+      class Flags < BinData::Primitive
+        uint8 :value_length
+        choice :flag_value, :selection => :value_length do
+          virtual  0, :value => 0
+          uint8    1
+          uint16be 2
+          uint32be 4
+        end
+
+        def get
+          self.flag_value.to_i
+        end
+
+        def set(new_value)
+          if new_value > 0xffff
+            self.value_length = 4
+            self.flag_value = new_value
+          elsif new_value > 0xff
+            self.value_length = 2
+            self.flag_value = new_value
+          elsif new_value > 0
+            self.value_length = 1
+            self.flag_value = new_value
+          else
+            self.value_length = 0
+          end
+        end
+      end
+    end
+  end
+end

data/lib/net/tti/data_types/key_value_pair.rb

@@ -1,24 +1,24 @@
 require "bindata"
 require "net/tti/data_types/chunked_string"
+require "net/tti/data_types/flags"
 
 module Net
   module TTI
     module DataTypes
       class KeyValuePair < BinData::Record
-        # In earlier dialects, the 4 bytes before the strings appeared to contain
-        # the total length of the string. In more recent dialects, this no longer
-        # seems to be the case. However, a 32-bit null here still appears to
-        # signal that there is no value.
-        uint32le        :unknown1, :value => lambda {kvp_key.length}
-        chunked_string  :kvp_key, :onlyif => lambda {unknown1 != 0}
-        uint32le        :unknown2, :value => lambda {kvp_value.length}
-        chunked_string  :kvp_value, :onlyif => lambda {unknown2 != 0}
-        uint32le        :flags
-
-        def set(key, value)
-          self.kvp_key.data = key
-          self.kvp_value.data = value
-        end
+        # Follows (simplified) format used by JDBC driver; other clients send
+        # KVPs with a longer, more opaque structure (e.g. each chunked string
+        # was preceded by a 4-byte value that, in earlier dialects appeared to
+        # contain the total length of the string, but in later dialects did not
+        # seem related to string length at all).
+        uint8           :unknown1,         :initial_value => 0x01 # size in bytes of kvp_key_length OR boolean
+        uint8           :kvp_key_length,   :onlyif => lambda {unknown1 != 0x00}, :value => lambda {kvp_key.length}
+        chunked_string  :kvp_key,          :onlyif => lambda {unknown1 != 0x00 && kvp_key_length != 0x00}
+        uint8           :unknown2,         :initial_value => 0x01 # size in bytes of kvp_value_length
+        uint8           :kvp_value_length, :onlyif => lambda {unknown2 != 0x00}, :value => lambda {kvp_value.length}
+        chunked_string  :kvp_value,        :onlyif => lambda {unknown2 != 0x00 && kvp_value_length != 0x00}
+        # flags are used when AUTH_SESSKEY and AUTH_ALTER_SESSION are sent to the server
+        flags        :flags
       end
     end
   end

data/lib/net/tti/exceptions.rb

@@ -9,6 +9,12 @@ module Net::TTI
     class UnsupportedTarget < TTIException
     end
 
+    class UnsupportedArchitecture < TTIException
+      def initialize( architecture )
+        super( "Unsupported architecture: #{architecture}" )
+      end
+    end
+
     class UnsupportedPlatform < UnsupportedTarget
       def initialize( platform )
         super( "Unsupported platform: #{platform}" )

data/lib/net/tti/message.rb

@@ -32,8 +32,8 @@ module Net
 
       def self.from_data_string( raw_message )
         ttc_code = raw_message[0].unpack("C").first
-
-        unless message_class = @@ttc_classes[ ttc_code ]
+        
+        unless message_class = @@ttc_classes[ttc_code]
           raise Net::TNS::Exceptions::TNSException.new( "Unknown TTC code: #{ttc_code}" )
         end
 

data/lib/net/tti/messages/data_type_negotiation_request.rb

@@ -1,3 +1,5 @@
+require "net/tti/capabilities"
+
 module Net
   module TTI
     class DataTypeNegotiationRequest < Message
@@ -10,115 +12,64 @@ module Net
       #  0x0369 (873) - UTF-8
       uint16le  :charset1
       uint16le  :charset2
-      uint8     :unknown1
-      uint8     :unknown2_length, :value => lambda { unknown2.length }
+      uint8     :client_flags
+      uint8     :client_compiletime_capabilities_length, :value => lambda { client_compiletime_capabilities.length }
+      string    :client_compiletime_capabilities
+      uint8     :client_runtime_capabilities_length, :value => lambda { client_runtime_capabilities.length }
+      string    :client_runtime_capabilities
+      string    :unknown1
       string    :unknown2
-      uint8     :unknown3_length, :value => lambda { unknown3.length }
-      string    :unknown3
-      string    :unknown4
-
-      UNKNOWN4_LINUX = (
-        "800000003c3c3c80000000d007000100010001000000020002000a0000000800" +
-        "0800010000000c000c000a000000170017000100000018001800010000001900" +
-        "190018001900010000001a001a0019001a00010000001b001b000a001b000100" +
-        "00001c001c0016001c00010000001d001d0017001d00010000001e001e001700" +
-        "1e00010000001f001f0019001f0001000000200020000a002000010000002100" +
-        "21000a002100010000000a000a00010000000b000b0001000000280028000100" +
-        "0000290029000100000075007500010000007800780001000001220122000100" +
-        "0001230123000101230001000001240124000100000125012500010000012601" +
-        "2600010000012a012a00010000012b012b00010000012c012c00010000012d01" +
-        "2d00010000012e012e00010000012f012f000100000130013000010000013101" +
-        "3100010000013201320001000001330133000100000134013400010000013501" +
-        "3500010000013601360001000001370137000100000138013800010000013901" +
-        "3900010000013b013b00010000013c013c00010000013d013d00010000013e01" +
-        "3e00010000013f013f0001000001400140000100000141014100010000014201" +
-        "4200010000014301430001000001470147000100000148014800010000014901" +
-        "4900010000014b014b00010000014d014d00010000014e014e00010000014f01" +
-        "4f00010000015001500001000001510151000100000152015200010000015301" +
-        "5300010000015401540001000001550155000100000156015600010000015701" +
-        "57000101570001000001580158000100000159015900010000015a015a000100" +
-        "00015c015c00010000015d015d00010000016201620001000001630163000100" +
-        "000167016700010000016b016b00010000017c017c0001014200010000017d01" +
-        "7d00010000017e017e00010000017f017f000100000180018000010000018101" +
-        "8100010000018201820001000001830183000100000184018400010000018501" +
-        "8500010000018601860001000001870187000100000189018900010000018a01" +
-        "8a00010000018b018b00010000018c018c00010000018d018d00010000018e01" +
-        "8e00010000018f018f0001000001900190000100000191019100010000019401" +
-        "9400010125000100000195019500010000019601960001000001970197000100" +
-        "00019d019d00010000019e019e00010000019f019f0001000001a001a0000100" +
-        "0001a101a10001000001a201a20001000001a301a30001000001a401a4000100" +
-        "0001a501a50001000001a601a60001000001a701a70001000001a801a8000100" +
-        "0001a901a90001000001aa01aa0001000001ab01ab0001000001ad01ad000100" +
-        "0001ae01ae0001000001af01af0001000001b001b00001000001b101b1000100" +
-        "0001c101c10001000001c201c2000101250001000001c601c60001000001c701" +
-        "c70001000001c801c80001000001c901c90001000001ca01ca0001019f000100" +
-        "0001cb01cb000101a00001000001cc01cc000101a20001000001cd01cd000101" +
-        "a30001000001ce01ce000101b10001000001cf01cf000101220001000001d201" +
-        "d20001000001d301d3000101ab0001000001d401d40001000001d501d5000100" +
-        "0001d601d60001000001d701d70001000001d801d80001000001d901d9000100" +
-        "0001da01da0001000001db01db0001000001dc01dc0001000001dd01dd000100" +
-        "0001de01de0001000001df01df0001000001e001e00001000001e101e1000100" +
-        "0001e201e20001000001e301e30001016b0001000001e401e40001000001e501" +
-        "e50001000001e601e60001000001ea01ea0001000001eb01eb0001000001ec01" +
-        "ec0001000001ed01ed0001000001ee01ee0001000001ef01ef0001000001f001" +
-        "f00001000001f201f20001000001f301f30001000001f401f40001000001f501" +
-        "f50001000001f601f60001000001fd01fd0001000001fe01fe00010000020102" +
-        "0100010000020202020001000002040204000100000205020500010000020602" +
-        "0600010000020702070001000002080208000100000209020900010000020a02" +
-        "0a00010000020b020b00010000020c020c00010000020d020d00010000020e02" +
-        "0e00010000020f020f0001000002100210000100000211021100010000021202" +
-        "1200010000021302130001000002140214000100000215021500010000021602" +
-        "1600010000021702170001000002180218000100000219021900010000021a02" +
-        "1a00010000021b021b00010000021c021c00010000021d021d00010000021e02" +
-        "1e00010000021f021f0001000002200220000100000221022100010000022202" +
-        "2200010000022302230001000002240224000100000225022500010000022602" +
-        "2600010000022702270001000002280228000100000229022900010000022a02" +
-        "2a00010000022b022b00010000022c022c00010000022d022d00010000022e02" +
-        "2e00010000022f022f0001000002310231000100000232023200010000023302" +
-        "3300010000023402340001000002370237000100000238023800010000023902" +
-        "3900010000023a023a00010000023b023b00010000023c023c00010000023d02" +
-        "3d00010000023e023e00010000023f023f000100000240024000010000024102" +
-        "4100010000024202420001000002430243000100000244024400010000024502" +
-        "4500010000024602460001000002470247000100000248024800010000024902" +
-        "490001000000030002000a000000040002000a00000005000100010000000600" +
-        "02000a000000070002000a00000009000100010000000d0000000e0000000f00" +
-        "1700010000001000000011000000120000001300000014000000150000001600" +
-        "00002700780001015d0001012600010000003a003a0001000000440002000a00" +
-        "000045000000460000004a006d00010000004c0000005b0002000a0000005e00" +
-        "0100010000005f00170001000000600060000100000061006000010000006400" +
-        "6400010000006500650001000000660066000100000068000000690000006a00" +
-        "6a00010000006c006d00010000006d006d00010000006e006f00010000006f00" +
-        "6f00010000007000700001000000710071000100000072007200010000007300" +
-        "7300010000007400660001000000760000007700000079007900010000007a00" +
-        "7a00010000007b007b0001000000880000009200920001000000930093000100" +
-        "0000980002000a000000990002000a0000009a0002000a0000009b0001000100" +
-        "00009c000c000a000000ac0002000a000000b200b20001000000b300b3000100" +
-        "0000b400b40001000000b500b50001000000b600b60001000000b700b7000100" +
-        "0000b8000c000a000000b900b20001000000ba00b30001000000bb00b4000100" +
-        "0000bc00b50001000000bd00b60001000000be00b70001000000bf000000c000" +
-        "0000c300700001000000c400710001000000c500720001000000d000d0000100" +
-        "0000d1000000e700e70001000000e800e70001000000e900e90001000000f100" +
-        "6d0001000002030203000100000000").tns_unhexify
+      string    :dty_body
+      string    :fin
 
       def _ttc_code()
         TTC_CODE_DATA_TYPE_NEGOTIATION
       end
       private :_ttc_code
 
-      def self.create_request(platform)
+      def self.create_request(conn_params)
         request = self.new
-        request.character_set = 0x00b2
-        request.unknown1 = 0x02
-        request.unknown2 = "060101010d01010401010101010101ffff0308030001003f01073f010101010301".tns_unhexify
-        request.unknown3 = "0201000018".tns_unhexify
+        request.character_set = conn_params.character_set
+        request.client_flags = conn_params.server_flags
+
+        client_ct_caps = Capabilities.from_binary_string( "060100000a0101060101010101010029900307030001004f013704010000000c000006000383".tns_unhexify )
+        client_rt_caps = Capabilities.from_binary_string( "02010000000001".tns_unhexify )
+
+        if(conn_params.server_runtime_capabilities.length <=1 or conn_params.server_runtime_capabilities[1] & 1 != 1)
+          client_rt_caps[1] &= 254
+        end
+
+        if(conn_params.server_compiletime_capabilities.length <= 37 or conn_params.server_compiletime_capabilities[37] & 2 != 2)
+          client_rt_caps[1] &= 254
+          client_ct_caps[37] &= 253
+        end
+
+        if(conn_params.server_compiletime_capabilities.length <= 27 or conn_params.server_compiletime_capabilities[27] == 0)
+          client_ct_caps[27] = 0
+        end
+
+        request.client_compiletime_capabilities = client_ct_caps.to_binary_s
+        request.client_runtime_capabilities = client_rt_caps.to_binary_s
+
+        if (client_rt_caps[1] & 1 == 1)
+          request.unknown1 = "800000003c3c8000000000".tns_unhexify
+          if(client_ct_caps[37] & 2 == 2)
+            request.unknown2 = "00000000".tns_unhexify
+          end
+        end
+
+        if(conn_params.server_compiletime_capabilities.length <= 7 or conn_params.server_compiletime_capabilities[7] != 5)
+          dty_body_bytes = [0x01, 0x01, 0x01, 0x00, 0x02, 0x02, 0x0a, 0x00, 0x08, 0x08, 0x01, 0x00, 0x0c, 0x0c, 0x0a, 0x00, 0x17, 0x17, 0x01, 0x00, 0x18, 0x18, 0x01, 0x00, 0x19, 0x19, 0x01, 0x00, 0x1a, 0x1a, 0x01, 0x00, 0x1b, 0x1b, 0x01, 0x00, 0x1c, 0x1c, 0x01, 0x00, 0x1d, 0x1d, 0x01, 0x00, 0x1e, 0x1e, 0x01, 0x00, 0x1f, 0x1f, 0x01, 0x00, 0x20, 0x20, 0x01, 0x00, 0x21, 0x21, 0x01, 0x00, 0x0a, 0x0a, 0x01, 0x00, 0xb, 0xb, 0x01, 0x00, 0x28, 0x28, 0x01, 0x00, 0x29, 0x29, 0x01, 0x00, 0x75, 0x75, 0x01, 0x00, 0x78, 0x78, 0x01, 0x00, 0x122, 0x122, 0x01, 0x00, 0x123, 0x123, 0x01, 0x00, 0x124, 0x124, 0x01, 0x00, 0x125, 0x125, 0x01, 0x00, 0x126, 0x126, 0x01, 0x00, 0x12a, 0x12a, 0x01, 0x00, 0x12b, 0x12b, 0x01, 0x00, 0x12c, 0x12c, 0x01, 0x00, 0x12d, 0x12d, 0x01, 0x00, 0x12e, 0x12e, 0x01, 0x00, 0x12f, 0x12f, 0x01, 0x00, 0x130, 0x130, 0x01, 0x00, 0x131, 0x131, 0x01, 0x00, 0x132, 0x132, 0x01, 0x00, 0x133, 0x133, 0x01, 0x00, 0x134, 0x134, 0x01, 0x00, 0x135, 0x135, 0x01, 0x00, 0x136, 0x136, 0x01, 0x00, 0x137, 0x137, 0x01, 0x00, 0x138, 0x138, 0x01, 0x00, 0x139, 0x139, 0x01, 0x00, 0x13b, 0x13b, 0x01, 0x00, 0x13c, 0x13c, 0x01, 0x00, 0x13d, 0x13d, 0x01, 0x00, 0x13e, 0x13e, 0x01, 0x00, 0x13f, 0x13f, 0x01, 0x00, 0x140, 0x140, 0x01, 0x00, 0x141, 0x141, 0x01, 0x00, 0x142, 0x142, 0x01, 0x00, 0x143, 0x143, 0x01, 0x00, 0x147, 0x147, 0x01, 0x00, 0x148, 0x148, 0x01, 0x00, 0x149, 0x149, 0x01, 0x00, 0x14b, 0x14b, 0x01, 0x00, 0x14d, 0x14d, 0x01, 0x00, 0x14e, 0x14e, 0x01, 0x00, 0x14f, 0x14f, 0x01, 0x00, 0x150, 0x150, 0x01, 0x00, 0x151, 0x151, 0x01, 0x00, 0x152, 0x152, 0x01, 0x00, 0x153, 0x153, 0x01, 0x00, 0x154, 0x154, 0x01, 0x00, 0x155, 0x155, 0x01, 0x00, 0x156, 0x156, 0x01, 0x00, 0x157, 0x157, 0x01, 0x00, 0x158, 0x158, 0x01, 0x00, 0x159, 0x159, 0x01, 0x00, 0x15a, 0x15a, 0x01, 0x00, 0x15c, 0x15c, 0x01, 0x00, 0x15d, 0x15d, 0x01, 0x00, 0x162, 0x162, 0x01, 0x00, 0x163, 0x163, 0x01, 0x00, 0x167, 0x167, 0x01, 0x00, 0x16b, 0x16b, 0x01, 0x00, 0x17c, 0x17c, 0x01, 0x00, 0x17d, 0x17d, 0x01, 0x00, 0x17e, 0x17e, 0x01, 0x00, 0x17f, 0x17f, 0x01, 0x00, 0x180, 0x180, 0x01, 0x00, 0x181, 0x181, 0x01, 0x00, 0x182, 0x182, 0x01, 0x00, 0x183, 0x183, 0x01, 0x00, 0x184, 0x184, 0x01, 0x00, 0x185, 0x185, 0x01, 0x00, 0x186, 0x186, 0x01, 0x00, 0x187, 0x187, 0x01, 0x00, 0x189, 0x189, 0x01, 0x00, 0x18a, 0x18a, 0x01, 0x00, 0x18b, 0x18b, 0x01, 0x00, 0x18c, 0x18c, 0x01, 0x00, 0x18d, 0x18d, 0x01, 0x00, 0x18e, 0x18e, 0x01, 0x00, 0x18f, 0x18f, 0x01, 0x00, 0x190, 0x190, 0x01, 0x00, 0x191, 0x191, 0x01, 0x00, 0x194, 0x194, 0x01, 0x00, 0x195, 0x195, 0x01, 0x00, 0x196, 0x196, 0x01, 0x00, 0x197, 0x197, 0x01, 0x00, 0x19d, 0x19d, 0x01, 0x00, 0x19e, 0x19e, 0x01, 0x00, 0x19f, 0x19f, 0x01, 0x00, 0x1a0, 0x1a0, 0x01, 0x00, 0x1a1, 0x1a1, 0x01, 0x00, 0x1a2, 0x1a2, 0x01, 0x00, 0x1a3, 0x1a3, 0x01, 0x00, 0x1a4, 0x1a4, 0x01, 0x00, 0x1a5, 0x1a5, 0x01, 0x00, 0x1a6, 0x1a6, 0x01, 0x00, 0x1a7, 0x1a7, 0x01, 0x00, 0x1a8, 0x1a8, 0x01, 0x00, 0x1a9, 0x1a9, 0x01, 0x00, 0x1aa, 0x1aa, 0x01, 0x00, 0x1ab, 0x1ab, 0x01, 0x00, 0x1ad, 0x1ad, 0x01, 0x00, 0x1ae, 0x1ae, 0x01, 0x00, 0x1af, 0x1af, 0x01, 0x00, 0x1b0, 0x1b0, 0x01, 0x00, 0x1b1, 0x1b1, 0x01, 0x00, 0x1c1, 0x1c1, 0x01, 0x00, 0x1c2, 0x1c2, 0x01, 0x00, 0x1c6, 0x1c6, 0x01, 0x00, 0x1c7, 0x1c7, 0x01, 0x00, 0x1c8, 0x1c8, 0x01, 0x00, 0x1c9, 0x1c9, 0x01, 0x00, 0x1ca, 0x1ca, 0x01, 0x00, 0x1cb, 0x1cb, 0x01, 0x00, 0x1cc, 0x1cc, 0x01, 0x00, 0x1cd, 0x1cd, 0x01, 0x00, 0x1ce, 0x1ce, 0x01, 0x00, 0x1cf, 0x1cf, 0x01, 0x00, 0x1d2, 0x1d2, 0x01, 0x00, 0x1d3, 0x1d3, 0x01, 0x00, 0x1d4, 0x1d4, 0x01, 0x00, 0x1d5, 0x1d5, 0x01, 0x00, 0x1d6, 0x1d6, 0x01, 0x00, 0x1d7, 0x1d7, 0x01, 0x00, 0x1d8, 0x1d8, 0x01, 0x00, 0x1d9, 0x1d9, 0x01, 0x00, 0x1da, 0x1da, 0x01, 0x00, 0x1db, 0x1db, 0x01, 0x00, 0x1dc, 0x1dc, 0x01, 0x00, 0x1dd, 0x1dd, 0x01, 0x00, 0x1de, 0x1de, 0x01, 0x00, 0x1df, 0x1df, 0x01, 0x00, 0x1e0, 0x1e0, 0x01, 0x00, 0x1e1, 0x1e1, 0x01, 0x00, 0x1e2, 0x1e2, 0x01, 0x00, 0x1e3, 0x1e3, 0x01, 0x00, 0x1e4, 0x1e4, 0x01, 0x00, 0x1e5, 0x1e5, 0x01, 0x00, 0x1e6, 0x1e6, 0x01, 0x00, 0x1ea, 0x1ea, 0x01, 0x00, 0x1eb, 0x1eb, 0x01, 0x00, 0x1ec, 0x1ec, 0x01, 0x00, 0x1ed, 0x1ed, 0x01, 0x00, 0x1ee, 0x1ee, 0x01, 0x00, 0x1ef, 0x1ef, 0x01, 0x00, 0x1f0, 0x1f0, 0x01, 0x00, 0x1f2, 0x1f2, 0x01, 0x00, 0x1f3, 0x1f3, 0x01, 0x00, 0x1f4, 0x1f4, 0x01, 0x00, 0x1f5, 0x1f5, 0x01, 0x00, 0x1f6, 0x1f6, 0x01, 0x00, 0x1fd, 0x1fd, 0x01, 0x00, 0x1fe, 0x1fe, 0x01, 0x00, 0x201, 0x201, 0x01, 0x00, 0x202, 0x202, 0x01, 0x00, 0x204, 0x204, 0x01, 0x00, 0x205, 0x205, 0x01, 0x00, 0x206, 0x206, 0x01, 0x00, 0x207, 0x207, 0x01, 0x00, 0x208, 0x208, 0x01, 0x00, 0x209, 0x209, 0x01, 0x00, 0x20a, 0x20a, 0x01, 0x00, 0x20b, 0x20b, 0x01, 0x00, 0x20c, 0x20c, 0x01, 0x00, 0x20d, 0x20d, 0x01, 0x00, 0x20e, 0x20e, 0x01, 0x00, 0x20f, 0x20f, 0x01, 0x00, 0x210, 0x210, 0x01, 0x00, 0x211, 0x211, 0x01, 0x00, 0x212, 0x212, 0x01, 0x00, 0x213, 0x213, 0x01, 0x00, 0x214, 0x214, 0x01, 0x00, 0x215, 0x215, 0x01, 0x00, 0x216, 0x216, 0x01, 0x00, 0x217, 0x217, 0x01, 0x00, 0x218, 0x218, 0x01, 0x00, 0x219, 0x219, 0x01, 0x00, 0x21a, 0x21a, 0x01, 0x00, 0x21b, 0x21b, 0x01, 0x00, 0x21c, 0x21c, 0x01, 0x00, 0x21d, 0x21d, 0x01, 0x00, 0x21e, 0x21e, 0x01, 0x00, 0x21f, 0x21f, 0x01, 0x00, 0x230, 0x230, 0x01, 0x00, 0x235, 0x235, 0x01, 0x00, 0x23c, 0x23c, 0x01, 0x00, 0x23d, 0x23d, 0x01, 0x00, 0x23e, 0x23e, 0x01, 0x00, 0x23f, 0x23f, 0x01, 0x00, 0x240, 0x240, 0x01, 0x00, 0x242, 0x242, 0x01, 0x00, 0x244, 0x244, 0x01, 0x00, 0x245, 0x245, 0x01, 0x00, 0x246, 0x246, 0x01, 0x00, 0x247, 0x247, 0x01, 0x00, 0x248, 0x248, 0x01, 0x00, 0x249, 0x249, 0x01, 0x00, 0x3, 0x02, 0x0a, 0x00, 0x4, 0x02, 0x0a, 0x00, 0x5, 0x01, 0x01, 0x00, 0x6, 0x02, 0x0a, 0x00, 0x7, 0x02, 0x0a, 0x00, 0x9, 0x01, 0x01, 0x00, 0xd, 0x00, 0xe, 0x00, 0xf, 0x17, 0x01, 0x00, 0x10, 0x00, 0x11, 0x00, 0x12, 0x00, 0x13, 0x00, 0x14, 0x00, 0x15, 0x00, 0x16, 0x00, 0x27, 0x78, 0x01, 0x00, 0x3a, 0x00, 0x44, 0x02, 0x0a, 0x00, 0x45, 0x00, 0x46, 0x00, 0x4a, 0x00, 0x4c, 0x00, 0x5b, 0x02, 0x0a, 0x00, 0x5e, 0x01, 0x01, 0x00, 0x5f, 0x17, 0x01, 0x00, 0x60, 0x60, 0x01, 0x00, 0x61, 0x60, 0x01, 0x00, 0x64, 0x64, 0x01, 0x00, 0x65, 0x65, 0x01, 0x00, 0x66, 0x66, 0x01, 0x00, 0x68, 0xb, 0x01, 0x00, 0x69, 0x00, 0x6a, 0x6a, 0x01, 0x00, 0x6c, 0x6d, 0x01, 0x00, 0x6d, 0x6d, 0x01, 0x00, 0x6e, 0x6f, 0x01, 0x00, 0x6f, 0x6f, 0x01, 0x00, 0x70, 0x70, 0x01, 0x00, 0x71, 0x71, 0x01, 0x00, 0x72, 0x72, 0x01, 0x00, 0x73, 0x73, 0x01, 0x00, 0x74, 0x66, 0x01, 0x00, 0x76, 0x00, 0x77, 0x00, 0x79, 0x00, 0x7a, 0x00, 0x7b, 0x00, 0x88, 0x00, 0x92, 0x92, 0x01, 0x00, 0x93, 0x00, 0x98, 0x02, 0x0a, 0x00, 0x99, 0x02, 0x0a, 0x00, 0x9a, 0x02, 0x0a, 0x00, 0x9b, 0x01, 0x01, 0x00, 0x9c, 0x0c, 0x0a, 0x00, 0xac, 0x02, 0x0a, 0x00, 0xb2, 0xb2, 0x01, 0x00, 0xb3, 0xb3, 0x01, 0x00, 0xb4, 0xb4, 0x01, 0x00, 0xb5, 0xb5, 0x01, 0x00, 0xb6, 0xb6, 0x01, 0x00, 0xb7, 0xb7, 0x01, 0x00, 0xb8, 0x0c, 0x0a, 0x00, 0xb9, 0xb9, 0x01, 0x00, 0xba, 0xba, 0x01, 0x00, 0xbb, 0xbb, 0x01, 0x00, 0xbc, 0xbc, 0x01, 0x00, 0xbd, 0xbd, 0x01, 0x00, 0xbe, 0xbe, 0x01, 0x00, 0xbf, 0x00, 0xc0, 0x00, 0xc3, 0x70, 0x01, 0x00, 0xc4, 0x71, 0x01, 0x00, 0xc5, 0x72, 0x01, 0x00, 0xd0, 0xd0, 0x01, 0x00, 0xd1, 0x00, 0xe7, 0xe7, 0x01, 0x00, 0xe8, 0xe7, 0x01, 0x00, 0xe9, 0xe9, 0x01, 0x00, 0xf1, 0x6d, 0x01, 0x00, 0x203, 0x00, 0x24e, 0x24e, 0x01, 0x00, 0x24f, 0x24f, 0x01, 0x00, 0x250, 0x250, 0x01, 0x00]
+        else
+          dty_body_bytes = [0x01, 0x01, 0x01, 0x00, 0x02, 0x02, 0x0a, 0x00, 0x08, 0x08, 0x01, 0x00, 0x0c, 0x0c, 0x0a, 0x00, 0x17, 0x17, 0x01, 0x00, 0x18, 0x18, 0x01, 0x00, 0x19, 0x19, 0x01, 0x00, 0x1a, 0x1a, 0x01, 0x00, 0x1b, 0x1b, 0x01, 0x00, 0x1c, 0x1c, 0x01, 0x00, 0x1d, 0x1d, 0x01, 0x00, 0x1e, 0x1e, 0x01, 0x00, 0x1f, 0x1f, 0x01, 0x00, 0x20, 0x20, 0x01, 0x00, 0x21, 0x21, 0x01, 0x00, 0x0a, 0x0a, 0x01, 0x00, 0xb, 0xb, 0x01, 0x00, 0x28, 0x28, 0x01, 0x00, 0x29, 0x29, 0x01, 0x00, 0x75, 0x75, 0x01, 0x00, 0x78, 0x78, 0x01, 0x00, 0x122, 0x122, 0x01, 0x00, 0x123, 0x123, 0x01, 0x00, 0x124, 0x124, 0x01, 0x00, 0x125, 0x125, 0x01, 0x00, 0x126, 0x126, 0x01, 0x00, 0x12a, 0x12a, 0x01, 0x00, 0x12b, 0x12b, 0x01, 0x00, 0x12c, 0x12c, 0x01, 0x00, 0x12d, 0x12d, 0x01, 0x00, 0x12e, 0x12e, 0x01, 0x00, 0x12f, 0x12f, 0x01, 0x00, 0x130, 0x130, 0x01, 0x00, 0x131, 0x131, 0x01, 0x00, 0x132, 0x132, 0x01, 0x00, 0x133, 0x133, 0x01, 0x00, 0x134, 0x134, 0x01, 0x00, 0x135, 0x135, 0x01, 0x00, 0x136, 0x136, 0x01, 0x00, 0x137, 0x137, 0x01, 0x00, 0x138, 0x138, 0x01, 0x00, 0x139, 0x139, 0x01, 0x00, 0x13b, 0x13b, 0x01, 0x00, 0x13c, 0x13c, 0x01, 0x00, 0x13d, 0x13d, 0x01, 0x00, 0x13e, 0x13e, 0x01, 0x00, 0x13f, 0x13f, 0x01, 0x00, 0x140, 0x140, 0x01, 0x00, 0x141, 0x141, 0x01, 0x00, 0x142, 0x142, 0x01, 0x00, 0x143, 0x143, 0x01, 0x00, 0x147, 0x147, 0x01, 0x00, 0x148, 0x148, 0x01, 0x00, 0x149, 0x149, 0x01, 0x00, 0x14b, 0x14b, 0x01, 0x00, 0x14d, 0x14d, 0x01, 0x00, 0x14e, 0x14e, 0x01, 0x00, 0x14f, 0x14f, 0x01, 0x00, 0x150, 0x150, 0x01, 0x00, 0x151, 0x151, 0x01, 0x00, 0x152, 0x152, 0x01, 0x00, 0x153, 0x153, 0x01, 0x00, 0x154, 0x154, 0x01, 0x00, 0x155, 0x155, 0x01, 0x00, 0x156, 0x156, 0x01, 0x00, 0x157, 0x157, 0x01, 0x00, 0x158, 0x158, 0x01, 0x00, 0x159, 0x159, 0x01, 0x00, 0x15a, 0x15a, 0x01, 0x00, 0x15c, 0x15c, 0x01, 0x00, 0x15d, 0x15d, 0x01, 0x00, 0x162, 0x162, 0x01, 0x00, 0x163, 0x163, 0x01, 0x00, 0x167, 0x167, 0x01, 0x00, 0x16b, 0x16b, 0x01, 0x00, 0x17c, 0x17c, 0x01, 0x00, 0x17d, 0x17d, 0x01, 0x00, 0x17e, 0x17e, 0x01, 0x00, 0x17f, 0x17f, 0x01, 0x00, 0x180, 0x180, 0x01, 0x00, 0x181, 0x181, 0x01, 0x00, 0x182, 0x182, 0x01, 0x00, 0x183, 0x183, 0x01, 0x00, 0x184, 0x184, 0x01, 0x00, 0x185, 0x185, 0x01, 0x00, 0x186, 0x186, 0x01, 0x00, 0x187, 0x187, 0x01, 0x00, 0x189, 0x189, 0x01, 0x00, 0x18a, 0x18a, 0x01, 0x00, 0x18b, 0x18b, 0x01, 0x00, 0x18c, 0x18c, 0x01, 0x00, 0x18d, 0x18d, 0x01, 0x00, 0x18e, 0x18e, 0x01, 0x00, 0x18f, 0x18f, 0x01, 0x00, 0x190, 0x190, 0x01, 0x00, 0x191, 0x191, 0x01, 0x00, 0x194, 0x194, 0x01, 0x00, 0x195, 0x195, 0x01, 0x00, 0x196, 0x196, 0x01, 0x00, 0x197, 0x197, 0x01, 0x00, 0x19d, 0x19d, 0x01, 0x00, 0x19e, 0x19e, 0x01, 0x00, 0x19f, 0x19f, 0x01, 0x00, 0x1a0, 0x1a0, 0x01, 0x00, 0x1a1, 0x1a1, 0x01, 0x00, 0x1a2, 0x1a2, 0x01, 0x00, 0x1a3, 0x1a3, 0x01, 0x00, 0x1a4, 0x1a4, 0x01, 0x00, 0x1a5, 0x1a5, 0x01, 0x00, 0x1a6, 0x1a6, 0x01, 0x00, 0x1a7, 0x1a7, 0x01, 0x00, 0x1a8, 0x1a8, 0x01, 0x00, 0x1a9, 0x1a9, 0x01, 0x00, 0x1aa, 0x1aa, 0x01, 0x00, 0x1ab, 0x1ab, 0x01, 0x00, 0x1ad, 0x1ad, 0x01, 0x00, 0x1ae, 0x1ae, 0x01, 0x00, 0x1af, 0x1af, 0x01, 0x00, 0x1b0, 0x1b0, 0x01, 0x00, 0x1b1, 0x1b1, 0x01, 0x00, 0x1c1, 0x1c1, 0x01, 0x00, 0x1c2, 0x1c2, 0x01, 0x00, 0x1c6, 0x1c6, 0x01, 0x00, 0x1c7, 0x1c7, 0x01, 0x00, 0x1c8, 0x1c8, 0x01, 0x00, 0x1c9, 0x1c9, 0x01, 0x00, 0x1ca, 0x1ca, 0x01, 0x00, 0x1cb, 0x1cb, 0x01, 0x00, 0x1cc, 0x1cc, 0x01, 0x00, 0x1cd, 0x1cd, 0x01, 0x00, 0x1ce, 0x1ce, 0x01, 0x00, 0x1cf, 0x1cf, 0x01, 0x00, 0x1d2, 0x1d2, 0x01, 0x00, 0x1d3, 0x1d3, 0x01, 0x00, 0x1d4, 0x1d4, 0x01, 0x00, 0x1d5, 0x1d5, 0x01, 0x00, 0x1d6, 0x1d6, 0x01, 0x00, 0x1d7, 0x1d7, 0x01, 0x00, 0x1d8, 0x1d8, 0x01, 0x00, 0x1d9, 0x1d9, 0x01, 0x00, 0x1da, 0x1da, 0x01, 0x00, 0x1db, 0x1db, 0x01, 0x00, 0x1dc, 0x1dc, 0x01, 0x00, 0x1dd, 0x1dd, 0x01, 0x00, 0x1de, 0x1de, 0x01, 0x00, 0x1df, 0x1df, 0x01, 0x00, 0x1e0, 0x1e0, 0x01, 0x00, 0x1e1, 0x1e1, 0x01, 0x00, 0x1e2, 0x1e2, 0x01, 0x00, 0x1e3, 0x1e3, 0x01, 0x00, 0x1e4, 0x1e4, 0x01, 0x00, 0x1e5, 0x1e5, 0x01, 0x00, 0x1e6, 0x1e6, 0x01, 0x00, 0x1ea, 0x1ea, 0x01, 0x00, 0x1eb, 0x1eb, 0x01, 0x00, 0x1ec, 0x1ec, 0x01, 0x00, 0x1ed, 0x1ed, 0x01, 0x00, 0x1ee, 0x1ee, 0x01, 0x00, 0x1ef, 0x1ef, 0x01, 0x00, 0x1f0, 0x1f0, 0x01, 0x00, 0x1f2, 0x1f2, 0x01, 0x00, 0x1f3, 0x1f3, 0x01, 0x00, 0x1f4, 0x1f4, 0x01, 0x00, 0x1f5, 0x1f5, 0x01, 0x00, 0x1f6, 0x1f6, 0x01, 0x00, 0x1fd, 0x1fd, 0x01, 0x00, 0x1fe, 0x1fe, 0x01, 0x00, 0x201, 0x201, 0x01, 0x00, 0x202, 0x202, 0x01, 0x00, 0x204, 0x204, 0x01, 0x00, 0x205, 0x205, 0x01, 0x00, 0x206, 0x206, 0x01, 0x00, 0x207, 0x207, 0x01, 0x00, 0x208, 0x208, 0x01, 0x00, 0x209, 0x209, 0x01, 0x00, 0x20a, 0x20a, 0x01, 0x00, 0x20b, 0x20b, 0x01, 0x00, 0x20c, 0x20c, 0x01, 0x00, 0x20d, 0x20d, 0x01, 0x00, 0x20e, 0x20e, 0x01, 0x00, 0x20f, 0x20f, 0x01, 0x00, 0x210, 0x210, 0x01, 0x00, 0x211, 0x211, 0x01, 0x00, 0x212, 0x212, 0x01, 0x00, 0x213, 0x213, 0x01, 0x00, 0x214, 0x214, 0x01, 0x00, 0x215, 0x215, 0x01, 0x00, 0x216, 0x216, 0x01, 0x00, 0x217, 0x217, 0x01, 0x00, 0x218, 0x218, 0x01, 0x00, 0x219, 0x219, 0x01, 0x00, 0x21a, 0x21a, 0x01, 0x00, 0x21b, 0x21b, 0x01, 0x00, 0x21c, 0x21c, 0x01, 0x00, 0x21d, 0x21d, 0x01, 0x00, 0x21e, 0x21e, 0x01, 0x00, 0x21f, 0x21f, 0x01, 0x00, 0x230, 0x230, 0x01, 0x00, 0x235, 0x235, 0x01, 0x00, 0x23c, 0x23c, 0x01, 0x00, 0x23d, 0x23d, 0x01, 0x00, 0x23e, 0x23e, 0x01, 0x00, 0x23f, 0x23f, 0x01, 0x00, 0x240, 0x240, 0x01, 0x00, 0x242, 0x242, 0x01, 0x00, 0x244, 0x244, 0x01, 0x00, 0x245, 0x245, 0x01, 0x00, 0x246, 0x246, 0x01, 0x00, 0x247, 0x247, 0x01, 0x00, 0x248, 0x248, 0x01, 0x00, 0x249, 0x249, 0x01, 0x00, 0x3, 0x02, 0x0a, 0x00, 0x4, 0x02, 0x0a, 0x00, 0x5, 0x01, 0x01, 0x00, 0x6, 0x02, 0x0a, 0x00, 0x7, 0x02, 0x0a, 0x00, 0x9, 0x01, 0x01, 0x00, 0xd, 0x00, 0xe, 0x00, 0xf, 0x17, 0x01, 0x00, 0x10, 0x00, 0x11, 0x00, 0x12, 0x00, 0x13, 0x00, 0x14, 0x00, 0x15, 0x00, 0x16, 0x00, 0x27, 0x78, 0x01, 0x00, 0x3a, 0x00, 0x44, 0x02, 0x0a, 0x00, 0x45, 0x00, 0x46, 0x00, 0x4a, 0x00, 0x4c, 0x00, 0x5b, 0x02, 0x0a, 0x00, 0x5e, 0x01, 0x01, 0x00, 0x5f, 0x17, 0x01, 0x00, 0x60, 0x60, 0x01, 0x00, 0x61, 0x60, 0x01, 0x00, 0x64, 0x64, 0x01, 0x00, 0x65, 0x65, 0x01, 0x00, 0x66, 0x66, 0x01, 0x00, 0x68, 0xb, 0x01, 0x00, 0x69, 0x00, 0x6a, 0x6a, 0x01, 0x00, 0x6c, 0x6d, 0x01, 0x00, 0x6d, 0x6d, 0x01, 0x00, 0x6e, 0x6f, 0x01, 0x00, 0x6f, 0x6f, 0x01, 0x00, 0x70, 0x70, 0x01, 0x00, 0x71, 0x71, 0x01, 0x00, 0x72, 0x72, 0x01, 0x00, 0x73, 0x73, 0x01, 0x00, 0x74, 0x66, 0x01, 0x00, 0x76, 0x00, 0x77, 0x00, 0x79, 0x00, 0x7a, 0x00, 0x7b, 0x00, 0x88, 0x00, 0x92, 0x92, 0x01, 0x00, 0x93, 0x00, 0x98, 0x02, 0x0a, 0x00, 0x99, 0x02, 0x0a, 0x00, 0x9a, 0x02, 0x0a, 0x00, 0x9b, 0x01, 0x01, 0x00, 0x9c, 0x0c, 0x0a, 0x00, 0xac, 0x02, 0x0a, 0x00, 0xb2, 0xb2, 0x01, 0x00, 0xb3, 0xb3, 0x01, 0x00, 0xb4, 0xb4, 0x01, 0x00, 0xb5, 0xb5, 0x01, 0x00, 0xb6, 0xb6, 0x01, 0x00, 0xb7, 0xb7, 0x01, 0x00, 0xb8, 0x0c, 0x0a, 0x00, 0xb9, 0xb9, 0x01, 0x00, 0xba, 0xba, 0x01, 0x00, 0xbb, 0xbb, 0x01, 0x00, 0xbc, 0xbc, 0x01, 0x00, 0xbd, 0xbd, 0x01, 0x00, 0xbe, 0xbe, 0x01, 0x00, 0xbf, 0x00, 0xc0, 0x00, 0xc3, 0x70, 0x01, 0x00, 0xc4, 0x71, 0x01, 0x00, 0xc5, 0x72, 0x01, 0x00, 0xd0, 0xd0, 0x01, 0x00, 0xd1, 0x00, 0xe7, 0xe7, 0x01, 0x00, 0xe8, 0xe7, 0x01, 0x00, 0xe9, 0xe9, 0x01, 0x00, 0xf1, 0x6d, 0x01, 0x00, 0x203, 0x00]
+        end
 
-        case platform
-        when :linux
-          request.unknown4 = UNKNOWN4_LINUX
-        when :windows
-          request.unknown4 = "800000003c3c3c80000000d007".tns_unhexify
+        if(client_ct_caps[27] == 0)
+          request.dty_body = dty_body_bytes.map { |m| m & 0xff }.pack('C*')
+          request.fin = [0x00].pack('C')
         else
-          raise Net::TTI::Exceptions::UnsupportedPlatform.new( platform )
+          request.dty_body = dty_body_bytes.pack('n*')
+          request.fin = [0x00].pack('n')
         end
 
         return request

data/lib/net/tti/messages/error_message.rb

@@ -4,9 +4,16 @@ module Net
       handles_response_for_ttc_code TTC_CODE_ERROR
 
       # BinData fields
-      string    :unknown1,        :read_length => 6
-      uint16le  :unknown2
-      string    :unknown3,        :read_length => lambda { unknown2 == 0x01 ? 87 : 57 }
+
+      uint8     :ucaeocs_length
+      string    :ucaeocs,        :read_length => lambda { ucaeocs_length }
+      uint8     :oerrdd_length
+      string    :oerrdd,         :read_length => lambda { oerrdd_length }
+      uint8     :current_row_number_length
+      string    :current_row_number,  :read_length => lambda { current_row_number_length }
+      uint8     :retcode_length
+      string    :retcode,        :read_length => lambda { retcode_length }
+      string    :unknown1,       :read_length => 24
       uint8     :message_length
       string    :message,         :read_length => lambda { message_length }
     end

data/lib/net/tti/messages/function_calls/authentication.rb

@@ -3,30 +3,51 @@ require "net/tti/data_types"
 module Net
   module TTI
     class Authentication < FunctionCall
-      LOGON_MODE_PRE_AUTH   = 0x00000001
-      LOGON_MODE_AUTH       = 0x00000101
-
-      def self.create_pre_auth_request(target_architecture)
-        case target_architecture
-        when :x86
-          return PreAuthenticationX86.new
-        when :x64
-          return PreAuthenticationX64.new
-        else
-          raise Net::TTI::Exceptions::UnsupportedPlatform.new(target_architecture)
-        end
+      LOGON_MODE_PRE_AUTH   = 0x01
+      LOGON_MODE_AUTH       = 0x0101
+      uint8     :unknown1,              :initial_value => 0x01
+      uint8     :username_length_length, :initial_value => 0x01
+      uint8     :username_length,       :value => lambda { username.length }
+      uint8     :logon_mode_length,     :initial_value => lambda { _logon_mode_length }
+      choice    :logon_mode,            :selection => :_logon_mode do
+        uint8    LOGON_MODE_PRE_AUTH,   :initial_value => lambda { _logon_mode }
+        uint16le LOGON_MODE_AUTH,       :initial_value => lambda { _logon_mode }
+      end
+      uint8     :unknown2,              :initial_value => 0x01
+      uint8     :parameters_count_length, :initial_value => 0x01
+      uint8     :parameters_count,      :value => lambda {parameters.count}
+      uint8     :unknown3,              :initial_value => 0x01
+      uint8     :unknown4,              :initial_value => 0x01
+      string    :username
+      array     :parameters,   :type => :key_value_pair, :read_until => lambda {index == parameters_count - 1}
+
+      def _function_code
+        return FUNCTION_CODE_AUTH
       end
+      private :_function_code
 
-      def self.create_auth_request(target_architecture)
-        case target_architecture
-        when :x86
-          return AuthenticationX86.new
-        when :x64
-          return AuthenticationX64.new
-        else
-          raise Net::TTI::Exceptions::UnsupportedPlatform.new(target_architecture)
+      def _logon_mode
+        return Authentication::LOGON_MODE_AUTH
+      end
+      private :_logon_mode
+
+      def _logon_mode_length
+        case _logon_mode
+        when Authentication::LOGON_MODE_PRE_AUTH
+          return 1
+        when Authentication::LOGON_MODE_AUTH
+          return 2
         end
       end
+      private :_logon_mode
+
+      def self.create_pre_auth_request()
+        return PreAuthentication.new
+      end
+
+      def self.create_auth_request()
+        return Authentication.new
+      end
 
       def add_parameter( key, value, flags=0 )
         kvp = DataTypes::KeyValuePair.new( :kvp_key => key, :kvp_value => value, :flags => flags )
@@ -41,5 +62,17 @@ module Net
         add_parameter( "AUTH_PASSWORD", enc_password.tns_hexify.upcase )
       end
     end
+
+    class PreAuthentication < Authentication
+      def _function_code
+        return FUNCTION_CODE_PRE_AUTH
+      end
+      private :_function_code
+
+      def _logon_mode
+        return Authentication::LOGON_MODE_PRE_AUTH
+      end
+      private :_logon_mode
+    end
   end
 end

data/lib/net/tti/messages/function_calls/pre_authentication_response.rb

@@ -3,8 +3,9 @@ require "net/tti/data_types"
 module Net
   module TTI
     class PreAuthenticationResponse < Message
-      uint16le  :parameter_count
-      array     :parameters, :type => :key_value_pair, :read_until => lambda {index == parameter_count-1}
+      uint8     :unknown1
+      uint8     :parameter_count
+      array     :parameters, :type => :key_value_pair, :read_until => lambda {index == parameter_count - 1}
 
       def _ttc_code
         return TTC_CODE_OK

data/lib/net/tti/messages/protocol_negotiation_request.rb

@@ -6,17 +6,17 @@ module Net
       # response, this will be the version the server chooses. These are a
       # concatenated string of version numbers (e.g. 060504).
       stringz   :client_versions_string
-      stringz   :protocol_handler
+      stringz   :client_string
 
       def _ttc_code
         TTC_CODE_PROTOCOL_NEGOTIATION
       end
       private :_ttc_code
 
-      def self.create_request(client_versions=[6], protocol_handler="IBMPC/WIN_NT-8.1.0")
+      def self.create_request(client_versions=[6, 5, 4, 3, 2, 1, 0], client_string = "Java_TTC-8.2.0")
         request = self.new
         request.client_versions = client_versions
-        request.protocol_handler = protocol_handler
+        request.client_string = client_string
 
         return request
       end

data/lib/net/tti/messages/protocol_negotiation_response.rb

@@ -4,39 +4,50 @@ module Net
       handles_response_for_ttc_code TTC_CODE_PROTOCOL_NEGOTIATION
 
       # BinData fields
-      stringz   :versions_string  # The protocol (TTC?) version negotiated
-      stringz   :protocol_handler
+      uint8     :ttc_version
+      # TODO throw if ttc_version is not in (4, 5, 6)
+      uint8     :unknown1
+      stringz   :ttc_server
       uint16le  :character_set
+      uint8     :server_flags
+      uint16le  :character_set_elements_length
+      string    :character_set_elements,  :read_length => lambda {character_set_elements_length * 5}
+      # TODO stop parsing here if ttc_version = 4
+      uint16be  :fdo_length
+      string    :fdo,  :read_length => :fdo_length
+      # TODO stop parsing here is ttc_version < 6
+      uint8     :server_compiletime_capabilities_length
+      string    :server_compiletime_capabilities,  :read_length => :server_compiletime_capabilities_length
+      uint8     :server_runtime_capabilities_length
+      string    :server_runtime_capabilities,  :read_length => :server_runtime_capabilities_length
 
-      uint8     :unknown1
-      uint16le  :unknown2_length
-      string    :unknown2,  :read_length => lambda {unknown2_length * 5}
-      uint16be  :unknown3_length
-      string    :unknown3,  :read_length => :unknown3_length
-      uint8     :unknown4_length
-      string    :unknown4,  :read_length => :unknown4_length
-      uint8     :unknown5_length
-      string    :unknown5,  :read_length => :unknown5_length
+      def populate_connection_parameters( conn_params )
+        conn_params.ttc_version = self.ttc_version
+        conn_params.ttc_server = self.ttc_server
+        conn_params.character_set = self.character_set
+        conn_params.server_flags = self.server_flags
+        conn_params.server_compiletime_capabilities = Capabilities.from_binary_string( server_compiletime_capabilities )
+        conn_params.server_runtime_capabilities = Capabilities.from_binary_string( server_runtime_capabilities )
 
-      def version
-        self.versions_string[0,1].unpack("C").first
-      end
+        ttc_server_map = {
+          # (start of) protocol handler string => {params}
+          "IBMPC/WIN_NT-" => {:architecture => :x86, :platform => :windows},
+          "IBMPC/WIN_NT64" => {:architecture => :x64, :platform => :windows},
+          "Linuxi386/Linux" => {:architecture => :x86, :platform => :linux},
+          "x86_64/Linux" => {:architecture => :x64, :platform => :linux},
+          "Sun386i/SunOS" => {:architecture => :x86, :platform => :solaris},
+          "AMD64/SunOS" => {:architecture => :x64, :platform => :solaris},
+        }
 
-      def populate_connection_parameters( conn_params )
-        conn_params.ttc_version = self.version
+        ph_match, match_params = ttc_server_map.find do |ph_start, params|
+          ttc_server.start_with?(ph_start)
+        end
 
-        case self.protocol_handler
-        when "IBMPC/WIN_NT-8.1.0"
-          conn_params.architecture = :x86
-          conn_params.platform = :windows
-        when "Linuxi386/Linux-2.0.34-8.1.0"
-          conn_params.architecture = :x86
-          conn_params.platform = :linux
-        when "x86_64/Linux 2.4.xx"
-          conn_params.architecture = :x64
-          conn_params.platform = :linux
+        if ph_match
+          conn_params.architecture = match_params[:architecture]
+          conn_params.platform = match_params[:platform]
         else
-          raise Net::TTI::Exceptions::UnsupportedPlatform.new( self.protocol_handler )
+          raise Net::TTI::Exceptions::UnsupportedPlatform.new( ttc_server )
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: net-tns
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Chris Woodbury
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-31 00:00:00.000000000 Z
+date: 2017-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindata
@@ -75,8 +75,8 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - bin/tns_oradb_version.rb
-- bin/tns_sid_enumeration.rb
 - bin/tns_sid_list.rb
+- bin/tns_sid_probing.rb
 - lib/net/tns.rb
 - lib/net/tns/client.rb
 - lib/net/tns/connection.rb
@@ -98,11 +98,13 @@ files:
 - lib/net/tns/packets/resend_packet.rb
 - lib/net/tns/version.rb
 - lib/net/tti.rb
+- lib/net/tti/capabilities.rb
 - lib/net/tti/client.rb
 - lib/net/tti/connection.rb
 - lib/net/tti/crypto.rb
 - lib/net/tti/data_types.rb
 - lib/net/tti/data_types/chunked_string.rb
+- lib/net/tti/data_types/flags.rb
 - lib/net/tti/data_types/key_value_pair.rb
 - lib/net/tti/exceptions.rb
 - lib/net/tti/message.rb
@@ -111,8 +113,6 @@ files:
 - lib/net/tti/messages/error_message.rb
 - lib/net/tti/messages/function_call.rb
 - lib/net/tti/messages/function_calls/authentication.rb
-- lib/net/tti/messages/function_calls/authentication_x64.rb
-- lib/net/tti/messages/function_calls/authentication_x86.rb
 - lib/net/tti/messages/function_calls/pre_authentication_response.rb
 - lib/net/tti/messages/protocol_negotiation_request.rb
 - lib/net/tti/messages/protocol_negotiation_response.rb
@@ -136,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: Ruby implementation of the Oracle TNS protocol

data/lib/net/tti/messages/function_calls/authentication_x64.rb

@@ -1,42 +0,0 @@
-require_relative "authentication"
-
-module Net
-  module TTI
-    class AuthenticationX64 < Authentication
-      uint32le  :unknown2,         :initial_value => 0x00001201
-      uint8     :unknown3,         :initial_value => 0x00
-      uint32le  :logon_mode,       :initial_value => :_logon_mode
-      uint8     :unknown4,         :initial_value => 0x01
-      uint32le  :parameter_count,  :value => lambda {parameters.count}
-      uint16le  :unknown5,         :initial_value => 0x0101
-      # username_length and username might be a chunked string, but we
-      # don't need to worry about chunking since Oracle usernames can't
-      # be longer than 30 characters.
-      uint8     :username_length,  :value => lambda { username.length }
-      string    :username
-      array     :parameters, :type => :key_value_pair, :read_until => lambda {index == parameter_count-1}
-
-      def _function_code
-        return FUNCTION_CODE_AUTH
-      end
-      private :_function_code
-
-      def _logon_mode
-        return Authentication::LOGON_MODE_AUTH
-      end
-      private :_logon_mode
-    end
-
-    class PreAuthenticationX64 < AuthenticationX64
-      def _function_code
-        return FUNCTION_CODE_PRE_AUTH
-      end
-      private :_function_code
-
-      def _logon_mode
-        return Authentication::LOGON_MODE_PRE_AUTH
-      end
-      private :_logon_mode
-    end
-  end
-end

data/lib/net/tti/messages/function_calls/authentication_x86.rb

@@ -1,53 +0,0 @@
-require_relative "authentication"
-
-module Net
-  module TTI
-    class AuthenticationX86 < Authentication
-      # Clients seem to change this without any effect on the server. It looks
-      # like it's probably 4 8-bit values, but if we're ignoring them all, we
-      # can ignore them as one structure
-      uint32le  :unknown2,         :initial_value => 0xFFFFFFFE
-      # Some Oracle clients instead send username.length*3 here to 11g servers,
-      # but it doesn't seem to matter
-      uint32le  :unknown3,         :value => lambda { username.length }
-      # 0x1 => preauth, 0x101 => auth
-      uint32le  :logon_mode,       :initial_value => :_logon_mode
-      # Ditto for unknown2. Oracle clients put the same value into the upper
-      # 16 bits of unknown4, unknown5 and unknown6 in each request, but I can't
-      # figure out its meaning
-      uint32le  :unknown4,         :initial_value => 0xFFFFFFFE
-      uint32le  :parameter_count,  :value => lambda {parameters.count}
-                # See unknown4
-      uint32le  :unknown5,         :initial_value => 0xFFFFFFFE
-      uint32le  :unknown6,         :initial_value => 0xFFFFFFFE
-      # username_length and username might be a chunked string, but we
-      # don't need to worry about chunking since Oracle usernames can't
-      # be longer than 30 characters
-      uint8     :username_length,  :value => lambda { username.length }
-      string    :username
-      array     :parameters, :type => :key_value_pair, :read_until => lambda {index == parameter_count-1}
-
-      def _function_code
-        return FUNCTION_CODE_AUTH
-      end
-      private :_function_code
-
-      def _logon_mode
-        return Authentication::LOGON_MODE_AUTH
-      end
-      private :_logon_mode
-    end
-
-    class PreAuthenticationX86 < AuthenticationX86
-      def _function_code
-        return FUNCTION_CODE_PRE_AUTH
-      end
-      private :_function_code
-
-      def _logon_mode
-        return Authentication::LOGON_MODE_PRE_AUTH
-      end
-      private :_logon_mode
-    end
-  end
-end