make a difference between binary and string data. This is mostly because strings are utf-8, while binary is, well, binary.

git-svn-id: svn://bind10.isc.org/svn/bind10/branches/parkinglot@308 e5f2f494-b856-4b98-b285-d166d9295462

src/lib/cc/ruby/lib/cc/message.rb

@@ -21,10 +21,11 @@ class CC
 class Message
   PROTOCOL_VERSION = 0x536b616e
 
-  ITEM_DATA = 0x01
+  ITEM_BLOB = 0x01
   ITEM_HASH = 0x02
   ITEM_LIST = 0x03
   ITEM_NULL = 0x04
+  ITEM_UTF8 = 0x08
   ITEM_MASK = 0x0f
 
   ITEM_LENGTH_32   = 0x00
@@ -55,12 +56,12 @@ class Message
   # the value is a Hash or Array, it will be encoded as a message type
   # HASH or LIST.  If it is nil, it will be encoded as NULL, and if it is
   # any other type, its to_s method will be called on it and it will be
-  # encoded as a DATA item.
+  # encoded as a UTF8 item.
   #
   def self.to_wire(msg)
     encoded = [PROTOCOL_VERSION].pack("N")
     encoded += encode_hash(msg)
-    CC::set_binary(encoded)
+    encoded.force_encoding('binary')
     encoded
   end
 
@@ -71,7 +72,7 @@ class Message
     if msg.length < 4
       raise CC::DecodeError, "Data is too short to decode"
     end
-    CC::set_binary(msg)
+    msg.force_encoding('binary')
     version, msg = msg.unpack("N a*")
     unless version == PROTOCOL_VERSION
       raise CC::DecodeError, "Incorrect protocol version"
@@ -102,8 +103,12 @@ class Message
   end
 
   # pack a string, including its type and length.
-  def self.pack_string(str)
-    encode_length_and_type(str.to_s, ITEM_DATA)
+  def self.pack_utf8(str)
+    encode_length_and_type(str.to_s.encode('binary'), ITEM_UTF8)
+  end
+
+  def self.pack_blob(str)
+    encode_length_and_type(str.to_s, ITEM_BLOB)
   end
 
   def self.pack_array(arr)
@@ -114,8 +119,12 @@ class Message
     encode_length_and_type(encode_hash(hash), ITEM_HASH)
   end
 
-  def self.encode_string(str)
-    str
+  def self.encode_data(data)
+    str.to_s
+  end
+
+  def self.encode_utf8(str)
+    str.to_s.encode('binary')
   end
 
   def self.pack_nil
@@ -124,14 +133,20 @@ class Message
 
   def self.encode_item(item)
     case item
-      when nil
+    when nil
       ret = pack_nil
-      when Hash
+    when Hash
       ret = pack_hash(item)
-      when Array
+    when Array
       ret = pack_array(item)
+    when String
+      if item.encoding == 'utf-8'
+        ret = pack_utf8(item)
+      else
+        ret = pack_blob(item)
+      end
     else
-      ret = pack_string(item.to_s)
+      ret = pack_blob(item.to_s)
     end
 
     ret
@@ -169,8 +184,7 @@ class Message
       raise CC::DecodeError, "Data underrun while decoding"
     end
     tag, remainder = str.unpack("x a#{length} a*")
-    CC::set_utf8(tag)
-    [ tag, remainder ]
+    [ tag.encode('utf-8'), remainder ]
   end
 
   def self.decode_item(msg)
@@ -208,13 +222,15 @@ class Message
 
     # unpack item based on type
     case type
-      when ITEM_DATA
+    when ITEM_BLOB
       value = item
-      when ITEM_HASH
+    when ITEM_UTF8
+      value = item.encode('utf-8')
+    when ITEM_HASH
       value = decode_hash(item)
-      when ITEM_LIST
+    when ITEM_LIST
       value = decode_array(item)
-      when ITEM_NULL
+    when ITEM_NULL
       value = nil
     else
       raise CC::DecodeError, "Unknown item type in decode: #{type}"