Here is a patch from another venue.
HTH
jam
--- Begin Message ---
--- End Message ---
Michael Weiner schreef:
> Got it, thank you for that explaination :)
Writing a converter to include a TYPE99 record seems an awful lot of
waste, given the simplicity of patching BIND9 to understand the newly
assigned SPF RR:
# dig sixxs.com SPF
; <<>> DiG 9.3.1 <<>> sixxs.com SPF
;; global options: printcmd
;; Got answer:
;; ->>HEADER<<- opcode: QUERY, status: NOERROR, id: 57187
;; flags: qr rd ra; QUERY: 1, ANSWER: 1, AUTHORITY: 3, ADDITIONAL: 3
;; QUESTION SECTION:
;sixxs.com. IN SPF
;; ANSWER SECTION:
sixxs.com. 86400 IN SPF "v=spf1 -all"
;; AUTHORITY SECTION:
sixxs.com. 86396 IN NS ns2.sixxs.net.
sixxs.com. 86396 IN NS ns3.sixxs.net.
sixxs.com. 86396 IN NS ns1.sixxs.net.
;; ADDITIONAL SECTION:
ns1.sixxs.net. 172796 IN A 213.197.29.32
ns2.sixxs.net. 172796 IN A 193.109.122.62
ns3.sixxs.net. 172796 IN A 193.1.31.74
;; Query time: 79 msec
;; SERVER: 127.0.0.1#53(127.0.0.1)
;; WHEN: Tue Jul 12 17:16:44 2005
;; MSG SIZE rcvd: 162
And *yes*, this is the real output of dig... :-)
Arjen
PS The attached files will make the necessary modifications to BIND
9.3.1. The 'spf_99.[ch]' files go into the 'lib/dns/rdata/generic/'
directory and the 'bind-spf.diff' patches 'bin/tests/rdata_test.c'.
-------
Sender Policy Framework: http://spf.pobox.com/
Archives at http://archives.listbox.com/spf-discuss/current/
To unsubscribe, change your address, or temporarily deactivate your
subscription,
please go to http://v2.listbox.com/member/[EMAIL PROTECTED]
--- bin/tests/rdata_test.orig 2004-03-08 05:04:27.000000000 +0100
+++ bin/tests/rdata_test.c 2005-07-12 16:32:59.416012345 +0200
@@ -269,6 +269,11 @@
result = dns_rdata_tostruct(rdata, sp = &txt, NULL);
break;
}
+ case dns_rdatatype_spf: {
+ dns_rdata_spf_t spf;
+ result = dns_rdata_tostruct(rdata, sp = &spf, NULL);
+ break;
+ }
case dns_rdatatype_unspec: {
dns_rdata_unspec_t unspec;
result = dns_rdata_tostruct(rdata, sp = &unspec, NULL);
@@ -526,6 +531,11 @@
result = dns_rdata_tostruct(rdata, sp = &txt, mctx);
break;
}
+ case dns_rdatatype_spf: {
+ dns_rdata_spf_t spf;
+ result = dns_rdata_tostruct(rdata, sp = &spf, mctx);
+ break;
+ }
case dns_rdatatype_unspec: {
dns_rdata_unspec_t unspec;
result = dns_rdata_tostruct(rdata, sp = &unspec, mctx);
@@ -813,6 +823,11 @@
result = dns_rdata_fromstruct(rdata2, rdc, rdt, &txt, b);
break;
}
+ case dns_rdatatype_spf: {
+ dns_rdata_spf_t spf;
+ result = dns_rdata_fromstruct(rdata2, rdc, rdt, &spf, b);
+ break;
+ }
case dns_rdatatype_unspec: {
dns_rdata_unspec_t unspec;
result = dns_rdata_fromstruct(rdata2, rdc, rdt, &unspec, b);
-------
Sender Policy Framework: http://spf.pobox.com/
Archives at http://archives.listbox.com/spf-discuss/current/
To unsubscribe, change your address, or temporarily deactivate your
subscription,
please go to http://v2.listbox.com/member/[EMAIL PROTECTED]/*
* Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1998-2002 Internet Software Consortium.
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
* THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
* REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
* AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
* INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
* LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
* OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: spf_99.c,v 1.37.12.4 2004/03/08 09:04:42 marka Exp $ */
/* Reviewed: Thu Mar 16 15:40:00 PST 2000 by bwelling */
#ifndef RDATA_GENERIC_SPF_99_C
#define RDATA_GENERIC_SPF_99_C
#define RRTYPE_SPF_ATTRIBUTES (0)
static inline isc_result_t
fromtext_spf(ARGS_FROMTEXT) {
isc_token_t token;
int strings;
REQUIRE(type == 99);
UNUSED(type);
UNUSED(rdclass);
UNUSED(origin);
UNUSED(options);
UNUSED(callbacks);
strings = 0;
for (;;) {
RETERR(isc_lex_getmastertoken(lexer, &token,
isc_tokentype_qstring,
ISC_TRUE));
if (token.type != isc_tokentype_qstring &&
token.type != isc_tokentype_string)
break;
RETTOK(txt_fromtext(&token.value.as_textregion, target));
strings++;
}
/* Let upper layer handle eol/eof. */
isc_lex_ungettoken(lexer, &token);
return (strings == 0 ? ISC_R_UNEXPECTEDEND : ISC_R_SUCCESS);
}
static inline isc_result_t
totext_spf(ARGS_TOTEXT) {
isc_region_t region;
UNUSED(tctx);
REQUIRE(rdata->type == 99);
dns_rdata_toregion(rdata, ®ion);
while (region.length > 0) {
RETERR(txt_totext(®ion, target));
if (region.length > 0)
RETERR(str_totext(" ", target));
}
return (ISC_R_SUCCESS);
}
static inline isc_result_t
fromwire_spf(ARGS_FROMWIRE) {
isc_result_t result;
REQUIRE(type == 99);
UNUSED(type);
UNUSED(dctx);
UNUSED(rdclass);
UNUSED(options);
do {
result = txt_fromwire(source, target);
if (result != ISC_R_SUCCESS)
return (result);
} while (!buffer_empty(source));
return (ISC_R_SUCCESS);
}
static inline isc_result_t
towire_spf(ARGS_TOWIRE) {
isc_region_t region;
REQUIRE(rdata->type == 99);
UNUSED(cctx);
isc_buffer_availableregion(target, ®ion);
if (region.length < rdata->length)
return (ISC_R_NOSPACE);
memcpy(region.base, rdata->data, rdata->length);
isc_buffer_add(target, rdata->length);
return (ISC_R_SUCCESS);
}
static inline int
compare_spf(ARGS_COMPARE) {
isc_region_t r1;
isc_region_t r2;
REQUIRE(rdata1->type == rdata2->type);
REQUIRE(rdata1->rdclass == rdata2->rdclass);
REQUIRE(rdata1->type == 99);
dns_rdata_toregion(rdata1, &r1);
dns_rdata_toregion(rdata2, &r2);
return (isc_region_compare(&r1, &r2));
}
static inline isc_result_t
fromstruct_spf(ARGS_FROMSTRUCT) {
dns_rdata_spf_t *txt = source;
isc_region_t region;
isc_uint8_t length;
REQUIRE(type == 99);
REQUIRE(source != NULL);
REQUIRE(txt->common.rdtype == type);
REQUIRE(txt->common.rdclass == rdclass);
REQUIRE(txt->txt != NULL && txt->txt_len != 0);
UNUSED(type);
UNUSED(rdclass);
region.base = txt->txt;
region.length = txt->txt_len;
while (region.length > 0) {
length = uint8_fromregion(®ion);
isc_region_consume(®ion, 1);
if (region.length <= length)
return (ISC_R_UNEXPECTEDEND);
isc_region_consume(®ion, length);
}
return (mem_tobuffer(target, txt->txt, txt->txt_len));
}
static inline isc_result_t
tostruct_spf(ARGS_TOSTRUCT) {
dns_rdata_spf_t *txt = target;
isc_region_t r;
REQUIRE(rdata->type == 99);
REQUIRE(target != NULL);
txt->common.rdclass = rdata->rdclass;
txt->common.rdtype = rdata->type;
ISC_LINK_INIT(&txt->common, link);
dns_rdata_toregion(rdata, &r);
txt->txt_len = r.length;
txt->txt = mem_maybedup(mctx, r.base, r.length);
if (txt->txt == NULL)
return (ISC_R_NOMEMORY);
txt->offset = 0;
txt->mctx = mctx;
return (ISC_R_SUCCESS);
}
static inline void
freestruct_spf(ARGS_FREESTRUCT) {
dns_rdata_spf_t *txt = source;
REQUIRE(source != NULL);
REQUIRE(txt->common.rdtype == 99);
if (txt->mctx == NULL)
return;
if (txt->txt != NULL)
isc_mem_free(txt->mctx, txt->txt);
txt->mctx = NULL;
}
static inline isc_result_t
additionaldata_spf(ARGS_ADDLDATA) {
REQUIRE(rdata->type == 99);
UNUSED(rdata);
UNUSED(add);
UNUSED(arg);
return (ISC_R_SUCCESS);
}
static inline isc_result_t
digest_spf(ARGS_DIGEST) {
isc_region_t r;
REQUIRE(rdata->type == 99);
dns_rdata_toregion(rdata, &r);
return ((digest)(arg, &r));
}
static inline isc_boolean_t
checkowner_spf(ARGS_CHECKOWNER) {
REQUIRE(type == 99);
UNUSED(name);
UNUSED(type);
UNUSED(rdclass);
UNUSED(wildcard);
return (ISC_TRUE);
}
static inline isc_boolean_t
checknames_spf(ARGS_CHECKNAMES) {
REQUIRE(rdata->type == 99);
UNUSED(rdata);
UNUSED(owner);
UNUSED(bad);
return (ISC_TRUE);
}
#endif /* RDATA_GENERIC_SPF_99_C */
-------
Sender Policy Framework: http://spf.pobox.com/
Archives at http://archives.listbox.com/spf-discuss/current/
To unsubscribe, change your address, or temporarily deactivate your
subscription,
please go to http://v2.listbox.com/member/[EMAIL PROTECTED]/*
* Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1998-2001 Internet Software Consortium.
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
* THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
* REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
* AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
* INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
* LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
* OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
#ifndef GENERIC_SPF_99_H
#define GENERIC_SPF_99_H 1
/* $Id: spf_99.h,v 1.23.206.1 2004/03/06 08:14:14 marka Exp $ */
typedef struct dns_rdata_spf_string {
isc_uint8_t length;
unsigned char *data;
} dns_rdata_spf_string_t;
typedef struct dns_rdata_spf {
dns_rdatacommon_t common;
isc_mem_t *mctx;
unsigned char *txt;
isc_uint16_t txt_len;
/* private */
isc_uint16_t offset;
} dns_rdata_spf_t;
/*
* ISC_LANG_BEGINDECLS and ISC_LANG_ENDDECLS are already done
* via rdatastructpre.h and rdatastructsuf.h.
*/
isc_result_t
dns_rdata_spf_first(dns_rdata_spf_t *);
isc_result_t
dns_rdata_spf_next(dns_rdata_spf_t *);
isc_result_t
dns_rdata_spf_current(dns_rdata_spf_t *, dns_rdata_spf_string_t *);
#endif /* GENERIC_SPF_99_H */
