Incrementing packet number in IXFR-in

refs #1362 @30m

libknot/tsig-op.c

@@ -467,8 +467,8 @@ static int knot_tsig_write_tsig_variables(uint8_t *wire,
 
 	memcpy(wire + offset, knot_dname_name(tsig_owner),
 	       sizeof(uint8_t) * knot_dname_size(tsig_owner));
-	dbg_tsig("TSIG: write variables: written owner (tsig alg): \n",
-	         /*knot_rrset_class(tsig_rr)*/);
+	dbg_tsig("TSIG: write variables: written owner (tsig alg): \n");
+	         /*knot_rrset_class(tsig_rr));*/
 	dbg_tsig_hex_detail(wire + offset, knot_dname_size(tsig_owner));
 	offset += knot_dname_size(tsig_owner);
 

libknot/updates/xfr-in.c

@@ -343,6 +343,8 @@ static int xfrin_check_tsig(knot_packet_t *packet, knot_ns_xfr_t *xfr,
 	assert(packet != NULL);
 	assert(xfr != NULL);
 	
+	dbg_xfrin_verb("xfrin_check_tsig(): packet nr: %d\n", xfr->packet_nr);
+	
 	/*
 	 * If we are expecting it (i.e. xfr->prev_digest_size > 0)
 	 *   a) it should be there (first, last or each 100th packet) and it
@@ -642,6 +644,9 @@ dbg_xfrin_exec(
 			 */
 			ret = xfrin_check_tsig(packet, xfr, 1);
 			
+			dbg_xfrin_detail("xfrin_check_tsig() returned %d\n", 
+			                 ret);
+			
 			knot_packet_free(&packet);
 			knot_rrset_deep_free(&rr, 1, 1, 1);
 			
@@ -1194,6 +1199,7 @@ dbg_xfrin_exec(
 	 */
 	ret = xfrin_check_tsig(packet, xfr, 
 	                       knot_ns_tsig_required(xfr->packet_nr));
+	++xfr->packet_nr;
 	
 	/*! \note [TSIG] Cleanup and propagate error if TSIG validation fails.*/
 	if (ret != KNOT_EOK) {