Skip to content

GitLab

Commit 21e24cf5 authored by tavit ohanian's avatar tavit ohanian
Browse files
Options

Merge branch 'port-2021-06-28' into 'master' 

Port 2021 06 28

See merge request p2p/go-addr-util!1
parents 1954ce9b cabca72f
Pipeline #741 passed with stages
      in 33 seconds
      Hide whitespace changes
      Inline Side-by-side
      Showing with 822 additions and 2 deletions
      .github/workflows/automerge.yml 0 → 100644
      View file @ 21e24cf5
      # File managed by web3-bot. DO NOT EDIT.
      # See https://github.com/protocol/.github/ for details.
      # Automatically merge pull requests opened by web3-bot, as soon as (and only if) all tests pass.
      # This reduces the friction associated with updating with our workflows.
      on: [ pull_request ]
      name: Automerge
      jobs:
      automerge-check:
      if: github.event.pull_request.user.login == 'web3-bot'
      runs-on: ubuntu-latest
      outputs:
      status: ${{ steps.should-automerge.outputs.status }}
      steps:
      - uses: actions/checkout@v2
      with:
      fetch-depth: 0
      - name: Check if we should automerge
      id: should-automerge
      run: |
      for commit in $(git rev-list --first-parent origin/${{ github.event.pull_request.base.ref }}..${{ github.event.pull_request.head.sha }}); do
      committer=$(git show --format=$'%ce' -s $commit)
      echo "Committer: $committer"
      if [[ "$committer" != "web3-bot@users.noreply.github.com" ]]; then
      echo "Commit $commit wasn't committed by web3-bot, but by $committer."
      echo "::set-output name=status::false"
      exit
      fi
      done
      echo "::set-output name=status::true"
      automerge:
      needs: automerge-check
      runs-on: ubuntu-latest
      if: ${{ needs.automerge-check.outputs.status == 'true' }}
      steps:
      - name: Wait on tests
      uses: lewagon/wait-on-check-action@bafe56a6863672c681c3cf671f5e10b20abf2eaa # v0.2
      with:
      ref: ${{ github.event.pull_request.head.sha }}
      repo-token: ${{ secrets.GITHUB_TOKEN }}
      wait-interval: 10
      running-workflow-name: 'automerge' # the name of this job
      - name: Merge PR
      uses: pascalgn/automerge-action@741c311a47881be9625932b0a0de1b0937aab1ae # v0.13.1
      env:
      GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
      MERGE_LABELS: ""
      MERGE_METHOD: "squash"
      MERGE_DELETE_BRANCH: true
      .github/workflows/go-check.yml 0 → 100644
      View file @ 21e24cf5
      # File managed by web3-bot. DO NOT EDIT.
      # See https://github.com/protocol/.github/ for details.
      on: [push, pull_request]
      name: Go Checks
      jobs:
      unit:
      runs-on: ubuntu-latest
      name: All
      steps:
      - uses: actions/checkout@v2
      with:
      submodules: recursive
      - uses: actions/setup-go@v2
      with:
      go-version: "1.16.x"
      - name: Install staticcheck
      run: go install honnef.co/go/tools/cmd/staticcheck@434f5f3816b358fe468fa83dcba62d794e7fe04b # 2021.1 (v0.2.0)
      - name: Check that go.mod is tidy
      uses: protocol/multiple-go-modules@v1.0
      with:
      run: |
      go mod tidy
      if [[ -n $(git ls-files --other --exclude-standard --directory -- go.sum) ]]; then
      echo "go.sum was added by go mod tidy"
      exit 1
      fi
      git diff --exit-code -- go.sum go.mod
      - name: gofmt
      if: ${{ success() || failure() }} # run this step even if the previous one failed
      run: |
      out=$(gofmt -s -l .)
      if [[ -n "$out" ]]; then
      echo $out | awk '{print "::error file=" $0 ",line=0,col=0::File is not gofmt-ed."}'
      exit 1
      fi
      - name: go vet
      if: ${{ success() || failure() }} # run this step even if the previous one failed
      uses: protocol/multiple-go-modules@v1.0
      with:
      run: go vet ./...
      - name: staticcheck
      if: ${{ success() || failure() }} # run this step even if the previous one failed
      uses: protocol/multiple-go-modules@v1.0
      with:
      run: |
      set -o pipefail
      staticcheck ./... | sed -e 's@\(.*\)\.go@./\1.go@g'
      .github/workflows/go-test.yml 0 → 100644
      View file @ 21e24cf5
      # File managed by web3-bot. DO NOT EDIT.
      # See https://github.com/protocol/.github/ for details.
      on: [push, pull_request]
      name: Go Test
      jobs:
      unit:
      strategy:
      fail-fast: false
      matrix:
      os: [ "ubuntu", "windows", "macos" ]
      go: [ "1.15.x", "1.16.x" ]
      runs-on: ${{ matrix.os }}-latest
      name: ${{ matrix.os}} (go ${{ matrix.go }})
      steps:
      - uses: actions/checkout@v2
      with:
      submodules: recursive
      - uses: actions/setup-go@v2
      with:
      go-version: ${{ matrix.go }}
      - name: Go information
      run: |
      go version
      go env
      - name: Run tests
      uses: protocol/multiple-go-modules@v1.0
      with:
      run: go test -v -coverprofile coverage.txt ./...
      - name: Run tests (32 bit)
      if: ${{ matrix.os != 'macos' }} # can't run 32 bit tests on OSX.
      uses: protocol/multiple-go-modules@v1.0
      env:
      GOARCH: 386
      with:
      run: go test -v ./...
      - name: Run tests with race detector
      if: ${{ matrix.os == 'ubuntu' }} # speed things up. Windows and OSX VMs are slow
      uses: protocol/multiple-go-modules@v1.0
      with:
      run: go test -v -race ./...
      - name: Upload coverage to Codecov
      uses: codecov/codecov-action@a1ed4b322b4b38cb846afb5a0ebfa17086917d27 # v1.5.0
      with:
      file: coverage.txt
      env_vars: OS=${{ matrix.os }}, GO=${{ matrix.go }}
      .gitlab-ci.yml 0 → 100644
      View file @ 21e24cf5
      stages:
      - build
      - test
      variables:
      BUILD_DIR: "/tmp/$CI_CONCURRENT_PROJECT_ID"
      before_script:
      - mkdir -p $BUILD_DIR/src
      - cd $BUILD_DIR/src
      - if [ -d $CI_PROJECT_DIR ]
      - then
      - echo "soft link $CI_PROJECT_DIR exists"
      - else
      - echo "creating soft link $CI_PROJECT_DIR"
      - ln -s $CI_PROJECT_DIR
      - fi
      - cd $CI_PROJECT_DIR
      build:
      stage: build
      tags:
      - testing
      script:
      - echo $CI_JOB_STAGE
      - go build
      test:
      stage: test
      tags:
      - testing
      script:
      - echo $CI_JOB_STAGE
      - go test -cover
      coverage: '/coverage: \d+.\d+% of statements/'
      LICENSE 0 → 100644
      View file @ 21e24cf5
      The MIT License (MIT)
      Copyright (c) 2016 Jeromy Johnson
      Permission is hereby granted, free of charge, to any person obtaining a copy
      of this software and associated documentation files (the "Software"), to deal
      in the Software without restriction, including without limitation the rights
      to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
      copies of the Software, and to permit persons to whom the Software is
      furnished to do so, subject to the following conditions:
      The above copyright notice and this permission notice shall be included in
      all copies or substantial portions of the Software.
      THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
      IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
      FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
      AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
      LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
      OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
      THE SOFTWARE.
      README.md
      View file @ 21e24cf5
      # go-addr-util go-addr-util
      ==================
      dms3 p2p go-addr-util [![](https://img.shields.io/badge/made%20by-Protocol%20Labs-blue.svg?style=flat-square)](http://protocol.ai)
      \ No newline at end of file [![](https://img.shields.io/badge/project-libp2p-yellow.svg?style=flat-square)](http://libp2p.io/)
      [![](https://img.shields.io/badge/freenode-%23libp2p-yellow.svg?style=flat-square)](http://webchat.freenode.net/?channels=%23libp2p)
      [![codecov](https://codecov.io/gh/libp2p/go-addr-util/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/go-addr-util)
      [![Travis CI](https://travis-ci.org/libp2p/go-addr-util.svg?branch=master)](https://travis-ci.org/libp2p/go-addr-util)
      [![Discourse posts](https://img.shields.io/discourse/https/discuss.libp2p.io/posts.svg)](https://discuss.libp2p.io)
      > Address utilities for libp2p swarm.
      ## Table of Contents
      - [Install](#install)
      - [Contribute](#contribute)
      - [License](#license)
      ## Install
      ```sh
      make install
      ```
      ## Contribute
      Feel free to join in. All welcome. Open an [issue](https://github.com/ipfs/go-addr-util/issues)!
      Check out our [contributing document](https://github.com/libp2p/community/blob/master/CONTRIBUTE.md) for more information on how we work, and about contributing in general. Please be aware that all interactions related to libp2p are subject to the IPFS [Code of Conduct](https://github.com/ipfs/community/blob/master/code-of-conduct.md).
      Small note: If editing the Readme, please conform to the [standard-readme](https://github.com/RichardLitt/standard-readme) specification.
      ## License
      [MIT](LICENSE) © Jeromy Johnson
      ---
      The last gx published version of this module was: 2.0.11: QmZomXpA4HrYKRV2ftnE5odWMT2JNnhAXTvEyQrzXrnyEX
      addr.go 0 → 100644
      View file @ 21e24cf5
      package addrutil
      import (
      "fmt"
      ma "github.com/multiformats/go-multiaddr"
      manet "github.com/multiformats/go-multiaddr-net"
      logging "gitlab.dms3.io/dms3/public/go-log"
      )
      var log = logging.Logger("addrutil")
      // FilterAddrs is a filter that removes certain addresses, according to the given filters.
      // If all filters return true, the address is kept.
      func FilterAddrs(a []ma.Multiaddr, filters ...func(ma.Multiaddr) bool) []ma.Multiaddr {
      b := make([]ma.Multiaddr, 0, len(a))
      for _, addr := range a {
      good := true
      for _, filter := range filters {
      good = good && filter(addr)
      }
      if good {
      b = append(b, addr)
      }
      }
      return b
      }
      // AddrOverNonLocalIP returns whether the addr uses a non-local ip link
      func AddrOverNonLocalIP(a ma.Multiaddr) bool {
      split := ma.Split(a)
      if len(split) < 1 {
      return false
      }
      if manet.IsIP6LinkLocal(split[0]) {
      return false
      }
      return true
      }
      // ResolveUnspecifiedAddress expands an unspecified ip addresses (/ip4/0.0.0.0, /ip6/::) to
      // use the known local interfaces. If ifaceAddr is nil, we request interface addresses
      // from the network stack. (this is so you can provide a cached value if resolving many addrs)
      func ResolveUnspecifiedAddress(resolve ma.Multiaddr, ifaceAddrs []ma.Multiaddr) ([]ma.Multiaddr, error) {
      // split address into its components
      split := ma.Split(resolve)
      // if first component (ip) is not unspecified, use it as is.
      if !manet.IsIPUnspecified(split[0]) {
      return []ma.Multiaddr{resolve}, nil
      }
      out := make([]ma.Multiaddr, 0, len(ifaceAddrs))
      for _, ia := range ifaceAddrs {
      // must match the first protocol to be resolve.
      if ia.Protocols()[0].Code != resolve.Protocols()[0].Code {
      continue
      }
      split[0] = ia
      joined := ma.Join(split...)
      out = append(out, joined)
      log.Debug("adding resolved addr:", resolve, joined, out)
      }
      if len(out) < 1 {
      return nil, fmt.Errorf("failed to resolve: %s", resolve)
      }
      return out, nil
      }
      // ResolveUnspecifiedAddresses expands unspecified ip addresses (/ip4/0.0.0.0, /ip6/::) to
      // use the known local interfaces.
      func ResolveUnspecifiedAddresses(unspecAddrs, ifaceAddrs []ma.Multiaddr) ([]ma.Multiaddr, error) {
      // todo optimize: only fetch these if we have a "any" addr.
      if len(ifaceAddrs) < 1 {
      var err error
      ifaceAddrs, err = InterfaceAddresses()
      if err != nil {
      return nil, err
      }
      // log.Debug("InterfaceAddresses:", ifaceAddrs)
      }
      var outputAddrs []ma.Multiaddr
      for _, a := range unspecAddrs {
      // unspecified?
      resolved, err := ResolveUnspecifiedAddress(a, ifaceAddrs)
      if err != nil {
      continue // optimistic. if we cant resolve anything, we'll know at the bottom.
      }
      // log.Debug("resolved:", a, resolved)
      outputAddrs = append(outputAddrs, resolved...)
      }
      if len(outputAddrs) < 1 {
      return nil, fmt.Errorf("failed to specify addrs: %s", unspecAddrs)
      }
      // log.Event is deprecated
      // log.Event(context.TODO(), "interfaceListenAddresses", func() logging.Loggable {
      // var addrs []string
      // for _, addr := range outputAddrs {
      // addrs = append(addrs, addr.String())
      // }
      // return logging.Metadata{"addresses": addrs}
      // }())
      log.Debug("ResolveUnspecifiedAddresses:", unspecAddrs, ifaceAddrs, outputAddrs)
      return outputAddrs, nil
      }
      // InterfaceAddresses returns a list of addresses associated with local machine
      // Note: we do not return link local addresses. IP loopback is ok, because we
      // may be connecting to other nodes in the same machine.
      func InterfaceAddresses() ([]ma.Multiaddr, error) {
      maddrs, err := manet.InterfaceMultiaddrs()
      if err != nil {
      return nil, err
      }
      log.Debug("InterfaceAddresses: from manet:", maddrs)
      var out []ma.Multiaddr
      for _, a := range maddrs {
      if !AddrOverNonLocalIP(a) {
      // log.Debug("InterfaceAddresses: skipping unusable:", a)
      continue
      }
      out = append(out, a)
      }
      log.Debug("InterfaceAddresses: usable:", out)
      return out, nil
      }
      // AddrInList returns whether or not an address is part of a list.
      // this is useful to check if NAT is happening (or other bugs?)
      func AddrInList(addr ma.Multiaddr, list []ma.Multiaddr) bool {
      for _, addr2 := range list {
      if addr.Equal(addr2) {
      return true
      }
      }
      return false
      }
      // AddrIsShareableOnWAN returns whether the given address should be shareable on the
      // wide area network (wide internet).
      func AddrIsShareableOnWAN(addr ma.Multiaddr) bool {
      s := ma.Split(addr)
      if len(s) < 1 {
      return false
      }
      a := s[0]
      if manet.IsIPLoopback(a) || manet.IsIP6LinkLocal(a) || manet.IsIPUnspecified(a) {
      return false
      }
      return manet.IsThinWaist(a)
      }
      // WANShareableAddrs filters addresses based on whether they're shareable on WAN
      func WANShareableAddrs(inp []ma.Multiaddr) []ma.Multiaddr {
      return FilterAddrs(inp, AddrIsShareableOnWAN)
      }
      // Subtract filters out all addrs in b from a
      func Subtract(a, b []ma.Multiaddr) []ma.Multiaddr {
      return FilterAddrs(a, func(m ma.Multiaddr) bool {
      for _, bb := range b {
      if m.Equal(bb) {
      return false
      }
      }
      return true
      })
      }
      // CheckNATWarning checks if our observed addresses differ. if so,
      // informs the user that certain things might not work yet
      func CheckNATWarning(observed, expected ma.Multiaddr, listen []ma.Multiaddr) {
      if observed.Equal(expected) {
      return
      }
      if !AddrInList(observed, listen) { // probably a nat
      log.Warningf(natWarning, observed, listen)
      }
      }
      const natWarning = `Remote peer observed our address to be: %s
      The local addresses are: %s
      Thus, connection is going through NAT, and other connections may fail.
      IPFS NAT traversal is still under development. Please bug us on github or irc to fix this.
      Baby steps: http://jbenet.static.s3.amazonaws.com/271dfcf/baby-steps.gif
      `
      addr_test.go 0 → 100644
      View file @ 21e24cf5
      package addrutil
      import (
      ma "github.com/multiformats/go-multiaddr"
      manet "github.com/multiformats/go-multiaddr-net"
      "testing"
      )
      func newMultiaddr(t *testing.T, s string) ma.Multiaddr {
      t.Helper()
      maddr, err := ma.NewMultiaddr(s)
      if err != nil {
      t.Fatal(err)
      }
      return maddr
      }
      func TestFilterAddrs(t *testing.T) {
      bad := []ma.Multiaddr{
      newMultiaddr(t, "/ip6/fe80::1/tcp/1234"), // link local
      newMultiaddr(t, "/ip6/fe80::100/tcp/1234"), // link local
      }
      good := []ma.Multiaddr{
      newMultiaddr(t, "/ip4/127.0.0.1/tcp/1234"),
      newMultiaddr(t, "/ip6/::1/tcp/1234"),
      newMultiaddr(t, "/ip4/1.2.3.4/udp/1234/utp"),
      }
      goodAndBad := append(good, bad...)
      // test filters
      filter := AddrOverNonLocalIP
      subtestAddrsEqual(t, FilterAddrs(bad, filter), []ma.Multiaddr{})
      subtestAddrsEqual(t, FilterAddrs(good, filter), good)
      subtestAddrsEqual(t, FilterAddrs(goodAndBad, filter), good)
      }
      func subtestAddrsEqual(t *testing.T, a, b []ma.Multiaddr) {
      if len(a) != len(b) {
      t.Error(t)
      }
      in := func(addr ma.Multiaddr, l []ma.Multiaddr) bool {
      for _, addr2 := range l {
      if addr.Equal(addr2) {
      return true
      }
      }
      return false
      }
      for _, aa := range a {
      if !in(aa, b) {
      t.Errorf("%s not in %s", aa, b)
      }
      }
      }
      func TestInterfaceAddrs(t *testing.T) {
      addrs, err := InterfaceAddresses()
      if err != nil {
      t.Fatal(err)
      }
      if len(addrs) < 1 {
      t.Error("no addresses")
      }
      for _, a := range addrs {
      if manet.IsIP6LinkLocal(a) {
      t.Error("should not return ip link local addresses", a)
      }
      }
      if len(addrs) < 1 {
      t.Error("no good interface addrs")
      }
      }
      func TestResolvingAddrs(t *testing.T) {
      unspec := []ma.Multiaddr{
      newMultiaddr(t, "/ip4/0.0.0.0/tcp/1234"),
      newMultiaddr(t, "/ip4/1.2.3.4/tcp/1234"),
      newMultiaddr(t, "/ip6/::/tcp/1234"),
      newMultiaddr(t, "/ip6/::100/tcp/1234"),
      }
      iface := []ma.Multiaddr{
      newMultiaddr(t, "/ip4/127.0.0.1"),
      newMultiaddr(t, "/ip4/10.20.30.40"),
      newMultiaddr(t, "/ip6/::1"),
      newMultiaddr(t, "/ip6/::f"),
      }
      spec := []ma.Multiaddr{
      newMultiaddr(t, "/ip4/127.0.0.1/tcp/1234"),
      newMultiaddr(t, "/ip4/10.20.30.40/tcp/1234"),
      newMultiaddr(t, "/ip4/1.2.3.4/tcp/1234"),
      newMultiaddr(t, "/ip6/::1/tcp/1234"),
      newMultiaddr(t, "/ip6/::f/tcp/1234"),
      newMultiaddr(t, "/ip6/::100/tcp/1234"),
      }
      actual, err := ResolveUnspecifiedAddresses(unspec, iface)
      if err != nil {
      t.Fatal(err)
      }
      for i, a := range actual {
      if !a.Equal(spec[i]) {
      t.Error(a, " != ", spec[i])
      }
      }
      ip4u := []ma.Multiaddr{newMultiaddr(t, "/ip4/0.0.0.0")}
      ip4i := []ma.Multiaddr{newMultiaddr(t, "/ip4/1.2.3.4")}
      ip6u := []ma.Multiaddr{newMultiaddr(t, "/ip6/::")}
      ip6i := []ma.Multiaddr{newMultiaddr(t, "/ip6/::1")}
      if _, err := ResolveUnspecifiedAddress(ip4u[0], ip6i); err == nil {
      t.Fatal("should have failed")
      }
      if _, err := ResolveUnspecifiedAddress(ip6u[0], ip4i); err == nil {
      t.Fatal("should have failed")
      }
      if _, err := ResolveUnspecifiedAddresses(ip6u, ip4i); err == nil {
      t.Fatal("should have failed")
      }
      if _, err := ResolveUnspecifiedAddresses(ip4u, ip6i); err == nil {
      t.Fatal("should have failed")
      }
      }
      func TestWANShareable(t *testing.T) {
      wanok := []ma.Multiaddr{
      newMultiaddr(t, "/ip4/1.2.3.4/tcp/1234"),
      newMultiaddr(t, "/ip6/abcd::1/tcp/1234"),
      }
      wanbad := []ma.Multiaddr{
      newMultiaddr(t, "/ip4/127.0.0.1/tcp/1234"),
      newMultiaddr(t, "/ip4/0.0.0.0/tcp/1234"),
      newMultiaddr(t, "/ip6/::1/tcp/1234"),
      newMultiaddr(t, "/ip6/::/tcp/1234"),
      newMultiaddr(t, "/ip6/fe80::1/tcp/1234"),
      newMultiaddr(t, "/ip6/fe80::/tcp/1234"),
      }
      for _, a := range wanok {
      if !AddrIsShareableOnWAN(a) {
      t.Error("should be true", a)
      }
      }
      for _, a := range wanbad {
      if AddrIsShareableOnWAN(a) {
      t.Error("should be false", a)
      }
      }
      wanok2 := WANShareableAddrs(wanok)
      if len(wanok) != len(wanok2) {
      t.Error("should be the same")
      }
      wanbad2 := WANShareableAddrs(wanbad)
      if len(wanbad2) != 0 {
      t.Error("should be zero")
      }
      }
      func TestSubtract(t *testing.T) {
      a := []ma.Multiaddr{
      newMultiaddr(t, "/ip4/127.0.0.1/tcp/1234"),
      newMultiaddr(t, "/ip4/0.0.0.0/tcp/1234"),
      newMultiaddr(t, "/ip6/::1/tcp/1234"),
      newMultiaddr(t, "/ip6/::/tcp/1234"),
      newMultiaddr(t, "/ip6/fe80::1/tcp/1234"),
      newMultiaddr(t, "/ip6/fe80::/tcp/1234"),
      }
      b := []ma.Multiaddr{
      newMultiaddr(t, "/ip4/127.0.0.1/tcp/1234"),
      newMultiaddr(t, "/ip6/::1/tcp/1234"),
      newMultiaddr(t, "/ip6/fe80::1/tcp/1234"),
      }
      c1 := []ma.Multiaddr{
      newMultiaddr(t, "/ip4/0.0.0.0/tcp/1234"),
      newMultiaddr(t, "/ip6/::/tcp/1234"),
      newMultiaddr(t, "/ip6/fe80::/tcp/1234"),
      }
      c2 := Subtract(a, b)
      if len(c1) != len(c2) {
      t.Error("should be the same")
      }
      for i, ca := range c1 {
      if !c2[i].Equal(ca) {
      t.Error("should be the same", ca, c2[i])
      }
      }
      }
      func TestAddrInList(t *testing.T) {
      addrs := []ma.Multiaddr{
      newMultiaddr(t, "/ip4/0.0.0.0/tcp/1234"),
      newMultiaddr(t, "/ip6/::/tcp/1234"),
      newMultiaddr(t, "/ip6/fe80::/tcp/1234"),
      }
      if in := AddrInList(newMultiaddr(t, "/ip6/fe80::1/tcp/1234"), addrs); in {
      t.Errorf("Expected address %s to not be in list", "/ip6/fe80::1/tcp/1234")
      }
      if in := AddrInList(newMultiaddr(t, "/ip4/0.0.0.0/tcp/1234"), addrs); !in {
      t.Errorf("Expected address %s to be in list", "/ip4/0.0.0.0/tcp/1234")
      }
      }
      func TestCheckNATWarning(t *testing.T) {
      multiAddr := newMultiaddr(t, "/ip4/0.0.0.0/tcp/1234")
      listen := []ma.Multiaddr{
      multiAddr,
      }
      CheckNATWarning(multiAddr, multiAddr, listen)
      CheckNATWarning(newMultiaddr(t, "/ip6/fe80::/tcp/1234"), multiAddr, listen)
      }
      codecov.yml 0 → 100644
      View file @ 21e24cf5
      coverage:
      range: "50...100"
      comment: off
      filter.go 0 → 100644
      View file @ 21e24cf5
      package addrutil
      import (
      ma "github.com/multiformats/go-multiaddr"
      )
      // SubtractFilter returns a filter func that filters all of the given addresses
      func SubtractFilter(addrs ...ma.Multiaddr) func(ma.Multiaddr) bool {
      addrmap := make(map[string]bool, len(addrs))
      for _, a := range addrs {
      addrmap[string(a.Bytes())] = true
      }
      return func(a ma.Multiaddr) bool {
      return !addrmap[string(a.Bytes())]
      }
      }
      // FilterNeg returns a negated version of the passed in filter
      func FilterNeg(f func(ma.Multiaddr) bool) func(ma.Multiaddr) bool {
      return func(a ma.Multiaddr) bool {
      return !f(a)
      }
      }
      filter_test.go 0 → 100644
      View file @ 21e24cf5
      package addrutil
      import (
      "testing"
      ma "github.com/multiformats/go-multiaddr"
      )
      func TestSubtractAndNegFilter(t *testing.T) {
      localhost := newMultiaddr(t, "/ip4/127.0.0.1/tcp/1234")
      private := newMultiaddr(t, "/ip4/192.168.1.1/tcp/1234")
      toRemoveFilter := SubtractFilter(
      localhost,
      newMultiaddr(t, "/ip6/::1/tcp/1234"),
      newMultiaddr(t, "/ip4/1.2.3.4/udp/1234/utp"),
      )
      result := FilterAddrs([]ma.Multiaddr{localhost, private}, toRemoveFilter)
      if len(result) != 1 || !result[0].Equal(private) {
      t.Errorf("Expected only one remaining address: %s", private.String())
      }
      // Negate original filter
      result = FilterAddrs([]ma.Multiaddr{localhost, private}, FilterNeg(toRemoveFilter))
      if len(result) != 1 || !result[0].Equal(localhost) {
      t.Errorf("Expected only one remaining address: %s", localhost.String())
      }
      }
      go.sum 0 → 100644
      View file @ 21e24cf5
      github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
      github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
      github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
      github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
      github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
      github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
      github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
      github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
      github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
      github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
      github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
      github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
      github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
      github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1 h1:lYpkrQH5ajf0OXOcUbGjvZxxijuBwbbmlSxLiuofa+g=
      github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1/go.mod h1:pD8RvIylQ358TN4wwqatJ8rNavkEINozVn9DtGI3dfQ=
      github.com/minio/sha256-simd v0.1.1-0.20190913151208-6de447530771 h1:MHkK1uRtFbVqvAgvWxafZe54+5uBxLluGylDiKgdhwo=
      github.com/minio/sha256-simd v0.1.1-0.20190913151208-6de447530771/go.mod h1:B5e1o+1/KgNmWrSQK08Y6Z1Vb5pwIktudl0J58iy0KM=
      github.com/mr-tron/base58 v1.1.2/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc=
      github.com/mr-tron/base58 v1.1.3 h1:v+sk57XuaCKGXpWtVBX8YJzO7hMGx4Aajh4TQbdEFdc=
      github.com/mr-tron/base58 v1.1.3/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc=
      github.com/multiformats/go-multiaddr v0.2.0/go.mod h1:0nO36NvPpyV4QzvTLi/lafl2y95ncPj0vFwVF6k6wJ4=
      github.com/multiformats/go-multiaddr v0.2.1 h1:SgG/cw5vqyB5QQe5FPe2TqggU9WtrA9X4nZw7LlVqOI=
      github.com/multiformats/go-multiaddr v0.2.1/go.mod h1:s/Apk6IyxfvMjDafnhJgJ3/46z7tZ04iMk5wP4QMGGE=
      github.com/multiformats/go-multiaddr-net v0.1.2 h1:P7zcBH9FRETdPkDrylcXVjQLQ2t1JQtNItZULWNWgeg=
      github.com/multiformats/go-multiaddr-net v0.1.2/go.mod h1:QsWt3XK/3hwvNxZJp92iMQKME1qHfpYmyIjFVsSOY6Y=
      github.com/multiformats/go-multihash v0.0.8/go.mod h1:YSLudS+Pi8NHE7o6tb3D8vrpKa63epEDmG8nTduyAew=
      github.com/multiformats/go-multihash v0.0.13 h1:06x+mk/zj1FoMsgNejLpy6QTvJqlSt/BhLEy87zidlc=
      github.com/multiformats/go-multihash v0.0.13/go.mod h1:VdAWLKTwram9oKAatUcLxBNUjdtcVwxObEQBtRfuyjc=
      github.com/multiformats/go-varint v0.0.1/go.mod h1:3Ls8CIEsrijN6+B7PbrXRPxHRPuXSrVKRY101jdMZYE=
      github.com/multiformats/go-varint v0.0.2/go.mod h1:3Ls8CIEsrijN6+B7PbrXRPxHRPuXSrVKRY101jdMZYE=
      github.com/multiformats/go-varint v0.0.5 h1:XVZwSo04Cs3j/jS0uAEPpT3JY6DzMcVLLoWOSnCxOjg=
      github.com/multiformats/go-varint v0.0.5/go.mod h1:3Ls8CIEsrijN6+B7PbrXRPxHRPuXSrVKRY101jdMZYE=
      github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
      github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
      github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
      github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
      github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
      github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI=
      github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
      github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
      github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
      github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
      github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
      github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
      gitlab.dms3.io/dms3/public/go-log v0.0.1 h1:jqz2g8pVdPW+Sy8CCo4rYfGEjktGhCBfgIb3oeY6yx8=
      gitlab.dms3.io/dms3/public/go-log v0.0.1/go.mod h1:OsyF7lVYe47r03v1ZCbrmz0byeGUWB0Y219jN1DJx3s=
      go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
      go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw=
      go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
      go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU=
      go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4=
      go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
      go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA=
      go.uber.org/zap v1.16.0 h1:uFRZXykJGK9lLY4HtgSw44DnIcAM+kRBP7x5m+NpAOM=
      go.uber.org/zap v1.16.0/go.mod h1:MA8QOfq0BHJwdXa996Y4dYkAqRKB8/1K1QMMZVaNZjQ=
      golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
      golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
      golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8 h1:1wopBVtVdWnn03fZelqdXTqk7U7zPQCb+T4rbU9ZEoU=
      golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
      golang.org/x/lint v0.0.0-20190930215403-16217165b5de h1:5hukYrvBGR8/eNkX5mdUezrA6JiaEZDtJb9Ei+1LlBs=
      golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
      golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
      golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
      golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3 h1:0GoQqolDA55aaLxZyTzK/Y2ePZzZTUrRacwib7cNsYQ=
      golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
      golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
      golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
      golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
      golang.org/x/sys v0.0.0-20190412213103-97732733099d h1:+R4KGOnez64A81RvjARKc4UT5/tI9ujCIVX+P5KiHuI=
      golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
      golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
      golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
      golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
      golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
      golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5 h1:hKsoRgsbwY1NafxrwTs+k64bikrLBkAgPir1TNCj3Zs=
      golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
      golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
      gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
      gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
      gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
      gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
      gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
      gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
      honnef.co/go/tools v0.0.1-2019.2.3 h1:3JgtbtFHMiCmsznwGVTUWbgGov+pVqnlf1dEJTNAXeM=
      honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
      Markdown is supported
      0% or .
      You are about to add 0 people to the discussion. Proceed with caution.
      Finish editing this message first!
      Please register or to comment