Changeset 0567273f79a651d42a6272b26389bc7b34290e84

Show
Ignore:
Timestamp:
03/02/15 00:36:10 (4 years ago)
Author:
Theo Schlossnagle <jesus@omniti.com>
git-committer:
Theo Schlossnagle <jesus@omniti.com> 1425256570 -0500
git-parent:

[40d139d2a1d9e63b6a8f18450779324f73b9911d]

git-author:
Theo Schlossnagle <jesus@omniti.com> 1425256570 -0500
Message:

switch to external libudns

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • configure.in

    r40d139d r0567273  
    280280AC_CHECK_LIB(hwloc, hwloc_topology_init, , [AC_MSG_ERROR(*** libhwloc required ***)]) 
    281281AC_CHECK_LIB(jlog, jlog_new, , [AC_MSG_ERROR(*** libjlog required github.com/omniti-labs/jlog ***)]) 
     282AC_CHECK_HEADER(udns.h, [], [AC_MSG_ERROR(*** udns.h required ***)]) 
     283AC_CHECK_LIB(udns, dns_new, [], [AC_MSG_ERROR(*** libudns required ***)]) 
    282284AC_CHECK_LIB(umem, umem_cache_create, , ) 
    283285AC_CHECK_LIB(z, compress2, , [AC_MSG_ERROR(*** zlib is required ***)]) 
     
    969971Makefile 
    970972src/Makefile 
    971 src/udns/Makefile 
    972973src/man/Makefile 
    973974src/modules/Makefile 
  • src/Makefile.dep

    r5ec8563 r0567273  
    2020 
    2121noit_check_resolver.o noit_check_resolver.lo: noit_check_resolver.c noit_config.h \ 
    22   noit_mtev_bridge.h \ 
    23   udns/udns.h 
     22  noit_mtev_bridge.h 
    2423 
    2524noit_check_rest.o noit_check_rest.lo: noit_check_rest.c  \ 
     
    121120  man/stratcond.usage.h 
    122121 
    123 udns/dnsget.o udns/dnsget.lo: udns/dnsget.c udns/udns.h udns/getopt.c 
    124  
    125 udns/ex-rdns.o udns/ex-rdns.lo: udns/ex-rdns.c udns/udns.h 
    126  
    127 udns/getopt.o udns/getopt.lo: udns/getopt.c 
    128  
    129 udns/inet_XtoX.o udns/inet_XtoX.lo: udns/inet_XtoX.c 
    130  
    131 udns/rblcheck.o udns/rblcheck.lo: udns/rblcheck.c udns/udns.h udns/getopt.c 
    132  
    133 udns/udns_XtoX.o udns/udns_XtoX.lo: udns/udns_XtoX.c udns/udns.h udns/inet_XtoX.c 
    134  
    135 udns/udns_bl.o udns/udns_bl.lo: udns/udns_bl.c udns/udns.h 
    136  
    137 udns/udns_codes.o udns/udns_codes.lo: udns/udns_codes.c udns/udns.h 
    138  
    139 udns/udns_dn.o udns/udns_dn.lo: udns/udns_dn.c udns/udns.h 
    140  
    141 udns/udns_dntosp.o udns/udns_dntosp.lo: udns/udns_dntosp.c udns/udns.h 
    142  
    143 udns/udns_init.o udns/udns_init.lo: udns/udns_init.c udns/udns.h 
    144  
    145 udns/udns_jran.o udns/udns_jran.lo: udns/udns_jran.c udns/udns.h 
    146  
    147 udns/udns_misc.o udns/udns_misc.lo: udns/udns_misc.c udns/udns.h 
    148  
    149 udns/udns_parse.o udns/udns_parse.lo: udns/udns_parse.c udns/udns.h 
    150  
    151 udns/udns_resolver.o udns/udns_resolver.lo: udns/udns_resolver.c udns/udns.h 
    152  
    153 udns/udns_rr_a.o udns/udns_rr_a.lo: udns/udns_rr_a.c udns/udns.h 
    154  
    155 udns/udns_rr_mx.o udns/udns_rr_mx.lo: udns/udns_rr_mx.c udns/udns.h 
    156  
    157 udns/udns_rr_naptr.o udns/udns_rr_naptr.lo: udns/udns_rr_naptr.c udns/udns.h 
    158  
    159 udns/udns_rr_ptr.o udns/udns_rr_ptr.lo: udns/udns_rr_ptr.c udns/udns.h 
    160  
    161 udns/udns_rr_srv.o udns/udns_rr_srv.lo: udns/udns_rr_srv.c udns/udns.h 
    162  
    163 udns/udns_rr_txt.o udns/udns_rr_txt.lo: udns/udns_rr_txt.c udns/udns.h 
     122udns/udns_codes.o udns/udns_codes.lo: udns/udns_codes.c 
  • src/modules/Makefile.dep

    r58350c8 r0567273  
    1919  ../noit_check_tools.h ../noit_check_tools_shared.h \ 
    2020  ../noit_mtev_bridge.h custom_config.xmlh 
    21  
    22 dns.lo: dns.c  \ 
    23   ../noit_mtev_bridge.h \ 
    24   ../noit_module.h  \ 
    25   ../noit_check.h ../noit_metric.h \ 
    26   ../noit_check_tools.h ../noit_check_tools_shared.h ../udns/udns.h \ 
    27   dns.xmlh 
    2821 
    2922external.lo: external.c  \ 
     
    7871  libstomp.h \ 
    7972 
     73lua_check.lo: lua_check.c  \ 
     74  ../noit_config.h ../noit_module.h ../noit_check.h ../noit_metric.h \ 
     75  ../noit_check_tools.h ../noit_check_tools_shared.h \ 
     76  ../noit_mtev_bridge.h  \ 
     77  lua_check.h lua_check.xmlh 
     78 
    8079mysql.lo: mysql.c  \ 
    8180  ../noit_config.h ../noit_module.h \ 
     
    8382  ../noit_check_tools.h ../noit_check_tools_shared.h \ 
    8483  ../noit_mtev_bridge.h mysql.xmlh 
     84 
     85noit_lua_noit_binding.lo: noit_lua_noit_binding.c \ 
     86  ../noit_check.h \ 
     87  ../noit_metric.h \ 
     88  ../noit_filters.h  \ 
     89  lua_check.h ../noit_module.h  \ 
     90  ../noit_check_tools.h ../noit_check_tools_shared.h 
     91 
     92noit_lua_snmp.lo: noit_lua_snmp.c ../noit_config.h \ 
    8593 
    8694ping_icmp.lo: ping_icmp.c  \ 
  • src/modules/Makefile.in

    r40d139d r0567273  
    153153 
    154154dns.@MODULEEXT@:        dns.lo 
    155         @$(MODULELD) $(SHLDFLAGS) -o $@ dns.lo 
     155        @$(MODULELD) $(SHLDFLAGS) -o $@ dns.lo -ludns 
    156156        @echo "- linking $@" 
    157157 
  • src/modules/dns.c

    r304ec80 r0567273  
    4141#include <netinet/in.h> 
    4242#include <arpa/inet.h> 
     43#include <udns.h> 
    4344 
    4445#include <mtev_log.h> 
     
    4950#include "noit_check.h" 
    5051#include "noit_check_tools.h" 
    51 #include "udns/udns.h" 
    5252 
    5353#define MAX_RR 256 
     
    413413  } 
    414414  /* HASH the rr types */ 
    415   for(i=0, nv = dns_type_index(i); nv->name; nv = dns_type_index(++i)
     415  for(i=0, nv = &dns_typetab[i]; nv->name; nv = &dns_typetab[++i]
    416416    mtev_hash_store(&dns_rtypes, 
    417417                    nv->name, strlen(nv->name), 
    418418                    (void *)nv); 
    419419  /* HASH the class types */ 
    420   for(i=0, nv = dns_class_index(i); nv->name; nv = dns_class_index(++i)
     420  for(i=0, nv = &dns_classtab[i]; nv->name; nv = &dns_classtab[++i]
    421421    mtev_hash_store(&dns_ctypes, 
    422422                    nv->name, strlen(nv->name), 
  • src/noit_check_resolver.c

    r304ec80 r0567273  
    4444#include <arpa/inet.h> 
    4545#include <netdb.h> 
     46#include <udns.h> 
    4647 
    4748#include <eventer/eventer.h> 
     
    5354#include <mtev_console.h> 
    5455#include "noit_mtev_bridge.h" 
    55 #include "udns/udns.h" 
    5656 
    5757#define MAX_RR 256