mirror of
https://github.com/nadoo/glider.git
synced 2026-11-19 07:09:42 +08:00
dns: update cache when an item expired
This commit is contained in:
1 parent
6d64ee4c0e
commit
6eda2b79c8
10 files changed
+80
-78
No files matched your search
+19
-18
@@ -9,31 +9,31 @@ import (
|
||||
type LruCache struct {
|
||||
mu sync.Mutex
|
||||
size int
|
||||
head *Item
|
||||
tail *Item
|
||||
cache map[string]*Item
|
||||
head *item
|
||||
tail *item
|
||||
cache map[string]*item
|
||||
store map[string][]byte
|
||||
}
|
||||
|
||||
// Item is the struct of cache item.
|
||||
type Item struct {
|
||||
// item is the struct of cache item.
|
||||
type item struct {
|
||||
key string
|
||||
val []byte
|
||||
exp int64
|
||||
prev *Item
|
||||
next *Item
|
||||
prev *item
|
||||
next *item
|
||||
}
|
||||
|
||||
// NewCache returns a new LruCache.
|
||||
// NewLruCache returns a new LruCache.
|
||||
func NewLruCache(size int) *LruCache {
|
||||
// init 2 items here, it doesn't matter cuz they will be deleted when the cache if full
|
||||
head, tail := &Item{key: "head"}, &Item{key: "tail"}
|
||||
// init 2 items here, it doesn't matter cuz they will be deleted when the cache is full
|
||||
head, tail := &item{key: "head"}, &item{key: "tail"}
|
||||
head.next, tail.prev = tail, head
|
||||
c := &LruCache{
|
||||
size: size,
|
||||
head: head,
|
||||
tail: tail,
|
||||
cache: make(map[string]*Item, size),
|
||||
cache: make(map[string]*item, size),
|
||||
store: make(map[string][]byte),
|
||||
}
|
||||
c.cache[head.key], c.cache[tail.key] = head, tail
|
||||
@@ -82,6 +82,9 @@ func (c *LruCache) Set(k string, v []byte, ttl int) {
|
||||
}
|
||||
|
||||
c.putToHead(k, v, exp)
|
||||
|
||||
// NOTE: the cache size will always be c.size + 2,
|
||||
// but it doesn't matter in our environment.
|
||||
if len(c.cache) > c.size {
|
||||
c.removeTail()
|
||||
}
|
||||
@@ -89,17 +92,17 @@ func (c *LruCache) Set(k string, v []byte, ttl int) {
|
||||
|
||||
// putToHead puts a new item to cache's head.
|
||||
func (c *LruCache) putToHead(k string, v []byte, exp int64) {
|
||||
it := &Item{key: k, val: v, exp: exp, prev: nil, next: c.head}
|
||||
c.cache[k] = it
|
||||
|
||||
it := &item{key: k, val: v, exp: exp, prev: nil, next: c.head}
|
||||
it.prev = nil
|
||||
it.next = c.head
|
||||
c.head.prev = it
|
||||
c.head = it
|
||||
|
||||
c.cache[k] = it
|
||||
}
|
||||
|
||||
// moveToHead moves an existing item to cache's head.
|
||||
func (c *LruCache) moveToHead(it *Item) {
|
||||
func (c *LruCache) moveToHead(it *item) {
|
||||
if it != c.head {
|
||||
if c.tail == it {
|
||||
c.tail = it.prev
|
||||
@@ -119,8 +122,6 @@ func (c *LruCache) moveToHead(it *Item) {
|
||||
func (c *LruCache) removeTail() {
|
||||
delete(c.cache, c.tail.key)
|
||||
|
||||
if c.tail.prev != nil {
|
||||
c.tail.prev.next = nil
|
||||
}
|
||||
c.tail.prev.next = nil
|
||||
c.tail = c.tail.prev
|
||||
}
|
||||
+36
-31
@@ -5,6 +5,7 @@ import (
|
||||
"errors"
|
||||
"io"
|
||||
"net"
|
||||
"strconv"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
@@ -56,21 +57,29 @@ func NewClient(proxy proxy.Proxy, config *Config) (*Client, error) {
|
||||
}
|
||||
|
||||
// Exchange handles request message and returns response message.
|
||||
// NOTE: reqBytes = reqLen + reqMsg.
|
||||
// TODO: optimize it
|
||||
func (c *Client) Exchange(reqBytes []byte, clientAddr string, preferTCP bool) ([]byte, error) {
|
||||
req, err := UnmarshalMessage(reqBytes[2:])
|
||||
req, err := UnmarshalMessage(reqBytes)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
if req.Question.QTYPE == QTypeA || req.Question.QTYPE == QTypeAAAA {
|
||||
v, _ := c.cache.Get(qKey(req.Question))
|
||||
if len(v) > 4 {
|
||||
if v, expired := c.cache.Get(qKey(req.Question)); len(v) > 2 {
|
||||
v = valCopy(v)
|
||||
binary.BigEndian.PutUint16(v[2:4], req.ID)
|
||||
binary.BigEndian.PutUint16(v[:2], req.ID)
|
||||
|
||||
log.F("[dns] %s <-> cache, type: %d, %s",
|
||||
clientAddr, req.Question.QTYPE, req.Question.QNAME)
|
||||
|
||||
if expired { // update cache
|
||||
go func(qname string, reqBytes []byte, preferTCP bool) {
|
||||
defer pool.PutBuffer(reqBytes)
|
||||
if dnsServer, network, dialerAddr, respBytes, err := c.exchange(qname, reqBytes, preferTCP); err == nil {
|
||||
c.handleAnswer(respBytes, clientAddr, dnsServer, network, dialerAddr)
|
||||
}
|
||||
}(req.Question.QNAME, valCopy(reqBytes), preferTCP)
|
||||
}
|
||||
return v, nil
|
||||
}
|
||||
}
|
||||
@@ -86,14 +95,17 @@ func (c *Client) Exchange(reqBytes []byte, clientAddr string, preferTCP bool) ([
|
||||
return respBytes, nil
|
||||
}
|
||||
|
||||
resp, err := UnmarshalMessage(respBytes[2:])
|
||||
err = c.handleAnswer(respBytes, clientAddr, dnsServer, network, dialerAddr)
|
||||
return respBytes, err
|
||||
}
|
||||
|
||||
func (c *Client) handleAnswer(respBytes []byte, clientAddr, dnsServer, network, dialerAddr string) error {
|
||||
resp, err := UnmarshalMessage(respBytes)
|
||||
if err != nil {
|
||||
return respBytes, err
|
||||
return err
|
||||
}
|
||||
|
||||
ips, ttl := c.extractAnswer(resp)
|
||||
|
||||
// add to cache only when there's a valid ip address
|
||||
if len(ips) != 0 && ttl > 0 {
|
||||
c.cache.Set(qKey(resp.Question), valCopy(respBytes), ttl)
|
||||
}
|
||||
@@ -101,7 +113,7 @@ func (c *Client) Exchange(reqBytes []byte, clientAddr string, preferTCP bool) ([
|
||||
log.F("[dns] %s <-> %s(%s) via %s, type: %d, %s: %s",
|
||||
clientAddr, dnsServer, network, dialerAddr, resp.Question.QTYPE, resp.Question.QNAME, strings.Join(ips, ","))
|
||||
|
||||
return respBytes, nil
|
||||
return nil
|
||||
}
|
||||
|
||||
func (c *Client) extractAnswer(resp *Message) ([]string, int) {
|
||||
@@ -197,7 +209,12 @@ func (c *Client) exchange(qname string, reqBytes []byte, preferTCP bool) (
|
||||
|
||||
// exchangeTCP exchange with server over tcp.
|
||||
func (c *Client) exchangeTCP(rc net.Conn, reqBytes []byte) ([]byte, error) {
|
||||
if _, err := rc.Write(reqBytes); err != nil {
|
||||
reqLen := pool.GetBuffer(2)
|
||||
defer pool.PutBuffer(reqLen)
|
||||
|
||||
binary.BigEndian.PutUint16(reqLen, uint16(len(reqBytes)))
|
||||
|
||||
if _, err := (&net.Buffers{reqLen, reqBytes}).WriteTo(rc); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
@@ -206,10 +223,8 @@ func (c *Client) exchangeTCP(rc net.Conn, reqBytes []byte) ([]byte, error) {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
respBytes := pool.GetBuffer(int(respLen) + 2)
|
||||
binary.BigEndian.PutUint16(respBytes[:2], respLen)
|
||||
|
||||
_, err := io.ReadFull(rc, respBytes[2:])
|
||||
respBytes := pool.GetBuffer(int(respLen))
|
||||
_, err := io.ReadFull(rc, respBytes)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -219,18 +234,17 @@ func (c *Client) exchangeTCP(rc net.Conn, reqBytes []byte) ([]byte, error) {
|
||||
|
||||
// exchangeUDP exchange with server over udp.
|
||||
func (c *Client) exchangeUDP(rc net.Conn, reqBytes []byte) ([]byte, error) {
|
||||
if _, err := rc.Write(reqBytes[2:]); err != nil {
|
||||
if _, err := rc.Write(reqBytes); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
respBytes := pool.GetBuffer(UDPMaxLen)
|
||||
n, err := rc.Read(respBytes[2:])
|
||||
n, err := rc.Read(respBytes)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
binary.BigEndian.PutUint16(respBytes[:2], uint16(n))
|
||||
|
||||
return respBytes[:2+n], nil
|
||||
return respBytes[:n], nil
|
||||
}
|
||||
|
||||
// SetServers sets upstream dns servers for the given domain.
|
||||
@@ -268,15 +282,12 @@ func (c *Client) AddRecord(record string) error {
|
||||
wb := pool.GetWriteBuffer()
|
||||
defer pool.PutWriteBuffer(wb)
|
||||
|
||||
wb.Write([]byte{0, 0})
|
||||
|
||||
n, err := m.MarshalTo(wb)
|
||||
_, err = m.MarshalTo(wb)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
binary.BigEndian.PutUint16(wb.Bytes()[:2], uint16(n))
|
||||
c.cache.Set(qKey(m.Question), wb.Bytes(), 0)
|
||||
c.cache.Set(qKey(m.Question), valCopy(wb.Bytes()), 0)
|
||||
|
||||
return nil
|
||||
}
|
||||
@@ -309,13 +320,7 @@ func (c *Client) MakeResponse(domain string, ip string) (*Message, error) {
|
||||
}
|
||||
|
||||
func qKey(q *Question) string {
|
||||
switch q.QTYPE {
|
||||
case QTypeA:
|
||||
return q.QNAME + "/4"
|
||||
case QTypeAAAA:
|
||||
return q.QNAME + "/6"
|
||||
}
|
||||
return q.QNAME
|
||||
return q.QNAME + "/" + strconv.FormatUint(uint64(q.QTYPE), 10)
|
||||
}
|
||||
|
||||
func valCopy(v []byte) (b []byte) {
|
||||
|
||||
+10
-16
@@ -62,22 +62,14 @@ func (s *Server) ListenAndServeUDP(wg *sync.WaitGroup) {
|
||||
for {
|
||||
reqBytes := pool.GetBuffer(UDPMaxLen)
|
||||
|
||||
n, caddr, err := pc.ReadFrom(reqBytes[2:])
|
||||
n, caddr, err := pc.ReadFrom(reqBytes)
|
||||
if err != nil {
|
||||
log.F("[dns] local read error: %v", err)
|
||||
pool.PutBuffer(reqBytes)
|
||||
continue
|
||||
}
|
||||
|
||||
reqLen := uint16(n)
|
||||
if reqLen <= HeaderLen+2 {
|
||||
log.F("[dns] not enough message data")
|
||||
pool.PutBuffer(reqBytes)
|
||||
continue
|
||||
}
|
||||
binary.BigEndian.PutUint16(reqBytes[:2], reqLen)
|
||||
|
||||
go s.ServePacket(pc, caddr, reqBytes[:2+n])
|
||||
go s.ServePacket(pc, caddr, reqBytes[:n])
|
||||
}
|
||||
}
|
||||
|
||||
@@ -94,7 +86,7 @@ func (s *Server) ServePacket(pc net.PacketConn, caddr net.Addr, reqBytes []byte)
|
||||
return
|
||||
}
|
||||
|
||||
_, err = pc.WriteTo(respBytes[2:], caddr)
|
||||
_, err = pc.WriteTo(respBytes, caddr)
|
||||
if err != nil {
|
||||
log.F("[dns] error in local write: %s", err)
|
||||
return
|
||||
@@ -135,17 +127,15 @@ func (s *Server) ServeTCP(c net.Conn) {
|
||||
return
|
||||
}
|
||||
|
||||
reqBytes := pool.GetBuffer(int(reqLen) + 2)
|
||||
reqBytes := pool.GetBuffer(int(reqLen))
|
||||
defer pool.PutBuffer(reqBytes)
|
||||
|
||||
_, err := io.ReadFull(c, reqBytes[2:])
|
||||
_, err := io.ReadFull(c, reqBytes)
|
||||
if err != nil {
|
||||
log.F("[dns-tcp] error in read reqBytes %s", err)
|
||||
return
|
||||
}
|
||||
|
||||
binary.BigEndian.PutUint16(reqBytes[:2], reqLen)
|
||||
|
||||
respBytes, err := s.Exchange(reqBytes, c.RemoteAddr().String(), true)
|
||||
defer pool.PutBuffer(respBytes)
|
||||
if err != nil {
|
||||
@@ -153,7 +143,11 @@ func (s *Server) ServeTCP(c net.Conn) {
|
||||
return
|
||||
}
|
||||
|
||||
if _, err := c.Write(respBytes); err != nil {
|
||||
respLen := pool.GetBuffer(2)
|
||||
defer pool.PutBuffer(respLen)
|
||||
binary.BigEndian.PutUint16(respLen, uint16(len(respBytes)))
|
||||
|
||||
if _, err := (&net.Buffers{respLen, respBytes}).WriteTo(c); err != nil {
|
||||
log.F("[dns-tcp] error in write respBytes: %s", err)
|
||||
return
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user