[v9_9] refactor max-recursion-queries

- the counters weren't set correctly when fetches timed out.
  instead we now pass down a counter object.

(cherry picked from commit 05e448935c)
(cherry picked from commit 6c049c57d9)

lib/isc/win32/libisc.def.in

@@ -194,6 +194,12 @@ isc_condition_init
 isc_condition_signal
 isc_condition_wait
 isc_condition_waituntil
+isc_counter_attach
+isc_counter_create
+isc_counter_detach
+isc_counter_increment
+isc_counter_setlimit
+isc_counter_used
 isc_dir_chdir
 isc_dir_chroot
 isc_dir_close

lib/isc/win32/libisc.dsp.in

@@ -249,6 +249,10 @@ SOURCE=..\include\isc\commandline.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\isc\counter.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\include\isc\condition.h
 # End Source File
 # Begin Source File
@@ -629,6 +633,10 @@ SOURCE=..\commandline.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\counter.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\error.c
 # End Source File
 # Begin Source File

lib/isc/win32/libisc.mak.in

@@ -124,6 +124,7 @@ CLEAN :
 	-@erase "$(INTDIR)\buffer.obj"
 	-@erase "$(INTDIR)\bufferlist.obj"
 	-@erase "$(INTDIR)\commandline.obj"
+	-@erase "$(INTDIR)\counter.obj"
 	-@erase "$(INTDIR)\condition.obj"
 	-@erase "$(INTDIR)\dir.obj"
 	-@erase "$(INTDIR)\DLLMain.obj"
@@ -250,6 +251,7 @@ LINK32_OBJS= \
 	"$(INTDIR)\buffer.obj" \
 	"$(INTDIR)\bufferlist.obj" \
 	"$(INTDIR)\commandline.obj" \
+	"$(INTDIR)\counter.obj" \
 	"$(INTDIR)\error.obj" \
 	"$(INTDIR)\event.obj" \
 	"$(INTDIR)\hash.obj" \
@@ -335,6 +337,8 @@ CLEAN :
 	-@erase "$(INTDIR)\bufferlist.sbr"
 	-@erase "$(INTDIR)\commandline.obj"
 	-@erase "$(INTDIR)\commandline.sbr"
+	-@erase "$(INTDIR)\counter.obj"
+	-@erase "$(INTDIR)\counter.sbr"
 	-@erase "$(INTDIR)\condition.obj"
 	-@erase "$(INTDIR)\condition.sbr"
 	-@erase "$(INTDIR)\dir.obj"
@@ -531,6 +535,7 @@ BSC32_SBRS= \
 	"$(INTDIR)\buffer.sbr" \
 	"$(INTDIR)\bufferlist.sbr" \
 	"$(INTDIR)\commandline.sbr" \
+	"$(INTDIR)\counter.sbr" \
 	"$(INTDIR)\error.sbr" \
 	"$(INTDIR)\event.sbr" \
 	"$(INTDIR)\hash.sbr" \
@@ -623,6 +628,7 @@ LINK32_OBJS= \
 	"$(INTDIR)\buffer.obj" \
 	"$(INTDIR)\bufferlist.obj" \
 	"$(INTDIR)\commandline.obj" \
+	"$(INTDIR)\counter.obj" \
 	"$(INTDIR)\error.obj" \
 	"$(INTDIR)\event.obj" \
 	"$(INTDIR)\hash.obj" \
@@ -1280,6 +1286,24 @@ SOURCE=..\commandline.c
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+!ENDIF 
+
+SOURCE=..\counter.c
+
+!IF  "$(CFG)" == "libisc - @PLATFORM@ Release"
+
+
+"$(INTDIR)\counter.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libisc - @PLATFORM@ Debug"
+
+
+"$(INTDIR)\counter.obj"	"$(INTDIR)\counter.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
 !ENDIF 
 
 SOURCE=..\error.c

lib/isc/win32/libisc.vcxproj.filters.in

@@ -59,6 +59,9 @@
     <ClInclude Include="..\include\isc\commandline.h">
       <Filter>Library Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\include\isc\counter.h">
+      <Filter>Library Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\include\isc\entropy.h">
       <Filter>Library Header Files</Filter>
     </ClInclude>
@@ -455,6 +458,9 @@
     <ClCompile Include="..\commandline.c">
       <Filter>Library Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\counter.c">
+      <Filter>Library Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\error.c">
       <Filter>Library Source Files</Filter>
     </ClCompile>

lib/isc/win32/libisc.vcxproj.in

@@ -260,6 +260,7 @@ copy /Y @VCREDIST_PATH@ ..\Build\Release\
     <ClInclude Include="..\include\isc\buffer.h" />
     <ClInclude Include="..\include\isc\bufferlist.h" />
     <ClInclude Include="..\include\isc\commandline.h" />
+    <ClInclude Include="..\include\isc\counter.h" />
     <ClInclude Include="..\include\isc\entropy.h" />
     <ClInclude Include="..\include\isc\error.h" />
     <ClInclude Include="..\include\isc\event.h" />
@@ -370,6 +371,7 @@ copy /Y @VCREDIST_PATH@ ..\Build\Release\
     <ClCompile Include="..\buffer.c" />
     <ClCompile Include="..\bufferlist.c" />
     <ClCompile Include="..\commandline.c" />
+    <ClCompile Include="..\counter.c" />
     <ClCompile Include="..\error.c" />
     <ClCompile Include="..\event.c" />
     <ClCompile Include="..\hash.c" />