Skip to content

Commit 18df30f

Browse files
committed
use @fdurand's go-ipset package
supports newer libipset version
1 parent b355ded commit 18df30f

File tree

4 files changed

+8
-9
lines changed

4 files changed

+8
-9
lines changed

go/caddy/pfipset/handlers.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"net/http"
1010

1111
"github.com/diegoguarnieri/go-conntrack/conntrack"
12-
ipset "github.com/digineo/go-ipset"
12+
ipset "github.com/fdurand/go-ipset"
1313
"github.com/gorilla/mux"
1414
"github.com/inverse-inc/packetfence/go/log"
1515
"github.com/inverse-inc/packetfence/go/sharedutils"

go/caddy/pfipset/pool.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package pfipset
22

33
import (
4-
ipset "github.com/digineo/go-ipset"
4+
ipset "github.com/fdurand/go-ipset"
55
)
66

77
type job struct {

go/caddy/pfipset/utils.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"net/http"
1111
"regexp"
1212

13-
ipset "github.com/digineo/go-ipset"
13+
ipset "github.com/fdurand/go-ipset"
1414
"github.com/inverse-inc/packetfence/go/log"
1515
"github.com/inverse-inc/packetfence/go/pfconfigdriver"
1616
"github.com/inverse-inc/packetfence/go/sharedutils"

go/vendor/vendor.json

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -123,12 +123,6 @@
123123
"revision": "9abb0707ff3199f9ab5a44b5a5ea588c41979476",
124124
"revisionTime": "2016-12-08T18:04:11Z"
125125
},
126-
{
127-
"checksumSHA1": "HHKEZVMANt+QoNbpt+6Om7DCuVY=",
128-
"path": "github.com/digineo/go-ipset",
129-
"revision": "7a05e099ec96caf47dd1c3138bfb6a35c5d1b6a5",
130-
"revisionTime": "2018-02-11T16:25:07Z"
131-
},
132126
{
133127
"checksumSHA1": "NJ+mjEgf5/x6f+x8+IrQQcD7vko=",
134128
"path": "github.com/dnstap/golang-dnstap",
@@ -212,6 +206,11 @@
212206
"path": "github.com/fdurand/go-cache",
213207
"revision": "cf0198ac7d92634998b3f3f2b616553fda07d7b0"
214208
},
209+
{
210+
"checksumSHA1": "RFnAYMiZSJG51dKxpwbneK30Wh0=",
211+
"path": "github.com/fdurand/go-ipset",
212+
"revision": "9a266eccec047c1e13fd3f514a7d8dc859cb51ab"
213+
},
215214
{
216215
"checksumSHA1": "VdXZPcDRHK1T7XjBu2KW8Mb8S6w=",
217216
"path": "github.com/flynn/go-shlex",

0 commit comments

Comments
 (0)