Fix UTF-8 multibyte name compression

lassebm · jstasiak · commit e11700ff9ea9 · 2018-09-12T15:30:21.000+02:00
diff --git a/test_zeroconf.py b/test_zeroconf.py
@@ -115,6 +115,14 @@ def test_parse_own_packet_question(self):
                                              r._CLASS_IN))
         r.DNSIncoming(generated.packet())
 
+    def test_parse_own_packet_response(self):
+        generated = r.DNSOutgoing(r._FLAGS_QR_RESPONSE)
+        generated.add_answer_at_time(r.DNSService(
+            "æøå.local.", r._TYPE_SRV, r._CLASS_IN, r._DNS_TTL, 0, 0, 80, "foo.local."), 0)
+        parsed = r.DNSIncoming(generated.packet())
+        self.assertEqual(len(generated.answers), 1)
+        self.assertEqual(len(generated.answers), len(parsed.answers))
+
     def test_match_question(self):
         generated = r.DNSOutgoing(r._FLAGS_QR_QUERY)
         question = r.DNSQuestion("testname.local.", r._TYPE_SRV, r._CLASS_IN)
@@ -705,7 +713,7 @@ def test_integration_with_listener_class(self):
         subtype_name = "My special Subtype"
         type_ = "_http._tcp.local."
         subtype = subtype_name + "._sub." + type_
-        name = "xxxyyy"
+        name = "xxxyyyæøå"
         registration_name = "%s.%s" % (name, type_)
 
         class MyListener:
diff --git a/zeroconf.py b/zeroconf.py
@@ -944,8 +944,9 @@ def write_name(self, name):
             count = len(name_suffices)
 
         # note the new names we are saving into the packet
+        name_length = len(name.encode('utf-8'))
         for suffix in name_suffices[:count]:
-            self.names[suffix] = self.size + len(name) - len(suffix) - 1
+            self.names[suffix] = self.size + name_length - len(suffix.encode('utf-8')) - 1
 
         # write the new names out.
         for part in parts[:count]:
