From c11509cf41934a1dc5a457a03f6917cb7668a8e4 Mon Sep 17 00:00:00 2001 From: Neel Goyal Date: Tue, 18 Feb 2014 15:10:28 -0500 Subject: [PATCH 1/7] Add opt record specific fields. Fix for issue #73 --- src/rr-dict.c | 15 ++++++++++++--- src/test/tests_stub_async.c | 4 ++-- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/rr-dict.c b/src/rr-dict.c index e1317686..0cc8d912 100644 --- a/src/rr-dict.c +++ b/src/rr-dict.c @@ -156,7 +156,12 @@ static struct rdata_def sink_rdata[] = { static struct rdata_def opt_rdata[] = { { "options" , t_dict }, { "option_code" , t_int }, - { "option_data" , t_bindata }}; + { "option_data" , t_bindata }, + { "udp_payload_size" , t_int }, + { "extended_rcode" , t_int }, + { "version" , t_int }, + { "do" , t_int }, + { "z" , t_int }}; static struct rdata_def apl_rdata[] = { { "apitems" , t_dict }, { "address_family" , t_int }, @@ -1365,13 +1370,17 @@ getdns_return_t priv_getdns_append_opt_rr( getdns_dict_destroy(rr_dict); return GETDNS_RETURN_GENERIC_ERROR; } + /* add rest of the fields */ r = getdns_dict_set_int(rr_dict, "type", GETDNS_RRTYPE_OPT); + r |= getdns_dict_set_int(rr_dict, "udp_payload_size", ldns_pkt_edns_udp_size(pkt)); + r |= getdns_dict_set_int(rr_dict, "extended_rcode", ldns_pkt_edns_extended_rcode(pkt)); + r |= getdns_dict_set_int(rr_dict, "version", ldns_pkt_edns_version(pkt)); + r |= getdns_dict_set_int(rr_dict, "do", ldns_pkt_edns_do(pkt)); + r |= getdns_dict_set_int(rr_dict, "z", ldns_pkt_edns_z(pkt)); if (r != GETDNS_RETURN_GOOD) { getdns_dict_destroy(rr_dict); return GETDNS_RETURN_GENERIC_ERROR; } - /* other fields don't really make sense as they are - interpreted differently */ /* append */ r = getdns_list_set_dict(rdatas, list_len, opt_rr); diff --git a/src/test/tests_stub_async.c b/src/test/tests_stub_async.c index 5abd8c36..7f871fb0 100644 --- a/src/test/tests_stub_async.c +++ b/src/test/tests_stub_async.c @@ -99,13 +99,13 @@ main(int argc, char** argv) return (GETDNS_RETURN_GENERIC_ERROR); } /* Set up the getdns call */ - const char *this_name = argc > 1 ? argv[1] : "mx.kitchensink.net"; + const char *this_name = argc > 1 ? argv[1] : "getdnsapi.net"; char *this_userarg = "somestring"; // Could add things here to help identify this call getdns_transaction_t this_transaction_id = 0; /* Make the call */ getdns_return_t dns_request_return = - getdns_general(this_context, this_name, GETDNS_RRTYPE_APL, + getdns_general(this_context, this_name, GETDNS_RRTYPE_A, NULL, this_userarg, &this_transaction_id, this_callbackfn); if (dns_request_return == GETDNS_RETURN_BAD_DOMAIN_NAME) { fprintf(stderr, "A bad domain name was used: %s. Exiting.", From 955be308d52c2d74852843f6178e5a443dd16700 Mon Sep 17 00:00:00 2001 From: Neel Goyal Date: Tue, 18 Feb 2014 17:45:18 -0500 Subject: [PATCH 2/7] Adding travis.yml for continuous build --- .travis.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 00000000..f5f19f21 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,11 @@ +language: c +compiler: + - gcc + - clang +before_script: + - sudo apt-get update + - sudo apt-get install libunbound-dev libldns-dev libidn11-dev check +script: + - ./configure && make && sudo make install + - make test + From 57f7e1fbd79d2ee9f2fe0276c4401a9621f84c3a Mon Sep 17 00:00:00 2001 From: Neel Goyal Date: Tue, 18 Feb 2014 17:51:48 -0500 Subject: [PATCH 3/7] Only build develop --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f5f19f21..fa5cd445 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,4 +8,6 @@ before_script: script: - ./configure && make && sudo make install - make test - +branches: + only: + - develop From b58000c9c8e5991442eb1c0a9d89fed9358461bd Mon Sep 17 00:00:00 2001 From: Neel Goyal Date: Tue, 18 Feb 2014 18:07:49 -0500 Subject: [PATCH 4/7] Travis dummy push --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fa5cd445..b2b4d06c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,9 @@ before_script: - sudo apt-get update - sudo apt-get install libunbound-dev libldns-dev libidn11-dev check script: - - ./configure && make && sudo make install + - ./configure + - make + - sudo make install - make test branches: only: From 06661559008ff33c7434d73114cfc6b2c9c0527c Mon Sep 17 00:00:00 2001 From: Neel Goyal Date: Tue, 18 Feb 2014 18:38:06 -0500 Subject: [PATCH 5/7] Add travis branch for build --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index b2b4d06c..dd93d62d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,3 +13,4 @@ script: branches: only: - develop + - feature/travis From 2d0e447473944f73250a6d5be49b07e0f95c1cd4 Mon Sep 17 00:00:00 2001 From: Neel Goyal Date: Tue, 18 Feb 2014 18:40:01 -0500 Subject: [PATCH 6/7] Build all branches. Set travis settings to only look for travis.yml --- .travis.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index dd93d62d..ebc8e22b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,3 @@ script: - make - sudo make install - make test -branches: - only: - - develop - - feature/travis From 1ec2f67b0dd76d1ed1f740e4c40909e1fa21a831 Mon Sep 17 00:00:00 2001 From: ngoyal Date: Tue, 18 Feb 2014 19:15:38 -0500 Subject: [PATCH 7/7] Update README.md Add travis-ci build status image --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 2658e2f4..d7348988 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +[![Build Status](https://magnum.travis-ci.com/verisign/getdns.png?token=J2HZXstzJqePUsG523am&branch=develop)](https://magnum.travis-ci.com/verisign/getdns) + getdns API {#mainpage} ==========