Browse Source

[1288] a bit of cleanup: removed unused method parameter, comment update

JINMEI Tatuya 13 years ago
parent
commit
e1682a42d2
2 changed files with 6 additions and 6 deletions
  1. 3 3
      src/bin/xfrout/tests/xfrout_test.py.in
  2. 3 3
      src/bin/xfrout/xfrout.py.in

+ 3 - 3
src/bin/xfrout/tests/xfrout_test.py.in

@@ -567,7 +567,7 @@ class TestXfroutSession(unittest.TestCase):
             return Rcode.NOERROR()
         self.xfrsess._check_xfrout_available = noerror
 
-        def myreply(msg, sock, zonename):
+        def myreply(msg, sock):
             self.sock.send(b"success")
 
         self.xfrsess._reply_xfrout_query = myreply
@@ -577,7 +577,7 @@ class TestXfroutSession(unittest.TestCase):
     def test_reply_xfrout_query_noerror(self):
         self.xfrsess._soa = self.soa_rrset
         self.xfrsess._iterator = [self.soa_rrset]
-        self.xfrsess._reply_xfrout_query(self.getmsg(), self.sock, "example.com.")
+        self.xfrsess._reply_xfrout_query(self.getmsg(), self.sock)
         reply_msg = self.sock.read_msg()
         self.assertEqual(reply_msg.get_rr_count(Message.SECTION_ANSWER), 2)
 
@@ -595,7 +595,7 @@ class TestXfroutSession(unittest.TestCase):
         xfrout.get_rrset_len = get_rrset_len
 
         self.xfrsess._tsig_ctx = self.create_mock_tsig_ctx(TSIGError.NOERROR)
-        self.xfrsess._reply_xfrout_query(self.getmsg(), self.sock, "example.com.")
+        self.xfrsess._reply_xfrout_query(self.getmsg(), self.sock)
 
         # tsig signed first package
         reply_msg = self.sock.read_msg()

+ 3 - 3
src/bin/xfrout/xfrout.py.in

@@ -310,7 +310,7 @@ class XfroutSession():
 
         try:
             logger.info(XFROUT_AXFR_TRANSFER_STARTED, zone_str)
-            self._reply_xfrout_query(msg, sock_fd, zone_name.to_text())
+            self._reply_xfrout_query(msg, sock_fd)
         except Exception as err:
             logger.error(XFROUT_AXFR_TRANSFER_ERROR, zone_str, err)
             pass
@@ -353,7 +353,7 @@ class XfroutSession():
         self._send_message(sock_fd, msg, self._tsig_ctx)
 
 
-    def _reply_xfrout_query(self, msg, sock_fd, zone_name):
+    def _reply_xfrout_query(self, msg, sock_fd):
         #TODO, there should be a better way to insert rrset.
         count_since_last_tsig_sign = TSIG_SIGN_EVERY_NTH
         msg.make_response()
@@ -389,7 +389,7 @@ class XfroutSession():
 
             count_since_last_tsig_sign += 1
             msg = self._clear_message(msg)
-            # Add the RR to the new message
+            # Add the RRset to the new message
             msg.add_rrset(Message.SECTION_ANSWER, rrset)
 
             # Reserve tsig space for signed packet