Browse Source

[2252] care for the socket family which is neither INET6 nor INET

Naoki Kambe 12 years ago
parent
commit
4de51f893d
1 changed files with 7 additions and 5 deletions
  1. 7 5
      src/bin/xfrin/xfrin.py.in

+ 7 - 5
src/bin/xfrin/xfrin.py.in

@@ -912,8 +912,9 @@ class XfrinConnection(asyncore.dispatcher):
 
 
         self._send_query(RRType.SOA)
         self._send_query(RRType.SOA)
         # count soaoutv4 or soaoutv6 requests
         # count soaoutv4 or soaoutv6 requests
-        self._counters.inc('zones', self._zone_name.to_text(),
-                           'soaout' + self._get_ipver_str())
+        if self._get_ipver_str():
+            self._counters.inc('zones', self._zone_name.to_text(),
+                               'soaout' + self._get_ipver_str())
         data_len = self._get_request_response(2)
         data_len = self._get_request_response(2)
         msg_len = socket.htons(struct.unpack('H', data_len)[0])
         msg_len = socket.htons(struct.unpack('H', data_len)[0])
         soa_response = self._get_request_response(msg_len)
         soa_response = self._get_request_response(msg_len)
@@ -959,9 +960,10 @@ class XfrinConnection(asyncore.dispatcher):
             logger.info(XFRIN_XFR_TRANSFER_STARTED, req_str, self.zone_str())
             logger.info(XFRIN_XFR_TRANSFER_STARTED, req_str, self.zone_str())
             self._send_query(self._request_type)
             self._send_query(self._request_type)
             # count (A|X)IXFR requests for statistics
             # count (A|X)IXFR requests for statistics
-            self._counters.inc('zones', self._zone_name.to_text(),
-                               req_str.lower() + 'req' +
-                               self._get_ipver_str())
+            if self._get_ipver_str():
+                self._counters.inc('zones', self._zone_name.to_text(),
+                                   req_str.lower() + 'req' +
+                                   self._get_ipver_str())
             self.__state = XfrinInitialSOA()
             self.__state = XfrinInitialSOA()
             self._handle_xfrin_responses()
             self._handle_xfrin_responses()
             # Depending what data was found, we log different status reports
             # Depending what data was found, we log different status reports