1 files changed, 22 insertions, 34 deletions

diff --git a/src/gnunet/util/address.go b/src/gnunet/util/address.go
index 4cd07da..35e0030 100644
--- a/src/gnunet/util/address.go
+++ b/src/gnunet/util/address.go
@@ -27,10 +27,10 @@ import (
 
 // Address specifies how a peer is reachable on the network.
 type Address struct {
-        Netw    string       ``            // network protocol
-        Options uint32       `order:"big"` // address options
-        Expires AbsoluteTime ``            // expiration date for address
-        Address []byte       `size:"*"`    // address data (protocol-dependent)
+        Netw    string       // network protocol
+        Options uint32       // address options
+        Expires AbsoluteTime // expiration date for address
+        Address []byte       // address data (protocol-dependent)
 }
 
 // NewAddress returns a new Address for the given transport and specs
@@ -43,6 +43,8 @@ func NewAddress(transport string, addr string) *Address {
         }
 }
 
+// NewAddressWrap returns new address from net.Addr with no options
+// or expiry date.
 func NewAddressWrap(addr net.Addr) *Address {
         return &Address{
                 Netw:    addr.Network(),
@@ -53,7 +55,7 @@ func NewAddressWrap(addr net.Addr) *Address {
 }
 
 // ParseAddress translates a GNUnet address string like
-// "r5n+ip+udp://1.2.3.4:6789" or "gnunet+tcp://12.3.4.5/".
+// "ip+udp://1.2.3.4:6789" or "gnunet+tcp://12.3.4.5/".
 // It can also handle standard strings like "udp:127.0.0.1:6735".
 func ParseAddress(s string) (addr *Address, err error) {
         p := strings.SplitN(s, ":", 2)
@@ -72,11 +74,6 @@ func (a *Address) Equals(b *Address) bool {
                 bytes.Equal(a.Address, b.Address)
 }
 
-// StringAll returns a human-readable representation of an address.
-func (a *Address) StringAll() string {
-        return a.Netw + "://" + string(a.Address)
-}
-
 // implement net.Addr interface methods:
 
 // String returns a human-readable representation of an address.
@@ -91,7 +88,7 @@ func (a *Address) Network() string {
 
 //----------------------------------------------------------------------
 
-// URI returns a string representaion of an address.
+// URI returns a string representation of an address.
 func (a *Address) URI() string {
         return URI(a.Netw, a.Address)
 }
@@ -101,24 +98,6 @@ func URI(network string, addr []byte) string {
 
 //----------------------------------------------------------------------
 
-// IPAddress (can be IPv4 or IPv6 or a DNS name)
-type IPAddress struct {
-        Host []byte `size:"*-2"`
-        Port uint16 `order:"big"`
-}
-
-// NewIPAddress creates a new instance for a given host and port.
-func NewIPAddress(host []byte, port uint16) *IPAddress {
-        ip := &IPAddress{
-                Host: make([]byte, len(host)),
-                Port: port,
-        }
-        copy(ip.Host, host)
-        return ip
-}
-
-//----------------------------------------------------------------------
-
 // PeerAddrList is a list of addresses per peer ID.
 type PeerAddrList struct {
         list *Map[string, []*Address]
@@ -133,12 +112,13 @@ func NewPeerAddrList() *PeerAddrList {
 
 // Add address for peer. The returned mode is 0=not added, 1=new peer,
 // 2=new address
-func (a *PeerAddrList) Add(id string, addr *Address) (mode int) {
+func (a *PeerAddrList) Add(peer *PeerID, addr *Address) (mode int) {
         // check for expired address.
         mode = 0
         if !addr.Expires.Expired() {
                 // run add operation
-                a.list.Process(func() error {
+                _ = a.list.Process(func() error {
+                        id := peer.String()
                         list, ok := a.list.Get(id)
                         if !ok {
                                 list = make([]*Address, 0)
@@ -160,7 +140,8 @@ func (a *PeerAddrList) Add(id string, addr *Address) (mode int) {
 }
 
 // Get address for peer
-func (a *PeerAddrList) Get(id string, transport string) (res []*Address) {
+func (a *PeerAddrList) Get(peer *PeerID, transport string) (res []*Address) {
+        id := peer.String()
         list, ok := a.list.Get(id)
         if ok {
                 for _, addr := range list {
@@ -181,6 +162,13 @@ func (a *PeerAddrList) Get(id string, transport string) (res []*Address) {
 }
 
 // Delete a list entry by key.
-func (a *PeerAddrList) Delete(id string) {
-        a.list.Delete(id)
+func (a *PeerAddrList) Delete(peer *PeerID) {
+        a.list.Delete(peer.String())
+}
+
+// Contains checks if a peer is contained in the list. Does not check
+// for expired entries.
+func (a *PeerAddrList) Contains(peer *PeerID) (ok bool) {
+        _, ok = a.list.Get(peer.String())
+        return
 }