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

Merge pull request #340 from miekg/edns2-fix 

Put the correct extended rcode in OPT
This commit is contained in:
Miek Gieben 2016-04-09 16:17:25 +01:00
parent c70f867d87 84206d880d
commit b5f8285e2a
2 changed files with 10 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
edns.go
View File

@ -97,12 +97,15 @@ func (rr *OPT) SetVersion(v uint8) {
// ExtendedRcode returns the EDNS extended RCODE field (the upper 8 bits of the TTL). // ExtendedRcode returns the EDNS extended RCODE field (the upper 8 bits of the TTL).
func (rr *OPT) ExtendedRcode() uint8 { func (rr *OPT) ExtendedRcode() uint8 {
return uint8((rr.Hdr.Ttl & 0xFF000000) >> 24) return uint8((rr.Hdr.Ttl&0xFF000000)>>24) + 15
} }
// SetExtendedRcode sets the EDNS extended RCODE field. // SetExtendedRcode sets the EDNS extended RCODE field.
func (rr *OPT) SetExtendedRcode(v uint8) { func (rr *OPT) SetExtendedRcode(v uint8) {
rr.Hdr.Ttl = rr.Hdr.Ttl&0x00FFFFFF | (uint32(v) << 24) if v < RcodeBadVers { // Smaller than 16.. Use the 4 bits you have!
return
}
rr.Hdr.Ttl = rr.Hdr.Ttl&0x00FFFFFF | (uint32(v-15) << 24)
} }
// UDPSize returns the UDP buffer size. // UDPSize returns the UDP buffer size.

26
edns_test.go
View File

@ -8,41 +8,25 @@ func TestOPTTtl(t *testing.T) {
e.Hdr.Rrtype = TypeOPT e.Hdr.Rrtype = TypeOPT
if e.Do() { if e.Do() {
t.Fail() t.Errorf("DO bit should be zero")
} }
e.SetDo() e.SetDo()
if !e.Do() { if !e.Do() {
t.Fail() t.Errorf("DO bit should be non-zero")
} }
oldTtl := e.Hdr.Ttl
if e.Version() != 0 { if e.Version() != 0 {
t.Fail() t.Errorf("version should be non-zero")
} }
e.SetVersion(42) e.SetVersion(42)
if e.Version() != 42 { if e.Version() != 42 {
t.Fail() t.Errorf("set 42, expected %d, got %d", 42, e.Version())
}
e.SetVersion(0)
if e.Hdr.Ttl != oldTtl {
t.Fail()
}
if e.ExtendedRcode() != 0 {
t.Fail()
} }
e.SetExtendedRcode(42) e.SetExtendedRcode(42)
if e.ExtendedRcode() != 42 { if e.ExtendedRcode() != 42 {
t.Fail() t.Errorf("set 42, expected %d, got %d", 42-15, e.ExtendedRcode())
}
e.SetExtendedRcode(0)
if e.Hdr.Ttl != oldTtl {
t.Fail()
} }
} }