Merge branch 'develop' of https://github.com/verisign/getdns into develop

This commit is contained in:
Glen Wiley 2014-02-24 09:26:56 -05:00
commit 8068e02ffc
4 changed files with 7 additions and 8 deletions

Binary file not shown.

BIN
spec/getdns-0.5.tgz Normal file

Binary file not shown.

View File

@ -2,11 +2,6 @@
<html><head><title>DNS API Description</title> <html><head><title>DNS API Description</title>
<meta http-equiv="Content-type" content="text/html;charset=UTF-8"> <meta http-equiv="Content-type" content="text/html;charset=UTF-8">
<!--
Need different returns for getdns_address, getdns_hostname, and getdns_service;
also need to fix examples
-->
<style type="text/css"> <style type="text/css">
<!-- <!--
div.forh { white-space: pre; font-family: monospace; margin-top: 0; margin-bottom: 0 } div.forh { white-space: pre; font-family: monospace; margin-top: 0; margin-bottom: 0 }
@ -493,11 +488,11 @@ getdns_service_sync(
<p>When you are done with the data in the response, use the following function so that the API can <p>When you are done with the data in the response, use the following function so that the API can
free the memory from its internal pool.</p> free the memory from its internal pool.</p>
<pre>void <div class=forh>void
getdns_dict_destroy( getdns_dict_destroy(
getdns_dict *response getdns_dict *response
); );
</pre> </div>
<h1>2. Data structures in the API</h1> <h1>2. Data structures in the API</h1>
@ -1910,6 +1905,8 @@ as it is for the synchronous example, it is just done in <code>main()</code>.</p
<span class="n">this_ret</span> <span class="o">=</span> <span class="n">getdns_dict_get_bindata</span><span class="p">(</span><span class="n">this_rdata</span><span class="p">,</span> <span class="s">&quot;rdata_raw&quot;</span><span class="p">,</span> <span class="o">&amp;</span><span class="n">this_dname</span><span class="p">);</span> <span class="n">this_ret</span> <span class="o">=</span> <span class="n">getdns_dict_get_bindata</span><span class="p">(</span><span class="n">this_rdata</span><span class="p">,</span> <span class="s">&quot;rdata_raw&quot;</span><span class="p">,</span> <span class="o">&amp;</span><span class="n">this_dname</span><span class="p">);</span>
<span class="kt">char</span> <span class="o">*</span><span class="n">this_dname_str</span><span class="p">;</span> <span class="kt">char</span> <span class="o">*</span><span class="n">this_dname_str</span><span class="p">;</span>
<span class="n">this_ret</span> <span class="o">=</span> <span class="n">getdns_convert_dns_name_to_fqdn</span><span class="p">(</span><span class="n">this_dname</span><span class="p">,</span> <span class="o">&amp;</span><span class="n">this_dname_str</span><span class="p">);</span> <span class="c1">// Ignore any error</span> <span class="n">this_ret</span> <span class="o">=</span> <span class="n">getdns_convert_dns_name_to_fqdn</span><span class="p">(</span><span class="n">this_dname</span><span class="p">,</span> <span class="o">&amp;</span><span class="n">this_dname_str</span><span class="p">);</span> <span class="c1">// Ignore any error</span>
<span class="n">printf</span><span class="p">(</span><span class="s">&quot;The dname is %s</span><span class="se">\n</span><span class="s">&quot;</span><span class="p">,</span> <span class="n">this_dname_str</span><span class="p">);</span>
<span class="n">free</span><span class="p">(</span><span class="n">this_dname_str</span><span class="p">);</span>
<span class="p">}</span> <span class="p">}</span>
<span class="p">}</span> <span class="p">}</span>
@ -2443,7 +2440,7 @@ getdns_pretty_print_dict() for debugging.</li>
<h1>9. The Generated Files</h1> <h1>9. The Generated Files</h1>
<p>There is <a href="getdns-0.404.tgz">a tarball</a> that includes the .h files, <p>There is <a href="getdns-0.5.tgz">a tarball</a> that includes the .h files,
the examples, and so on. The examples all make, even though there is no API implementation, based the examples, and so on. The examples all make, even though there is no API implementation, based
on a pseudo-implementation in the tarball; see make-examples-PLATFORM.sh. Note that this currently builds fine on a pseudo-implementation in the tarball; see make-examples-PLATFORM.sh. Note that this currently builds fine
on the Macintosh and Ubuntu; help is definitely appreciated on making the build process on the Macintosh and Ubuntu; help is definitely appreciated on making the build process

View File

@ -60,6 +60,8 @@ void this_callbackfn(getdns_context *this_context,
this_ret = getdns_dict_get_bindata(this_rdata, "rdata_raw", &this_dname); this_ret = getdns_dict_get_bindata(this_rdata, "rdata_raw", &this_dname);
char *this_dname_str; char *this_dname_str;
this_ret = getdns_convert_dns_name_to_fqdn(this_dname, &this_dname_str); // Ignore any error this_ret = getdns_convert_dns_name_to_fqdn(this_dname, &this_dname_str); // Ignore any error
printf("The dname is %s\n", this_dname_str);
free(this_dname_str);
} }
} }