From: Jelte Jansen Date: Thu, 18 Aug 2005 08:05:24 +0000 (+0000) Subject: updated tests X-Git-Tag: release-1.0.0~272 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=76a62ca1e2ddfca5e7816739c91622e488c0d61d;p=thirdparty%2Fldns.git updated tests --- diff --git a/tests/run-test-read-zone.c b/tests/run-test-read-zone.c index 07b8b2a2..d56b5ffd 100644 --- a/tests/run-test-read-zone.c +++ b/tests/run-test-read-zone.c @@ -7,6 +7,7 @@ #include #include #include +#include #include @@ -17,43 +18,26 @@ int main(int argc, char **argv) { ldns_rr *rr; - char *filename = "db.miek.nl"; + char *filename = ""; FILE *fp; ldns_zone *z; - - fp = fopen(filename, "r"); - if (!fp) { - exit(EXIT_FAILURE); + int line_nr = 0; + + if (argc < 2) { + printf("Usage: %s \n", argv[0]); + printf("\tReads the zonefile and prints it.\n"); + exit(0); } - rr = ldns_rr_new_frm_fp(fp); - ldns_rr_print(stdout, rr); - rr = ldns_rr_new_frm_fp(fp); - ldns_rr_print(stdout, rr); - rr = ldns_rr_new_frm_fp(fp); - ldns_rr_print(stdout, rr); - rr = ldns_rr_new_frm_fp(fp); - ldns_rr_print(stdout, rr); - rr = ldns_rr_new_frm_fp(fp); - ldns_rr_print(stdout, rr); - rr = ldns_rr_new_frm_fp(fp); - ldns_rr_print(stdout, rr); - rr = ldns_rr_new_frm_fp(fp); - ldns_rr_print(stdout, rr); - rr = ldns_rr_new_frm_fp(fp); - ldns_rr_print(stdout, rr); - rr = ldns_rr_new_frm_fp(fp); - ldns_rr_print(stdout, rr); - printf("\n"); - fclose(fp); + filename = argv[1]; - printf("ldns_zone_new_frm_fp\n"); fp = fopen(filename, "r"); if (!fp) { + fprintf(stderr, "Unable to open %s: %s\n", filename, strerror(errno)); exit(EXIT_FAILURE); } - - z = ldns_zone_new_frm_fp(fp, NULL, 0, LDNS_RR_CLASS_IN); + + z = ldns_zone_new_frm_fp_l(fp, NULL, 0, LDNS_RR_CLASS_IN, &line_nr); if (z) { ldns_zone_print(stdout, z); diff --git a/tests/run-test18.c b/tests/run-test18.c index 1e27a9ab..5ed19daa 100644 --- a/tests/run-test18.c +++ b/tests/run-test18.c @@ -44,11 +44,11 @@ main() dnskeys = ldns_rr_list_new(); /* well formed */ - rr = ldns_rr_new_frm_str("a.miek.nl. 1800 IN A 195.169.222.38\na.miek.nl. 1800 IN A 195.169.222.38"); + rr = ldns_rr_new_frm_str("a.miek.nl. 1800 IN A 195.169.222.38\na.miek.nl. 1800 IN A 195.169.222.38", 0, NULL); ldns_rr_print(stdout, rr); printf("\n"); - rr = ldns_rr_new_frm_str("a.miek.nl. 1800 IN A 195.169.222.38 "); + rr = ldns_rr_new_frm_str("a.miek.nl. 1800 IN A 195.169.222.38 ", 0, NULL); ldns_rr_print(stdout, rr); printf("\n"); @@ -67,62 +67,62 @@ main() 3600 ; negative caching\n\ )"; - rr = ldns_rr_new_frm_str(soa_string1); + rr = ldns_rr_new_frm_str(soa_string1, 0, NULL); ldns_rr_print(stdout, rr); printf("\n"); - rr = ldns_rr_new_frm_str(soa_string2); + rr = ldns_rr_new_frm_str(soa_string2, 0, NULL); ldns_rr_print(stdout, rr); printf("\n"); - rr = ldns_rr_new_frm_str("a.miek.nl. 1800 IN MX 10 www.atoom.net"); + rr = ldns_rr_new_frm_str("a.miek.nl. 1800 IN MX 10 www.atoom.net", 0, NULL); ldns_rr_print(stdout, rr); printf("\n"); - rr = ldns_rr_new_frm_str("a.miek.nl. 1800 IN MX 10 w\\065.atoom.net"); + rr = ldns_rr_new_frm_str("a.miek.nl. 1800 IN MX 10 w\\065.atoom.net", 0, NULL); ldns_rr_print(stdout, rr); printf("\n"); - rr = ldns_rr_new_frm_str("a.miek.nl. 1800 IN MX 10 w\\65.atoom.net"); + rr = ldns_rr_new_frm_str("a.miek.nl. 1800 IN MX 10 w\\65.atoom.net", 0, NULL); ldns_rr_print(stdout, rr); printf("\n"); - rr = ldns_rr_new_frm_str("a.miek.nl. 1800 IN MX 10 www\\.www.atoom.net"); + rr = ldns_rr_new_frm_str("a.miek.nl. 1800 IN MX 10 www\\.www.atoom.net", 0, NULL); ldns_rr_print(stdout, rr); printf("\n"); - rr = ldns_rr_new_frm_str("a.miek.nl. 1800 IN MX 10 \\."); + rr = ldns_rr_new_frm_str("a.miek.nl. 1800 IN MX 10 \\.", 0, NULL); ldns_rr_print(stdout, rr); printf("\n"); printf("rr sig with inception as epoch number\n"); - rr = ldns_rr_new_frm_str("nlnetlabs.nl. 86400 IN RRSIG DNSKEY RSASHA1 2 86400 1114695776 1112103776 43791 nlnetlabs.nl. FE//RZ0Z1sMzea0ioOLFpUIcM3wnxLGndtKUXJSM3SQ3BlYok2fUTiI+zegNoB1YdylWsfohZJfjkODrOJO9PSbN7hMHmzFEsDFAbCU75TySBuxv2UQlQVuTznxtRdvLGIRGxRhPmjlc/gtJPMB4XJKUWmtkzlTVKqZU7oNCsLA="); + rr = ldns_rr_new_frm_str("nlnetlabs.nl. 86400 IN RRSIG DNSKEY RSASHA1 2 86400 1114695776 1112103776 43791 nlnetlabs.nl. FE//RZ0Z1sMzea0ioOLFpUIcM3wnxLGndtKUXJSM3SQ3BlYok2fUTiI+zegNoB1YdylWsfohZJfjkODrOJO9PSbN7hMHmzFEsDFAbCU75TySBuxv2UQlQVuTznxtRdvLGIRGxRhPmjlc/gtJPMB4XJKUWmtkzlTVKqZU7oNCsLA=", 0, NULL); ldns_rr_print(stdout, rr); printf("\n"); printf("rr sig with inception as date\n"); - rr = ldns_rr_new_frm_str("nlnetlabs.nl. 86400 IN RRSIG DNSKEY RSASHA1 2 86400 20050105121300 1112103776 43791 nlnetlabs.nl. FE//RZ0Z1sMzea0ioOLFpUIcM3wnxLGndtKUXJSM3SQ3BlYok2fUTiI+zegNoB1YdylWsfohZJfjkODrOJO9PSbN7hMHmzFEsDFAbCU75TySBuxv2UQlQVuTznxtRdvLGIRGxRhPmjlc/gtJPMB4XJKUWmtkzlTVKqZU7oNCsLA="); + rr = ldns_rr_new_frm_str("nlnetlabs.nl. 86400 IN RRSIG DNSKEY RSASHA1 2 86400 20050105121300 1112103776 43791 nlnetlabs.nl. FE//RZ0Z1sMzea0ioOLFpUIcM3wnxLGndtKUXJSM3SQ3BlYok2fUTiI+zegNoB1YdylWsfohZJfjkODrOJO9PSbN7hMHmzFEsDFAbCU75TySBuxv2UQlQVuTznxtRdvLGIRGxRhPmjlc/gtJPMB4XJKUWmtkzlTVKqZU7oNCsLA=", 0, NULL); ldns_rr_print(stdout, rr); printf("\n"); /* miss formed */ - rr = ldns_rr_new_frm_str("a.miek.nl. 1800 IN MX 10"); + rr = ldns_rr_new_frm_str("a.miek.nl. 1800 IN MX 10", 0, NULL); ldns_rr_print(stdout, rr); printf("\n"); - rr = ldns_rr_new_frm_str("a.miek.nl. 1800 IN A 267.271.122.1t"); + rr = ldns_rr_new_frm_str("a.miek.nl. 1800 IN A 267.271.122.1t", 0, NULL); ldns_rr_print(stdout, rr); printf("\n"); printf("this must work again\n"); - rr = ldns_rr_new_frm_str("a.miek.nl. IN A 127.0.0.1"); + rr = ldns_rr_new_frm_str("a.miek.nl. IN A 127.0.0.1", 0, NULL); ldns_rr_print(stdout, rr); printf("\n"); - rr = ldns_rr_new_frm_str("a.miek.nl. 1D IN A 127.0.0.1"); + rr = ldns_rr_new_frm_str("a.miek.nl. 1D IN A 127.0.0.1", 0, NULL); ldns_rr_print(stdout, rr); printf("\n"); - rr = ldns_rr_new_frm_str("a.miek.nl. 1800 IN A 195.169.222.38"); + rr = ldns_rr_new_frm_str("a.miek.nl. 1800 IN A 195.169.222.38", 0, NULL); ldns_rr_print(stdout, rr); printf("\n"); diff --git a/tests/run-test20.c b/tests/run-test20.c index 83f526a5..8623c5de 100644 --- a/tests/run-test20.c +++ b/tests/run-test20.c @@ -61,7 +61,7 @@ main(void) ldns_key_list_push_key(keys, privkey); - rr = ldns_rr_new_frm_str("www.miek.nl IN A 127.0.0.1"); + rr = ldns_rr_new_frm_str("www.miek.nl IN A 127.0.0.1", 0, NULL); ldns_rr_print(stdout, rr); ldns_rr_list_push_rr(rrs, rr);