community
/
dns
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove UPDATE_LEASE to UL 

The "other" edns0 option will then become LONG_LIVED_QUERIES which
is way to long to be practical, so I want to make it LLQ, UPDATE_LEASE
then needs to be come UL.

This will probably impact no-one, because noone uses this (I hope)
This commit is contained in:
Miek Gieben 2013-05-08 22:28:19 +02:00
parent d287a66098
commit 6ecde82c20
2 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
edns.go
View File

@ -34,12 +34,11 @@ import (
// EDNS0 Option codes. // EDNS0 Option codes.
const ( const (
EDNS0LLQ = 0x1 // not used EDNS0LLQ = 0x1 // long lived queries: http://tools.ietf.org/html/draft-sekar-dns-llq-01
EDNS0UL = 0x2 // not used EDNS0UL = 0x2 // update lease draft: http://files.dns-sd.org/draft-sekar-dns-ul.txt
EDNS0UPDATELEASE = 0x2 // update lease draft EDNS0NSID = 0x3 // nsid (RFC5001)
EDNS0NSID = 0x3 // nsid (RFC5001) EDNS0SUBNET = 0x50fa // client-subnet draft: http://tools.ietf.org/html/draft-vandergaast-edns-client-subnet-01
EDNS0SUBNET = 0x50fa // client-subnet draft _DO = 1 << 7 // dnssec ok
_DO = 1 << 7 // dnssec ok
) )
type OPT struct { type OPT struct {
@ -74,7 +73,7 @@ func (rr *OPT) String() string {
} }
case *EDNS0_SUBNET: case *EDNS0_SUBNET:
s += "\n; SUBNET: " + o.String() s += "\n; SUBNET: " + o.String()
case *EDNS0_UPDATE_LEASE: case *EDNS0_UL:
s += "\n; LEASE: " + o.String() s += "\n; LEASE: " + o.String()
} }
} }
@ -303,7 +302,7 @@ func (e *EDNS0_SUBNET) String() (s string) {
return return
} }
// The UPDATE_LEASE EDNS0 (draft RFC) option is used to tell the server to set // The UL (Update Lease) EDNS0 (draft RFC) option is used to tell the server to set
// an expiration on an update RR. This is helpful for clients that cannot clean // an expiration on an update RR. This is helpful for clients that cannot clean
// up after themselves. This is a draft RFC and more information can be found at // up after themselves. This is a draft RFC and more information can be found at
// http://files.dns-sd.org/draft-sekar-dns-ul.txt // http://files.dns-sd.org/draft-sekar-dns-ul.txt
@ -311,22 +310,22 @@ func (e *EDNS0_SUBNET) String() (s string) {
// o := new(dns.OPT) // o := new(dns.OPT)
// o.Hdr.Name = "." // o.Hdr.Name = "."
// o.Hdr.Rrtype = dns.TypeOPT // o.Hdr.Rrtype = dns.TypeOPT
// e := new(dns.EDNS0_UPDATE_LEASE) // e := new(dns.EDNS0_UL)
// e.Code = dns.EDNS0UPDATELEASE // e.Code = dns.EDNS0UL
// e.Lease = 120 // in seconds // e.Lease = 120 // in seconds
// o.Option = append(o.Option, e) // o.Option = append(o.Option, e)
type EDNS0_UPDATE_LEASE struct { type EDNS0_UL struct {
Code uint16 // Always EDNS0UPDATELEASE Code uint16 // Always EDNS0UL
Lease uint32 Lease uint32
} }
func (e *EDNS0_UPDATE_LEASE) Option() uint16 { func (e *EDNS0_UL) Option() uint16 {
return EDNS0UPDATELEASE return EDNS0UL
} }
// Copied: http://golang.org/src/pkg/net/dnsmsg.go // Copied: http://golang.org/src/pkg/net/dnsmsg.go
func (e *EDNS0_UPDATE_LEASE) pack() ([]byte, error) { func (e *EDNS0_UL) pack() ([]byte, error) {
b := make([]byte, 4) b := make([]byte, 4)
b[0] = byte(e.Lease >> 24) b[0] = byte(e.Lease >> 24)
b[1] = byte(e.Lease >> 16) b[1] = byte(e.Lease >> 16)
@ -335,10 +334,10 @@ func (e *EDNS0_UPDATE_LEASE) pack() ([]byte, error) {
return b, nil return b, nil
} }
func (e *EDNS0_UPDATE_LEASE) unpack(b []byte) { func (e *EDNS0_UL) unpack(b []byte) {
e.Lease = uint32(b[0])<<24 | uint32(b[1])<<16 | uint32(b[2])<<8 | uint32(b[3]) e.Lease = uint32(b[0])<<24 | uint32(b[1])<<16 | uint32(b[2])<<8 | uint32(b[3])
} }
func (e *EDNS0_UPDATE_LEASE) String() string { func (e *EDNS0_UL) String() string {
return strconv.Itoa(int(e.Lease)) return strconv.Itoa(int(e.Lease))
} }

4
msg.go
View File

@ -750,8 +750,8 @@ func unpackStructValue(val reflect.Value, msg []byte, off int) (off1 int, err er
e.unpack(msg[off1 : off1+int(optlen)]) e.unpack(msg[off1 : off1+int(optlen)])
edns = append(edns, e) edns = append(edns, e)
off = off1 + int(optlen) off = off1 + int(optlen)
case EDNS0UPDATELEASE: case EDNS0UL:
e := new(EDNS0_UPDATE_LEASE) e := new(EDNS0_UL)
e.unpack(msg[off1 : off1+int(optlen)]) e.unpack(msg[off1 : off1+int(optlen)])
edns = append(edns, e) edns = append(edns, e)
off = off1 + int(optlen) off = off1 + int(optlen)