X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=misc.go;h=7d3007ecee74eb92f58eee434dfb9431a86f9098;hb=HEAD;hp=6ff4777562b3518eaa8655aec3395572565385cb;hpb=8f7720edb295d85c7cbbb6295d3638377c1add6a;p=btrtrc.git diff --git a/misc.go b/misc.go index 6ff47775..7d3007ec 100644 --- a/misc.go +++ b/misc.go @@ -4,25 +4,48 @@ import ( "errors" "net" + "github.com/RoaringBitmap/roaring" + "github.com/anacrolix/missinggo/v2" + "golang.org/x/time/rate" + "github.com/anacrolix/torrent/metainfo" pp "github.com/anacrolix/torrent/peer_protocol" + "github.com/anacrolix/torrent/types" + "github.com/anacrolix/torrent/types/infohash" ) -type chunkSpec struct { - Begin, Length pp.Integer -} +type ( + Request = types.Request + ChunkSpec = types.ChunkSpec + piecePriority = types.PiecePriority +) + +const ( + PiecePriorityNormal = types.PiecePriorityNormal + PiecePriorityNone = types.PiecePriorityNone + PiecePriorityNow = types.PiecePriorityNow + PiecePriorityReadahead = types.PiecePriorityReadahead + PiecePriorityNext = types.PiecePriorityNext + PiecePriorityHigh = types.PiecePriorityHigh +) -type request struct { - Index pp.Integer - chunkSpec +func newRequest(index, begin, length pp.Integer) Request { + return Request{index, ChunkSpec{begin, length}} } -func newRequest(index, begin, length pp.Integer) request { - return request{index, chunkSpec{begin, length}} +func newRequestFromMessage(msg *pp.Message) Request { + switch msg.Type { + case pp.Request, pp.Cancel, pp.Reject: + return newRequest(msg.Index, msg.Begin, msg.Length) + case pp.Piece: + return newRequest(msg.Index, msg.Begin, pp.Integer(len(msg.Piece))) + default: + panic(msg.Type) + } } // The size in bytes of a metadata extension piece. -func metadataPieceSize(totalSize int, piece int) int { +func metadataPieceSize(totalSize, piece int) int { ret := totalSize - piece*(1<<14) if ret > 1<<14 { ret = 1 << 14 @@ -31,8 +54,11 @@ func metadataPieceSize(totalSize int, piece int) int { } // Return the request that would include the given offset into the torrent data. -func torrentOffsetRequest(torrentLength, pieceSize, chunkSize, offset int64) ( - r request, ok bool) { +func torrentOffsetRequest( + torrentLength, pieceSize, chunkSize, offset int64, +) ( + r Request, ok bool, +) { if offset < 0 || offset >= torrentLength { return } @@ -51,10 +77,10 @@ func torrentOffsetRequest(torrentLength, pieceSize, chunkSize, offset int64) ( return } -func torrentRequestOffset(torrentLength, pieceSize int64, r request) (off int64) { +func torrentRequestOffset(torrentLength, pieceSize int64, r Request) (off int64) { off = int64(r.Index)*pieceSize + int64(r.Begin) if off < 0 || off >= torrentLength { - panic("invalid request") + panic("invalid Request") } return } @@ -75,31 +101,94 @@ func validateInfo(info *metainfo.Info) error { return nil } -func chunkIndexSpec(index int, pieceLength, chunkSize pp.Integer) chunkSpec { - ret := chunkSpec{pp.Integer(index) * chunkSize, chunkSize} +func chunkIndexSpec(index, pieceLength, chunkSize pp.Integer) ChunkSpec { + ret := ChunkSpec{pp.Integer(index) * chunkSize, chunkSize} if ret.Begin+ret.Length > pieceLength { ret.Length = pieceLength - ret.Begin } return ret } -func connLessTrusted(l, r *connection) bool { - return l.netGoodPiecesDirtied() < r.netGoodPiecesDirtied() +func connLessTrusted(l, r *Peer) bool { + return l.trust().Less(r.trust()) +} + +func connIsIpv6(nc interface { + LocalAddr() net.Addr +}, +) bool { + ra := nc.LocalAddr() + rip := addrIpOrNil(ra) + return rip.To4() == nil && rip.To16() != nil } -// Convert a net.Addr to its compact IP representation. Either 4 or 16 bytes -// per "yourip" field of http://www.bittorrent.org/beps/bep_0010.html. -func addrCompactIP(addr net.Addr) (string, error) { - host, _, err := net.SplitHostPort(addr.String()) - if err != nil { - return "", err - } - ip := net.ParseIP(host) - if v4 := ip.To4(); v4 != nil { - if len(v4) != 4 { - panic(v4) +func clamp(min, value, max int64) int64 { + if min > max { + panic("harumph") + } + if value < min { + value = min + } + if value > max { + value = max + } + return value +} + +func max(as ...int64) int64 { + ret := as[0] + for _, a := range as[1:] { + if a > ret { + ret = a } - return string(v4), nil } - return string(ip.To16()), nil + return ret +} + +func maxInt(as ...int) int { + ret := as[0] + for _, a := range as[1:] { + if a > ret { + ret = a + } + } + return ret +} + +func min(as ...int64) int64 { + ret := as[0] + for _, a := range as[1:] { + if a < ret { + ret = a + } + } + return ret +} + +func minInt(as ...int) int { + ret := as[0] + for _, a := range as[1:] { + if a < ret { + ret = a + } + } + return ret +} + +var unlimited = rate.NewLimiter(rate.Inf, 0) + +type ( + pieceIndex = int + // Deprecated: Use infohash.T directly to avoid unnecessary imports. + InfoHash = infohash.T + IpPort = missinggo.IpPort +) + +func boolSliceToBitmap(slice []bool) (rb roaring.Bitmap) { + for i, b := range slice { + if b { + rb.AddInt(i) + } + } + return }