Fix Less method

net/prefix.go

@@ -6,7 +6,6 @@ import (
 	gonet "net"
 	"strconv"
 	"strings"
-	"unsafe"
 
 	"github.com/bio-routing/bio-rd/net/api"
 	"github.com/google/btree"
@@ -24,18 +23,20 @@ func (p *Prefix) Dedup() *Prefix {
 	return pfxc.get(p)
 }
 
-<<<<<<< HEAD
-=======
 // Less compares prefixes for use in btree.Btree
 func (p *Prefix) Less(other btree.Item) bool {
-	if uintptr(unsafe.Pointer(p.addr)) < uintptr(unsafe.Pointer(other.(*Prefix).addr)) {
+	switch p.addr.Compare(other.(*Prefix).addr) {
+	case 0:
+		return p.pfxlen < other.(*Prefix).pfxlen
+	case -1:
 		return true
+	case 1:
+		return false
 	}
 
-	return p.pfxlen < other.(*Prefix).pfxlen
+	return false
 }
 
->>>>>>> 9a2f84b22a4aac17b61e2cdddefd23f228234246
 // DedupWithIP gets a copy of Prefix from the cache and dedups the IP part
 func (p *Prefix) DedupWithIP() *Prefix {
 	p.addr = p.addr.Dedup()