Jae Kwon
11 years ago
3 changed files with 326 additions and 154 deletions
Split View
Diff Options
-
+167 -49peer/addrbook.go
-
+159 -0peer/addrbook_test.go
-
+0 -105peer/knownaddress.go
+ 167
- 49
peer/addrbook.go
View File
+ 159
- 0
peer/addrbook_test.go
View File
| @ -0,0 +1,159 @@ | |||
| package peer | |||
| import ( | |||
| "fmt" | |||
| "io/ioutil" | |||
| "math/rand" | |||
| "testing" | |||
| ) | |||
| func createTempFileName(prefix string) string { | |||
| f, err := ioutil.TempFile("", prefix) | |||
| if err != nil { | |||
| panic(err) | |||
| } | |||
| fname := f.Name() | |||
| err = f.Close() | |||
| if err != nil { | |||
| panic(err) | |||
| } | |||
| return fname | |||
| } | |||
| func TestEmpty(t *testing.T) { | |||
| fname := createTempFileName("addrbook_test") | |||
| // t.Logf("New tempfile name: %v", fname) | |||
| // Save an empty book & load it | |||
| book := NewAddrBook(fname) | |||
| book.saveToFile(fname) | |||
| book = NewAddrBook(fname) | |||
| book.loadFromFile(fname) | |||
| if book.Size() != 0 { | |||
| t.Errorf("Expected 0 addresses, found %v", book.Size()) | |||
| } | |||
| } | |||
| func randIPv4Address() *NetAddress { | |||
| for { | |||
| ip := fmt.Sprintf("%v.%v.%v.%v", | |||
| rand.Intn(254)+1, | |||
| rand.Intn(255), | |||
| rand.Intn(255), | |||
| rand.Intn(255), | |||
| ) | |||
| port := rand.Intn(65535-1) + 1 | |||
| addr := NewNetAddressString(fmt.Sprintf("%v:%v", ip, port)) | |||
| if addr.Routable() { | |||
| return addr | |||
| } | |||
| } | |||
| } | |||
| func TestSaveAddresses(t *testing.T) { | |||
| fname := createTempFileName("addrbook_test") | |||
| //t.Logf("New tempfile name: %v", fname) | |||
| // Create some random addresses | |||
| randAddrs := []struct { | |||
| addr *NetAddress | |||
| src *NetAddress | |||
| }{} | |||
| for i := 0; i < 100; i++ { | |||
| addr := randIPv4Address() | |||
| src := randIPv4Address() | |||
| randAddrs = append(randAddrs, struct { | |||
| addr *NetAddress | |||
| src *NetAddress | |||
| }{ | |||
| addr: addr, | |||
| src: src, | |||
| }) | |||
| } | |||
| // Create the book & populate & save | |||
| book := NewAddrBook(fname) | |||
| for _, addrSrc := range randAddrs { | |||
| book.AddAddress(addrSrc.addr, addrSrc.src) | |||
| } | |||
| if book.Size() != 100 { | |||
| t.Errorf("Expected 100 addresses, found %v", book.Size()) | |||
| } | |||
| book.saveToFile(fname) | |||
| // Reload the book | |||
| book = NewAddrBook(fname) | |||
| book.loadFromFile(fname) | |||
| // Test ... | |||
| if book.Size() != 100 { | |||
| t.Errorf("Expected 100 addresses, found %v", book.Size()) | |||
| } | |||
| for _, addrSrc := range randAddrs { | |||
| addr := addrSrc.addr | |||
| src := addrSrc.src | |||
| ka := book.addrNewIndex[addr.String()] | |||
| if ka == nil { | |||
| t.Fatalf("Expected to find KnownAddress %v but wasn't there.", addr) | |||
| } | |||
| if !(ka.Addr.Equals(addr) && ka.Src.Equals(src)) { | |||
| t.Fatalf("KnownAddress doesn't match addr & src") | |||
| } | |||
| } | |||
| } | |||
| func TestPromoteToOld(t *testing.T) { | |||
| fname := createTempFileName("addrbook_test") | |||
| t.Logf("New tempfile name: %v", fname) | |||
| // Create some random addresses | |||
| randAddrs := []struct { | |||
| addr *NetAddress | |||
| src *NetAddress | |||
| }{} | |||
| for i := 0; i < 100; i++ { | |||
| addr := randIPv4Address() | |||
| src := randIPv4Address() | |||
| randAddrs = append(randAddrs, struct { | |||
| addr *NetAddress | |||
| src *NetAddress | |||
| }{ | |||
| addr: addr, | |||
| src: src, | |||
| }) | |||
| } | |||
| // Create the book & populate & save | |||
| book := NewAddrBook(fname) | |||
| for _, addrSrc := range randAddrs { | |||
| book.AddAddress(addrSrc.addr, addrSrc.src) | |||
| } | |||
| // Attempt all addresses. | |||
| for _, addrSrc := range randAddrs { | |||
| book.MarkAttempt(addrSrc.addr) | |||
| } | |||
| // Promote half of them | |||
| for i, addrSrc := range randAddrs { | |||
| if i%2 == 0 { | |||
| book.MarkGood(addrSrc.addr) | |||
| } | |||
| } | |||
| book.saveToFile(fname) | |||
| // Reload the book | |||
| book = NewAddrBook(fname) | |||
| book.loadFromFile(fname) | |||
| // Test ... | |||
| if book.Size() != 100 { | |||
| t.Errorf("Expected 100 addresses, found %v", book.Size()) | |||
| } | |||
| // TODO: do more testing :) | |||
| } | |||
+ 0
- 105
peer/knownaddress.go
View File
| @ -1,105 +0,0 @@ | |||
| package peer | |||
| import ( | |||
| "io" | |||
| "time" | |||
| . "github.com/tendermint/tendermint/binary" | |||
| ) | |||
| /* | |||
| KnownAddress | |||
| tracks information about a known network address that is used | |||
| to determine how viable an address is. | |||
| */ | |||
| type KnownAddress struct { | |||
| Addr *NetAddress | |||
| Src *NetAddress | |||
| Attempts UInt32 | |||
| LastAttempt Time | |||
| LastSuccess Time | |||
| NewRefs UInt16 | |||
| OldBucket Int16 | |||
| } | |||
| func NewKnownAddress(addr *NetAddress, src *NetAddress) *KnownAddress { | |||
| return &KnownAddress{ | |||
| Addr: addr, | |||
| Src: src, | |||
| OldBucket: -1, | |||
| LastAttempt: Time{time.Now()}, | |||
| Attempts: 0, | |||
| } | |||
| } | |||
| func ReadKnownAddress(r io.Reader) *KnownAddress { | |||
| return &KnownAddress{ | |||
| Addr: ReadNetAddress(r), | |||
| Src: ReadNetAddress(r), | |||
| Attempts: ReadUInt32(r), | |||
| LastAttempt: ReadTime(r), | |||
| LastSuccess: ReadTime(r), | |||
| NewRefs: ReadUInt16(r), | |||
| OldBucket: ReadInt16(r), | |||
| } | |||
| } | |||
| func (ka *KnownAddress) WriteTo(w io.Writer) (n int64, err error) { | |||
| n, err = WriteOnto(ka.Addr, w, n, err) | |||
| n, err = WriteOnto(ka.Src, w, n, err) | |||
| n, err = WriteOnto(ka.Attempts, w, n, err) | |||
| n, err = WriteOnto(ka.LastAttempt, w, n, err) | |||
| n, err = WriteOnto(ka.LastSuccess, w, n, err) | |||
| n, err = WriteOnto(ka.NewRefs, w, n, err) | |||
| n, err = WriteOnto(ka.OldBucket, w, n, err) | |||
| return | |||
| } | |||
| func (ka *KnownAddress) MarkAttempt(success bool) { | |||
| now := Time{time.Now()} | |||
| ka.LastAttempt = now | |||
| if success { | |||
| ka.LastSuccess = now | |||
| ka.Attempts = 0 | |||
| } else { | |||
| ka.Attempts += 1 | |||
| } | |||
| } | |||
| /* | |||
| An address is bad if the address in question has not been tried in the last | |||
| minute and meets one of the following criteria: | |||
| 1) It claims to be from the future | |||
| 2) It hasn't been seen in over a month | |||
| 3) It has failed at least three times and never succeeded | |||
| 4) It has failed ten times in the last week | |||
| All addresses that meet these criteria are assumed to be worthless and not | |||
| worth keeping hold of. | |||
| */ | |||
| func (ka *KnownAddress) Bad() bool { | |||
| // Has been attempted in the last minute --> good | |||
| if ka.LastAttempt.Before(time.Now().Add(-1 * time.Minute)) { | |||
| return false | |||
| } | |||
| // Over a month old? | |||
| if ka.LastAttempt.After(time.Now().Add(-1 * numMissingDays * time.Hour * 24)) { | |||
| return true | |||
| } | |||
| // Never succeeded? | |||
| if ka.LastSuccess.IsZero() && ka.Attempts >= numRetries { | |||
| return true | |||
| } | |||
| // Hasn't succeeded in too long? | |||
| if ka.LastSuccess.Before(time.Now().Add(-1*minBadDays*time.Hour*24)) && | |||
| ka.Attempts >= maxFailures { | |||
| return true | |||
| } | |||
| return false | |||
| } | |||