From f5c22df82b202ab3880e5bf346fd6dca68cf86ab Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Tue, 16 Dec 2014 23:36:44 +1100 Subject: [PATCH] win32 build --- lib/dns/win32/libdns.def.in | 49 +++++++++++++++++++++++++ lib/dns/win32/libdns.dsp.in | 8 ++++ lib/dns/win32/libdns.mak.in | 4 ++ lib/dns/win32/libdns.vcxproj.filters.in | 6 +++ lib/dns/win32/libdns.vcxproj.in | 2 + lib/isc/win32/file.c | 5 ++- lib/isc/win32/libisc.def.in | 5 +++ 7 files changed, 77 insertions(+), 2 deletions(-) diff --git a/lib/dns/win32/libdns.def.in b/lib/dns/win32/libdns.def.in index ed201b6ce2..a896d340a1 100644 --- a/lib/dns/win32/libdns.def.in +++ b/lib/dns/win32/libdns.def.in @@ -53,6 +53,14 @@ dns_adb_marklame dns_adb_setadbsize dns_adb_shutdown dns_adb_whenshutdown +dns_badcache_add +dns_badcache_destroy +dns_badcache_find +dns_badcache_flush +dns_badcache_flushname +dns_badcache_flushtree +dns_badcache_init +dns_badcache_print dns_byaddr_cancel dns_byaddr_create dns_byaddr_createptrname @@ -282,6 +290,7 @@ dns_generalstats_increment dns_geoip_shutdown @END GEOIP dns_iptable_addprefix +dns_iptable_addprefix2 dns_iptable_attach dns_iptable_create dns_iptable_detach @@ -495,6 +504,7 @@ dns_ntatable_create dns_ntatable_delete dns_ntatable_detach dns_ntatable_dump +dns_ntatable_totext dns_opcode_totext dns_opcodestats_create dns_opcodestats_dump @@ -507,6 +517,7 @@ dns_order_find dns_peer_attach dns_peer_detach dns_peer_getbogus +dns_peer_getednsversion dns_peer_getforcetcp dns_peer_getkey dns_peer_getmaxudp @@ -515,15 +526,20 @@ dns_peer_getnotifysource dns_peer_getprovideixfr dns_peer_getquerydscp dns_peer_getquerysource +dns_peer_getrequestexpire dns_peer_getrequestixfr +dns_peer_getrequestnsid +dns_peer_getrequestsit dns_peer_getsupportedns dns_peer_gettransferdscp dns_peer_gettransferformat dns_peer_gettransfers dns_peer_gettransfersource +dns_peer_getudpsize dns_peer_new dns_peer_newprefix dns_peer_setbogus +dns_peer_setednsversion dns_peer_setforcetcp dns_peer_setkey dns_peer_setkeybycharp @@ -533,6 +549,7 @@ dns_peer_setnotifysource dns_peer_setprovideixfr dns_peer_setquerydscp dns_peer_setquerysource +dns_peer_setrequestexpire dns_peer_setrequestixfr dns_peer_setrequestnsid dns_peer_setrequestsit @@ -583,24 +600,42 @@ dns_rbtnodechain_reset dns_rcode_fromtext dns_rcode_totext dns_rdata_additionaldata +dns_rdata_apl_current +dns_rdata_apl_first +dns_rdata_apl_next dns_rdata_casecompare +dns_rdata_checknames dns_rdata_checkowner dns_rdata_clone dns_rdata_compare dns_rdata_covers +dns_rdata_deleterrset dns_rdata_digest +dns_rdata_exists dns_rdata_freestruct dns_rdata_fromregion dns_rdata_fromstruct dns_rdata_fromtext dns_rdata_fromwire +dns_rdata_hip_current +dns_rdata_hip_first +dns_rdata_hip_next dns_rdata_init +dns_rdata_makedelete +dns_rdata_notexist +dns_rdata_opt_current +dns_rdata_opt_first +dns_rdata_opt_next dns_rdata_reset dns_rdata_tofmttext dns_rdata_toregion dns_rdata_tostruct dns_rdata_totext dns_rdata_towire +dns_rdata_txt_current +dns_rdata_txt_first +dns_rdata_txt_next +dns_rdata_updateop dns_rdatacallbacks_init dns_rdatacallbacks_init_stdio dns_rdataclass_format @@ -848,16 +883,19 @@ dns_view_freeze dns_view_freezezones dns_view_getdynamickeyring dns_view_getfailttl +dns_view_getntatable dns_view_getpeertsig dns_view_getresquerystats dns_view_getresstats dns_view_getsecroots dns_view_gettsig +dns_view_initntatable dns_view_initsecroots dns_view_iscacheshared dns_view_issecuredomain dns_view_load dns_view_loadnew +dns_view_ntacovers dns_view_restorekeyring dns_view_searchdlz dns_view_setcache @@ -882,6 +920,7 @@ dns_xfrin_create dns_xfrin_detach dns_xfrin_shutdown dns_zone_addnsec3chain +dns_zone_asyncload dns_zone_attach dns_zone_checknames dns_zone_clearforwardacl @@ -906,7 +945,9 @@ dns_zone_forwardupdate dns_zone_fulldumptostream dns_zone_get_rpz_num dns_zone_getadded +dns_zone_getaltxfrsource4 dns_zone_getaltxfrsource4dscp +dns_zone_getaltxfrsource6 dns_zone_getaltxfrsource6dscp dns_zone_getautomatic dns_zone_getchecknames @@ -930,6 +971,7 @@ dns_zone_getmaxxfrout dns_zone_getmctx dns_zone_getmgr dns_zone_getnotifyacl +dns_zone_getnotifydelay dns_zone_getnotifysrc4 dns_zone_getnotifysrc4dscp dns_zone_getnotifysrc6 @@ -944,6 +986,8 @@ dns_zone_getraw dns_zone_getrcvquerystats dns_zone_getrefreshkeytime dns_zone_getrefreshtime +dns_zone_getrequestexpire +dns_zone_getrequestixfr dns_zone_getrequeststats dns_zone_getserial dns_zone_getserial2 @@ -974,6 +1018,7 @@ dns_zone_load dns_zone_loadandthaw dns_zone_loadnew dns_zone_log +dns_zone_logc dns_zone_maintenance dns_zone_markdirty dns_zone_name @@ -985,6 +1030,7 @@ dns_zone_refresh dns_zone_rekey dns_zone_replacedb dns_zone_rpz_enable +dns_zone_rpz_enable_db dns_zone_setacache dns_zone_setadded dns_zone_setalsonotify @@ -1005,6 +1051,7 @@ dns_zone_setdbtype dns_zone_setdialup dns_zone_setfile dns_zone_setfile2 +dns_zone_setfile3 dns_zone_setflag dns_zone_setforwardacl dns_zone_setidlein @@ -1041,8 +1088,10 @@ dns_zone_setqueryonacl dns_zone_setrawdata dns_zone_setrcvquerystats dns_zone_setrefreshkeyinterval +dns_zone_setrequestexpire dns_zone_setrequestixfr dns_zone_setrequeststats +dns_zone_setserial dns_zone_setserialupdatemethod dns_zone_setsignatures dns_zone_setsigresigninginterval diff --git a/lib/dns/win32/libdns.dsp.in b/lib/dns/win32/libdns.dsp.in index 7df9f0d182..cccae1fcef 100644 --- a/lib/dns/win32/libdns.dsp.in +++ b/lib/dns/win32/libdns.dsp.in @@ -110,6 +110,10 @@ SOURCE=..\include\dns\adb.h # End Source File # Begin Source File +SOURCE=..\include\dns\badcache.h +# End Source File +# Begin Source File + SOURCE=..\include\dns\bit.h # End Source File # Begin Source File @@ -484,6 +488,10 @@ SOURCE=..\adb.c # End Source File # Begin Source File +SOURCE=..\badcache.c +# End Source File +# Begin Source File + SOURCE=..\byaddr.c # End Source File # Begin Source File diff --git a/lib/dns/win32/libdns.mak.in b/lib/dns/win32/libdns.mak.in index 6dd889f69e..d06175fdaf 100644 --- a/lib/dns/win32/libdns.mak.in +++ b/lib/dns/win32/libdns.mak.in @@ -123,6 +123,7 @@ CLEAN : -@erase "$(INTDIR)\acache.obj" -@erase "$(INTDIR)\acl.obj" -@erase "$(INTDIR)\adb.obj" + -@erase "$(INTDIR)\badcache.obj" -@erase "$(INTDIR)\byaddr.obj" -@erase "$(INTDIR)\cache.obj" -@erase "$(INTDIR)\callbacks.obj" @@ -281,6 +282,7 @@ LINK32_OBJS= \ "$(INTDIR)\acache.obj" \ "$(INTDIR)\acl.obj" \ "$(INTDIR)\adb.obj" \ + "$(INTDIR)\badcache.obj" \ "$(INTDIR)\byaddr.obj" \ "$(INTDIR)\cache.obj" \ "$(INTDIR)\callbacks.obj" \ @@ -420,6 +422,8 @@ CLEAN : -@erase "$(INTDIR)\acl.sbr" -@erase "$(INTDIR)\adb.obj" -@erase "$(INTDIR)\adb.sbr" + -@erase "$(INTDIR)\badcache.obj" + -@erase "$(INTDIR)\badcache.sbr" -@erase "$(INTDIR)\byaddr.obj" -@erase "$(INTDIR)\byaddr.sbr" -@erase "$(INTDIR)\cache.obj" diff --git a/lib/dns/win32/libdns.vcxproj.filters.in b/lib/dns/win32/libdns.vcxproj.filters.in index 77f211dd5e..1184d8ff61 100644 --- a/lib/dns/win32/libdns.vcxproj.filters.in +++ b/lib/dns/win32/libdns.vcxproj.filters.in @@ -39,6 +39,9 @@ Library Source Files + + Library Source Files + Library Source Files @@ -347,6 +350,9 @@ Library Header Files + + Library Header Files + Library Header Files diff --git a/lib/dns/win32/libdns.vcxproj.in b/lib/dns/win32/libdns.vcxproj.in index daa400f902..b94d64f46b 100644 --- a/lib/dns/win32/libdns.vcxproj.in +++ b/lib/dns/win32/libdns.vcxproj.in @@ -110,6 +110,7 @@ + @@ -227,6 +228,7 @@ + diff --git a/lib/isc/win32/file.c b/lib/isc/win32/file.c index 9e0c82dd35..3f357aa165 100644 --- a/lib/isc/win32/file.c +++ b/lib/isc/win32/file.c @@ -34,10 +34,11 @@ #include #include #include -#include -#include +#include #include #include +#include +#include #include "errno2result.h" diff --git a/lib/isc/win32/libisc.def.in b/lib/isc/win32/libisc.def.in index 3ed0a9aca3..85501b12c1 100644 --- a/lib/isc/win32/libisc.def.in +++ b/lib/isc/win32/libisc.def.in @@ -499,6 +499,11 @@ isc_resource_getlimit isc_resource_setlimit isc_result_register isc_result_totext +isc_rng_attach +isc_rng_create +isc_rng_detach +isc_rng_random +isc_rng_uniformrandom isc_rwlock_destroy isc_rwlock_downgrade isc_rwlock_init