idk/bt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implement compact I2P addresses

Browse Source
This commit is contained in:
idk
2022-03-03 17:40:15 -05:00
parent 03d2419ec3
commit 6b9883fae7
4 changed files with 13 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bencode/encode.go
View File

@ -5,7 +5,6 @@ import (
"encoding"
"fmt"
"io"
"log"
"reflect"
"sort"
)
@ -136,7 +135,6 @@ func encodeValue(w io.Writer, val reflect.Value) error {
if err == nil {
_, err = w.Write(byteSlice)
}
log.Println("byteSlice", byteSlice)
return err
}

5
go.mod
View File

@ -2,7 +2,4 @@ module github.com/xgfone/bt
go 1.11
require (
github.com/eyedeekay/goSam v0.32.30 // indirect
github.com/eyedeekay/sam3 v0.32.32 // indirect
)
require github.com/eyedeekay/sam3 v0.32.33-0.20220303215308-ab0064e92e13

21
peerprotocol/extension.go
View File

@ -55,7 +55,8 @@ func (ci CompactIP) String() string {
case net.IPv6len:
return net.IP(ci).String()
case 32:
return i2pkeys.I2PAddr(ci).DestHash().String()
i2p, _ := i2pkeys.DestHashFromBytes(ci)
return i2p.String()
}
log.Printf("CI String: %b, %d", ci, len(ci))
return ""
@ -63,9 +64,7 @@ func (ci CompactIP) String() string {
// MarshalBencode implements the interface bencode.Marshaler.
func (ci CompactIP) MarshalBencode() ([]byte, error) {
log.Println("Marshal Bytes:", ci, len(ci))
if len(ci) == net.IPv4len {
log.Println("Marshal IPv4 Bytes:", ci, len(ci))
ip := []byte(ci)
ic, err := bencode.EncodeBytes(ip[:])
if err != nil {
@ -74,7 +73,6 @@ func (ci CompactIP) MarshalBencode() ([]byte, error) {
return ic, nil
}
if len(ci) == net.IPv6len {
log.Println("Marshal IPv6 Bytes:", ci, len(ci))
ip := []byte(ci)
ic, err := bencode.EncodeBytes(ip[:])
if err != nil {
@ -83,8 +81,10 @@ func (ci CompactIP) MarshalBencode() ([]byte, error) {
return ic, nil
}
if len(ci) == 32 {
log.Println("Marshal I2P Bytes:", ci, len(ci))
i2p := i2pkeys.I2PAddr(ci).DestHash()
i2p, err := i2pkeys.DestHashFromBytes(ci[:])
if err != nil {
return nil, err
}
return bencode.EncodeBytes(i2p[:])
}
return nil, errInvalidIP
@ -92,32 +92,25 @@ func (ci CompactIP) MarshalBencode() ([]byte, error) {
// UnmarshalBencode implements the interface bencode.Unmarshaler.
func (ci *CompactIP) UnmarshalBencode(b []byte) (err error) {
log.Println("Unmarshal Bytes:", b, len(b))
if len(b) >= net.IPv4len && len(b) < net.IPv6len {
log.Println("Unmarshal IPv4 Bytes:", b, len(b))
ip := net.IP(b[len(b)-net.IPv4len:])
if ipv4 := ip.To4(); len(ipv4) != 0 {
ip = ipv4
}
*ci = CompactIP(ip[:])
log.Println("Unmarshal IPv4:", ip, len(ip))
return nil
}
if len(b) >= net.IPv6len && len(b) < 32 {
log.Println("Unmarshal IPv6 Bytes:", b, len(b))
ip := net.IP(b[len(b)-net.IPv6len:])
if ipv6 := ip.To16(); len(ipv6) != 0 {
ip = ipv6
}
*ci = CompactIP(ip[:])
log.Println("Unmarshal IPv6:", ip, len(ip))
return nil
}
if len(b) >= 32 {
log.Println("Unmarshal I2P Bytes:", b, len(b)-32)
i2p := i2pkeys.I2PAddr(b[len(b)-32:]).DestHash()
i2p, _ := i2pkeys.DestHashFromBytes(b[len(b)-32:])
*ci = i2p[:]
log.Println("Unmarshal I2P:", i2p, len(i2p))
return nil
}
return errInvalidIP

11
peerprotocol/extension_test.go
View File

@ -66,20 +66,19 @@ func TestCompactI2P(t *testing.T) {
if err != nil {
t.Fatal(err)
}
dh := i2pkeys.Address.Base32()
ipv4 := CompactIP([]byte(dh[:]))
b, err := ipv4.MarshalBencode()
dh := i2pkeys.Address.DestHash()
i2p := CompactIP(dh[:])
b, err := i2p.MarshalBencode()
if err != nil {
t.Fatal(err)
}
log.Println("I2P Test", ipv4.String(), dh))
log.Println("I2P Test", i2p.String(), len(b))
var ip CompactIP
if err = ip.UnmarshalBencode(b); err != nil {
t.Error(err)
//} else if ip.String() != dh.String() {
} else if len(ip.String()) == 32 {
} else if ip.String() != dh.String() {
t.Error(ip, dh)
}
}