diff --git a/alignedbuff/alignedbuff.go b/alignedbuff/alignedbuff.go index b9da384..6b85433 100644 --- a/alignedbuff/alignedbuff.go +++ b/alignedbuff/alignedbuff.go @@ -19,7 +19,7 @@ import ( "fmt" "unsafe" - "github.com/google/nftables/binaryutil" + "github.com/sagernet/nftables/binaryutil" ) // ErrEOF signals trying to read beyond the available payload information. diff --git a/chain.go b/chain.go index 4f4c0a5..def92b9 100644 --- a/chain.go +++ b/chain.go @@ -19,7 +19,7 @@ import ( "fmt" "math" - "github.com/google/nftables/binaryutil" + "github.com/sagernet/nftables/binaryutil" "github.com/mdlayher/netlink" "golang.org/x/sys/unix" ) diff --git a/compat_policy.go b/compat_policy.go index 7c1d3ac..3587f05 100644 --- a/compat_policy.go +++ b/compat_policy.go @@ -3,7 +3,7 @@ package nftables import ( "fmt" - "github.com/google/nftables/expr" + "github.com/sagernet/nftables/expr" "golang.org/x/sys/unix" ) diff --git a/compat_policy_test.go b/compat_policy_test.go index 7565de0..de41928 100644 --- a/compat_policy_test.go +++ b/compat_policy_test.go @@ -3,8 +3,8 @@ package nftables import ( "testing" - "github.com/google/nftables/expr" - "github.com/google/nftables/xt" + "github.com/sagernet/nftables/expr" + "github.com/sagernet/nftables/xt" "golang.org/x/sys/unix" ) diff --git a/conn.go b/conn.go index 3d948cf..4aaf7e1 100644 --- a/conn.go +++ b/conn.go @@ -20,8 +20,8 @@ import ( "os" "sync" - "github.com/google/nftables/binaryutil" - "github.com/google/nftables/expr" + "github.com/sagernet/nftables/binaryutil" + "github.com/sagernet/nftables/expr" "github.com/mdlayher/netlink" "github.com/mdlayher/netlink/nltest" E "github.com/sagernet/sing/common/exceptions" diff --git a/counter.go b/counter.go index 25d37d8..c02231a 100644 --- a/counter.go +++ b/counter.go @@ -15,7 +15,7 @@ package nftables import ( - "github.com/google/nftables/binaryutil" + "github.com/sagernet/nftables/binaryutil" "github.com/mdlayher/netlink" "golang.org/x/sys/unix" ) diff --git a/expr/bitwise.go b/expr/bitwise.go index 62f7f9b..084263c 100644 --- a/expr/bitwise.go +++ b/expr/bitwise.go @@ -17,7 +17,7 @@ package expr import ( "encoding/binary" - "github.com/google/nftables/binaryutil" + "github.com/sagernet/nftables/binaryutil" "github.com/mdlayher/netlink" "golang.org/x/sys/unix" ) diff --git a/expr/byteorder.go b/expr/byteorder.go index 2450e8f..8451b38 100644 --- a/expr/byteorder.go +++ b/expr/byteorder.go @@ -17,7 +17,7 @@ package expr import ( "fmt" - "github.com/google/nftables/binaryutil" + "github.com/sagernet/nftables/binaryutil" "github.com/mdlayher/netlink" "golang.org/x/sys/unix" ) diff --git a/expr/connlimit.go b/expr/connlimit.go index b712967..d8fd5d7 100644 --- a/expr/connlimit.go +++ b/expr/connlimit.go @@ -17,7 +17,7 @@ package expr import ( "encoding/binary" - "github.com/google/nftables/binaryutil" + "github.com/sagernet/nftables/binaryutil" "github.com/mdlayher/netlink" "golang.org/x/sys/unix" ) diff --git a/expr/counter.go b/expr/counter.go index dd6eab3..e5d9e4f 100644 --- a/expr/counter.go +++ b/expr/counter.go @@ -17,7 +17,7 @@ package expr import ( "encoding/binary" - "github.com/google/nftables/binaryutil" + "github.com/sagernet/nftables/binaryutil" "github.com/mdlayher/netlink" "golang.org/x/sys/unix" ) diff --git a/expr/ct.go b/expr/ct.go index 1a0ee68..4d6aec6 100644 --- a/expr/ct.go +++ b/expr/ct.go @@ -17,7 +17,7 @@ package expr import ( "encoding/binary" - "github.com/google/nftables/binaryutil" + "github.com/sagernet/nftables/binaryutil" "github.com/mdlayher/netlink" "golang.org/x/sys/unix" ) diff --git a/expr/dup.go b/expr/dup.go index a148703..7bf130d 100644 --- a/expr/dup.go +++ b/expr/dup.go @@ -17,7 +17,7 @@ package expr import ( "encoding/binary" - "github.com/google/nftables/binaryutil" + "github.com/sagernet/nftables/binaryutil" "github.com/mdlayher/netlink" "golang.org/x/sys/unix" ) diff --git a/expr/dynset.go b/expr/dynset.go index e44f772..8f2aae2 100644 --- a/expr/dynset.go +++ b/expr/dynset.go @@ -18,8 +18,8 @@ import ( "encoding/binary" "time" - "github.com/google/nftables/binaryutil" - "github.com/google/nftables/internal/parseexprfunc" + "github.com/sagernet/nftables/binaryutil" + "github.com/sagernet/nftables/internal/parseexprfunc" "github.com/mdlayher/netlink" "golang.org/x/sys/unix" ) diff --git a/expr/expr.go b/expr/expr.go index 5c01b7e..49ce1a8 100644 --- a/expr/expr.go +++ b/expr/expr.go @@ -18,8 +18,8 @@ package expr import ( "encoding/binary" - "github.com/google/nftables/binaryutil" - "github.com/google/nftables/internal/parseexprfunc" + "github.com/sagernet/nftables/binaryutil" + "github.com/sagernet/nftables/internal/parseexprfunc" "github.com/mdlayher/netlink" "golang.org/x/sys/unix" ) diff --git a/expr/exthdr.go b/expr/exthdr.go index 33bda3b..a56ee14 100644 --- a/expr/exthdr.go +++ b/expr/exthdr.go @@ -17,7 +17,7 @@ package expr import ( "encoding/binary" - "github.com/google/nftables/binaryutil" + "github.com/sagernet/nftables/binaryutil" "github.com/mdlayher/netlink" "golang.org/x/sys/unix" ) diff --git a/expr/fib.go b/expr/fib.go index f7ee704..5716257 100644 --- a/expr/fib.go +++ b/expr/fib.go @@ -17,7 +17,7 @@ package expr import ( "encoding/binary" - "github.com/google/nftables/binaryutil" + "github.com/sagernet/nftables/binaryutil" "github.com/mdlayher/netlink" "golang.org/x/sys/unix" ) diff --git a/expr/hash.go b/expr/hash.go index e8506b9..12ed370 100644 --- a/expr/hash.go +++ b/expr/hash.go @@ -17,7 +17,7 @@ package expr import ( "encoding/binary" - "github.com/google/nftables/binaryutil" + "github.com/sagernet/nftables/binaryutil" "github.com/mdlayher/netlink" "golang.org/x/sys/unix" ) diff --git a/expr/immediate.go b/expr/immediate.go index 99531f8..491bfa2 100644 --- a/expr/immediate.go +++ b/expr/immediate.go @@ -18,7 +18,7 @@ import ( "encoding/binary" "fmt" - "github.com/google/nftables/binaryutil" + "github.com/sagernet/nftables/binaryutil" "github.com/mdlayher/netlink" "golang.org/x/sys/unix" ) diff --git a/expr/limit.go b/expr/limit.go index 9ecb41f..6def56f 100644 --- a/expr/limit.go +++ b/expr/limit.go @@ -19,7 +19,7 @@ import ( "errors" "fmt" - "github.com/google/nftables/binaryutil" + "github.com/sagernet/nftables/binaryutil" "github.com/mdlayher/netlink" "golang.org/x/sys/unix" ) diff --git a/expr/log.go b/expr/log.go index a712b99..31aa582 100644 --- a/expr/log.go +++ b/expr/log.go @@ -17,7 +17,7 @@ package expr import ( "encoding/binary" - "github.com/google/nftables/binaryutil" + "github.com/sagernet/nftables/binaryutil" "github.com/mdlayher/netlink" "golang.org/x/sys/unix" ) diff --git a/expr/lookup.go b/expr/lookup.go index e6593ac..d20fd67 100644 --- a/expr/lookup.go +++ b/expr/lookup.go @@ -17,7 +17,7 @@ package expr import ( "encoding/binary" - "github.com/google/nftables/binaryutil" + "github.com/sagernet/nftables/binaryutil" "github.com/mdlayher/netlink" "golang.org/x/sys/unix" ) diff --git a/expr/match.go b/expr/match.go index 123c6f9..2ced546 100644 --- a/expr/match.go +++ b/expr/match.go @@ -4,8 +4,8 @@ import ( "bytes" "encoding/binary" - "github.com/google/nftables/binaryutil" - "github.com/google/nftables/xt" + "github.com/sagernet/nftables/binaryutil" + "github.com/sagernet/nftables/xt" "github.com/mdlayher/netlink" "golang.org/x/sys/unix" ) diff --git a/expr/match_test.go b/expr/match_test.go index d776ad7..df3b556 100644 --- a/expr/match_test.go +++ b/expr/match_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "github.com/google/nftables/xt" + "github.com/sagernet/nftables/xt" "github.com/mdlayher/netlink" "golang.org/x/sys/unix" ) diff --git a/expr/nat.go b/expr/nat.go index 4e7df47..300ed9e 100644 --- a/expr/nat.go +++ b/expr/nat.go @@ -17,7 +17,7 @@ package expr import ( "encoding/binary" - "github.com/google/nftables/binaryutil" + "github.com/sagernet/nftables/binaryutil" "github.com/mdlayher/netlink" "golang.org/x/sys/unix" ) diff --git a/expr/numgen.go b/expr/numgen.go index bcbb1bb..5e3b58d 100644 --- a/expr/numgen.go +++ b/expr/numgen.go @@ -18,7 +18,7 @@ import ( "encoding/binary" "fmt" - "github.com/google/nftables/binaryutil" + "github.com/sagernet/nftables/binaryutil" "github.com/mdlayher/netlink" "golang.org/x/sys/unix" ) diff --git a/expr/objref.go b/expr/objref.go index ae9521b..331c2f0 100644 --- a/expr/objref.go +++ b/expr/objref.go @@ -17,7 +17,7 @@ package expr import ( "encoding/binary" - "github.com/google/nftables/binaryutil" + "github.com/sagernet/nftables/binaryutil" "github.com/mdlayher/netlink" "golang.org/x/sys/unix" ) diff --git a/expr/payload.go b/expr/payload.go index 966f652..abad449 100644 --- a/expr/payload.go +++ b/expr/payload.go @@ -17,7 +17,7 @@ package expr import ( "encoding/binary" - "github.com/google/nftables/binaryutil" + "github.com/sagernet/nftables/binaryutil" "github.com/mdlayher/netlink" "golang.org/x/sys/unix" ) diff --git a/expr/queue.go b/expr/queue.go index 9abb6bf..37f0d80 100644 --- a/expr/queue.go +++ b/expr/queue.go @@ -17,7 +17,7 @@ package expr import ( "encoding/binary" - "github.com/google/nftables/binaryutil" + "github.com/sagernet/nftables/binaryutil" "github.com/mdlayher/netlink" "golang.org/x/sys/unix" ) diff --git a/expr/quota.go b/expr/quota.go index f8bc0f3..0e5911e 100644 --- a/expr/quota.go +++ b/expr/quota.go @@ -17,7 +17,7 @@ package expr import ( "encoding/binary" - "github.com/google/nftables/binaryutil" + "github.com/sagernet/nftables/binaryutil" "github.com/mdlayher/netlink" "golang.org/x/sys/unix" ) diff --git a/expr/range.go b/expr/range.go index 8a1f6ea..e437044 100644 --- a/expr/range.go +++ b/expr/range.go @@ -17,7 +17,7 @@ package expr import ( "encoding/binary" - "github.com/google/nftables/binaryutil" + "github.com/sagernet/nftables/binaryutil" "github.com/mdlayher/netlink" "golang.org/x/sys/unix" ) diff --git a/expr/redirect.go b/expr/redirect.go index 1c6f622..8c6664d 100644 --- a/expr/redirect.go +++ b/expr/redirect.go @@ -17,7 +17,7 @@ package expr import ( "encoding/binary" - "github.com/google/nftables/binaryutil" + "github.com/sagernet/nftables/binaryutil" "github.com/mdlayher/netlink" "golang.org/x/sys/unix" ) diff --git a/expr/reject.go b/expr/reject.go index a742626..a1c9e21 100644 --- a/expr/reject.go +++ b/expr/reject.go @@ -17,7 +17,7 @@ package expr import ( "encoding/binary" - "github.com/google/nftables/binaryutil" + "github.com/sagernet/nftables/binaryutil" "github.com/mdlayher/netlink" "golang.org/x/sys/unix" ) diff --git a/expr/rt.go b/expr/rt.go index c3be7ff..fea2ef2 100644 --- a/expr/rt.go +++ b/expr/rt.go @@ -17,7 +17,7 @@ package expr import ( "fmt" - "github.com/google/nftables/binaryutil" + "github.com/sagernet/nftables/binaryutil" "github.com/mdlayher/netlink" "golang.org/x/sys/unix" ) diff --git a/expr/socket.go b/expr/socket.go index 015fc08..62a3891 100644 --- a/expr/socket.go +++ b/expr/socket.go @@ -17,7 +17,7 @@ package expr import ( "encoding/binary" - "github.com/google/nftables/binaryutil" + "github.com/sagernet/nftables/binaryutil" "github.com/mdlayher/netlink" "golang.org/x/sys/unix" ) diff --git a/expr/target.go b/expr/target.go index e531a9f..7777dc0 100644 --- a/expr/target.go +++ b/expr/target.go @@ -4,8 +4,8 @@ import ( "bytes" "encoding/binary" - "github.com/google/nftables/binaryutil" - "github.com/google/nftables/xt" + "github.com/sagernet/nftables/binaryutil" + "github.com/sagernet/nftables/xt" "github.com/mdlayher/netlink" "golang.org/x/sys/unix" ) diff --git a/expr/target_test.go b/expr/target_test.go index 6e1c6d7..5939f7a 100644 --- a/expr/target_test.go +++ b/expr/target_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "github.com/google/nftables/xt" + "github.com/sagernet/nftables/xt" "github.com/mdlayher/netlink" "golang.org/x/sys/unix" ) diff --git a/expr/tproxy.go b/expr/tproxy.go index 2846aab..c60ffa9 100644 --- a/expr/tproxy.go +++ b/expr/tproxy.go @@ -17,7 +17,7 @@ package expr import ( "encoding/binary" - "github.com/google/nftables/binaryutil" + "github.com/sagernet/nftables/binaryutil" "github.com/mdlayher/netlink" "golang.org/x/sys/unix" ) diff --git a/expr/verdict.go b/expr/verdict.go index 421fa06..1b7abbe 100644 --- a/expr/verdict.go +++ b/expr/verdict.go @@ -19,7 +19,7 @@ import ( "encoding/binary" "fmt" - "github.com/google/nftables/binaryutil" + "github.com/sagernet/nftables/binaryutil" "github.com/mdlayher/netlink" "golang.org/x/sys/unix" ) diff --git a/flowtable.go b/flowtable.go index 28e79e7..add6d13 100644 --- a/flowtable.go +++ b/flowtable.go @@ -18,7 +18,7 @@ import ( "encoding/binary" "fmt" - "github.com/google/nftables/binaryutil" + "github.com/sagernet/nftables/binaryutil" "github.com/mdlayher/netlink" "golang.org/x/sys/unix" ) diff --git a/go.mod b/go.mod index bd18ff8..e99645d 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/google/nftables +module github.com/sagernet/nftables go 1.18 diff --git a/internal/nftest/nftest.go b/internal/nftest/nftest.go index 2709fa7..8da4330 100644 --- a/internal/nftest/nftest.go +++ b/internal/nftest/nftest.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/google/nftables" + "github.com/sagernet/nftables" "github.com/mdlayher/netlink" ) diff --git a/internal/nftest/system_conn.go b/internal/nftest/system_conn.go index 55e85fe..7358bc9 100644 --- a/internal/nftest/system_conn.go +++ b/internal/nftest/system_conn.go @@ -4,7 +4,7 @@ import ( "runtime" "testing" - "github.com/google/nftables" + "github.com/sagernet/nftables" "github.com/vishvananda/netns" ) diff --git a/monitor_test.go b/monitor_test.go index b0f2667..fef1930 100644 --- a/monitor_test.go +++ b/monitor_test.go @@ -8,9 +8,9 @@ import ( "sync/atomic" "testing" - "github.com/google/nftables" - "github.com/google/nftables/expr" - "github.com/google/nftables/internal/nftest" + "github.com/sagernet/nftables" + "github.com/sagernet/nftables/expr" + "github.com/sagernet/nftables/internal/nftest" ) func ExampleNewMonitor() { diff --git a/nftables_test.go b/nftables_test.go index be8b83b..c5ded5a 100644 --- a/nftables_test.go +++ b/nftables_test.go @@ -26,11 +26,11 @@ import ( "testing" "time" - "github.com/google/nftables" - "github.com/google/nftables/binaryutil" - "github.com/google/nftables/expr" - "github.com/google/nftables/internal/nftest" - "github.com/google/nftables/xt" + "github.com/sagernet/nftables" + "github.com/sagernet/nftables/binaryutil" + "github.com/sagernet/nftables/expr" + "github.com/sagernet/nftables/internal/nftest" + "github.com/sagernet/nftables/xt" "github.com/mdlayher/netlink" "golang.org/x/sys/unix" ) @@ -2249,13 +2249,11 @@ func TestObjAPI(t *testing.T) { } _, err = c.ResetObject(counter1) - if err != nil { t.Errorf("c.ResetObjects(table) failed: %v failed", err) } obj1, err = c.GetObject(counter1) - if err != nil { t.Errorf("c.GetObject(counter1) failed: %v failed", err) } @@ -2265,7 +2263,6 @@ func TestObjAPI(t *testing.T) { } obj2, err = c.GetObject(counter2) - if err != nil { t.Errorf("c.GetObject(counter2) failed: %v failed", err) } diff --git a/quota.go b/quota.go index 71cb9bb..35333d7 100644 --- a/quota.go +++ b/quota.go @@ -15,7 +15,7 @@ package nftables import ( - "github.com/google/nftables/binaryutil" + "github.com/sagernet/nftables/binaryutil" "github.com/mdlayher/netlink" "golang.org/x/sys/unix" ) diff --git a/rule.go b/rule.go index 8bcfda1..69ca10b 100644 --- a/rule.go +++ b/rule.go @@ -18,9 +18,9 @@ import ( "encoding/binary" "fmt" - "github.com/google/nftables/binaryutil" - "github.com/google/nftables/expr" - "github.com/google/nftables/internal/parseexprfunc" + "github.com/sagernet/nftables/binaryutil" + "github.com/sagernet/nftables/expr" + "github.com/sagernet/nftables/internal/parseexprfunc" "github.com/mdlayher/netlink" "golang.org/x/sys/unix" ) diff --git a/set.go b/set.go index 3c687f8..b689bff 100644 --- a/set.go +++ b/set.go @@ -21,9 +21,9 @@ import ( "strings" "time" - "github.com/google/nftables/binaryutil" - "github.com/google/nftables/expr" - "github.com/google/nftables/internal/parseexprfunc" + "github.com/sagernet/nftables/binaryutil" + "github.com/sagernet/nftables/expr" + "github.com/sagernet/nftables/internal/parseexprfunc" "github.com/mdlayher/netlink" "golang.org/x/sys/unix" ) diff --git a/userdata/userdata_cli_interop_test.go b/userdata/userdata_cli_interop_test.go index 10bcc20..b4ea1cc 100644 --- a/userdata/userdata_cli_interop_test.go +++ b/userdata/userdata_cli_interop_test.go @@ -21,9 +21,9 @@ import ( "os/exec" "testing" - "github.com/google/nftables" - "github.com/google/nftables/internal/nftest" - "github.com/google/nftables/userdata" + "github.com/sagernet/nftables" + "github.com/sagernet/nftables/internal/nftest" + "github.com/sagernet/nftables/userdata" ) var enableSysTests = flag.Bool("run_system_tests", false, "Run tests that operate against the live kernel") diff --git a/userdata/userdata_test.go b/userdata/userdata_test.go index a2ea94a..30b91c7 100644 --- a/userdata/userdata_test.go +++ b/userdata/userdata_test.go @@ -19,8 +19,8 @@ import ( "encoding/hex" "testing" - "github.com/google/nftables" - "github.com/google/nftables/userdata" + "github.com/sagernet/nftables" + "github.com/sagernet/nftables/userdata" ) func TestUserDataComment(t *testing.T) { diff --git a/util.go b/util.go index 4f03dc0..b5c9134 100644 --- a/util.go +++ b/util.go @@ -18,7 +18,7 @@ import ( "encoding/binary" "net" - "github.com/google/nftables/binaryutil" + "github.com/sagernet/nftables/binaryutil" "golang.org/x/sys/unix" ) diff --git a/xt/match_addrtype.go b/xt/match_addrtype.go index 3e21057..0a63273 100644 --- a/xt/match_addrtype.go +++ b/xt/match_addrtype.go @@ -1,7 +1,7 @@ package xt import ( - "github.com/google/nftables/alignedbuff" + "github.com/sagernet/nftables/alignedbuff" ) // Rev. 0, see https://elixir.bootlin.com/linux/v5.17.7/source/include/uapi/linux/netfilter/xt_addrtype.h#L38 diff --git a/xt/match_conntrack.go b/xt/match_conntrack.go index 69c51bd..815f6f1 100644 --- a/xt/match_conntrack.go +++ b/xt/match_conntrack.go @@ -3,7 +3,7 @@ package xt import ( "net" - "github.com/google/nftables/alignedbuff" + "github.com/sagernet/nftables/alignedbuff" ) type ConntrackFlags uint16 diff --git a/xt/match_tcp.go b/xt/match_tcp.go index d991f12..2af62a7 100644 --- a/xt/match_tcp.go +++ b/xt/match_tcp.go @@ -1,7 +1,7 @@ package xt import ( - "github.com/google/nftables/alignedbuff" + "github.com/sagernet/nftables/alignedbuff" ) // Tcp is the Match.Info payload for the tcp xtables extension diff --git a/xt/match_udp.go b/xt/match_udp.go index 68ce12a..944639c 100644 --- a/xt/match_udp.go +++ b/xt/match_udp.go @@ -1,7 +1,7 @@ package xt import ( - "github.com/google/nftables/alignedbuff" + "github.com/sagernet/nftables/alignedbuff" ) // Tcp is the Match.Info payload for the tcp xtables extension diff --git a/xt/target_dnat.go b/xt/target_dnat.go index b54e8fb..b927be0 100644 --- a/xt/target_dnat.go +++ b/xt/target_dnat.go @@ -3,7 +3,7 @@ package xt import ( "net" - "github.com/google/nftables/alignedbuff" + "github.com/sagernet/nftables/alignedbuff" ) type NatRangeFlags uint diff --git a/xt/target_masquerade_ip.go b/xt/target_masquerade_ip.go index 411d3be..56ba02a 100644 --- a/xt/target_masquerade_ip.go +++ b/xt/target_masquerade_ip.go @@ -4,7 +4,7 @@ import ( "errors" "net" - "github.com/google/nftables/alignedbuff" + "github.com/sagernet/nftables/alignedbuff" ) // See https://elixir.bootlin.com/linux/v5.17.7/source/include/uapi/linux/netfilter/nf_nat.h#L25 diff --git a/xt/util.go b/xt/util.go index 673ac54..1000063 100644 --- a/xt/util.go +++ b/xt/util.go @@ -4,7 +4,7 @@ import ( "fmt" "net" - "github.com/google/nftables/alignedbuff" + "github.com/sagernet/nftables/alignedbuff" "golang.org/x/sys/unix" )