Skip to content

Commit

Permalink
change package name
Browse files Browse the repository at this point in the history
  • Loading branch information
omid-official committed Sep 5, 2024
1 parent b339586 commit 10740ee
Show file tree
Hide file tree
Showing 546 changed files with 2,504 additions and 2,504 deletions.
10 changes: 5 additions & 5 deletions app/commander/commander.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ import (
"net"
"sync"

"github.com/xtls/xray-core/common"
"github.com/xtls/xray-core/common/errors"
"github.com/xtls/xray-core/common/signal/done"
core "github.com/xtls/xray-core/core"
"github.com/xtls/xray-core/features/outbound"
"github.com/xvguardian/xray-core-modified/common"
"github.com/xvguardian/xray-core-modified/common/errors"
"github.com/xvguardian/xray-core-modified/common/signal/done"
core "github.com/xvguardian/xray-core-modified/core"
"github.com/xvguardian/xray-core-modified/features/outbound"
"google.golang.org/grpc"
)

Expand Down
2 changes: 1 addition & 1 deletion app/commander/config.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions app/commander/outbound.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ import (
"context"
"sync"

"github.com/xtls/xray-core/common"
"github.com/xtls/xray-core/common/errors"
"github.com/xtls/xray-core/common/net"
"github.com/xtls/xray-core/common/net/cnc"
"github.com/xtls/xray-core/common/signal/done"
"github.com/xtls/xray-core/transport"
"github.com/xvguardian/xray-core-modified/common"
"github.com/xvguardian/xray-core-modified/common/errors"
"github.com/xvguardian/xray-core-modified/common/net"
"github.com/xvguardian/xray-core-modified/common/net/cnc"
"github.com/xvguardian/xray-core-modified/common/signal/done"
"github.com/xvguardian/xray-core-modified/transport"
)

// OutboundListener is a net.Listener for listening gRPC connections.
Expand Down
2 changes: 1 addition & 1 deletion app/commander/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package commander
import (
"context"

"github.com/xtls/xray-core/common"
"github.com/xvguardian/xray-core-modified/common"
"google.golang.org/grpc"
"google.golang.org/grpc/reflection"
)
Expand Down
32 changes: 16 additions & 16 deletions app/dispatcher/default.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,22 @@ import (
"sync"
"time"

"github.com/xtls/xray-core/common"
"github.com/xtls/xray-core/common/errors"
"github.com/xtls/xray-core/common/buf"
"github.com/xtls/xray-core/common/log"
"github.com/xtls/xray-core/common/net"
"github.com/xtls/xray-core/common/protocol"
"github.com/xtls/xray-core/common/session"
"github.com/xtls/xray-core/core"
"github.com/xtls/xray-core/features/dns"
"github.com/xtls/xray-core/features/outbound"
"github.com/xtls/xray-core/features/policy"
"github.com/xtls/xray-core/features/routing"
routing_session "github.com/xtls/xray-core/features/routing/session"
"github.com/xtls/xray-core/features/stats"
"github.com/xtls/xray-core/transport"
"github.com/xtls/xray-core/transport/pipe"
"github.com/xvguardian/xray-core-modified/common"
"github.com/xvguardian/xray-core-modified/common/errors"
"github.com/xvguardian/xray-core-modified/common/buf"
"github.com/xvguardian/xray-core-modified/common/log"
"github.com/xvguardian/xray-core-modified/common/net"
"github.com/xvguardian/xray-core-modified/common/protocol"
"github.com/xvguardian/xray-core-modified/common/session"
"github.com/xvguardian/xray-core-modified/core"
"github.com/xvguardian/xray-core-modified/features/dns"
"github.com/xvguardian/xray-core-modified/features/outbound"
"github.com/xvguardian/xray-core-modified/features/policy"
"github.com/xvguardian/xray-core-modified/features/routing"
routing_session "github.com/xvguardian/xray-core-modified/features/routing/session"
"github.com/xvguardian/xray-core-modified/features/stats"
"github.com/xvguardian/xray-core-modified/transport"
"github.com/xvguardian/xray-core-modified/transport/pipe"
)

var errSniffingTimeout = errors.New("timeout on sniffing")
Expand Down
12 changes: 6 additions & 6 deletions app/dispatcher/fakednssniffer.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ import (
"context"
"strings"

"github.com/xtls/xray-core/common"
"github.com/xtls/xray-core/common/errors"
"github.com/xtls/xray-core/common/net"
"github.com/xtls/xray-core/common/session"
"github.com/xtls/xray-core/core"
"github.com/xtls/xray-core/features/dns"
"github.com/xvguardian/xray-core-modified/common"
"github.com/xvguardian/xray-core-modified/common/errors"
"github.com/xvguardian/xray-core-modified/common/net"
"github.com/xvguardian/xray-core-modified/common/session"
"github.com/xvguardian/xray-core-modified/core"
"github.com/xvguardian/xray-core-modified/features/dns"
)

// newFakeDNSSniffer Creates a Fake DNS metadata sniffer
Expand Down
14 changes: 7 additions & 7 deletions app/dispatcher/sniffer.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ package dispatcher
import (
"context"

"github.com/xtls/xray-core/common"
"github.com/xtls/xray-core/common/errors"
"github.com/xtls/xray-core/common/net"
"github.com/xtls/xray-core/common/protocol/bittorrent"
"github.com/xtls/xray-core/common/protocol/http"
"github.com/xtls/xray-core/common/protocol/quic"
"github.com/xtls/xray-core/common/protocol/tls"
"github.com/xvguardian/xray-core-modified/common"
"github.com/xvguardian/xray-core-modified/common/errors"
"github.com/xvguardian/xray-core-modified/common/net"
"github.com/xvguardian/xray-core-modified/common/protocol/bittorrent"
"github.com/xvguardian/xray-core-modified/common/protocol/http"
"github.com/xvguardian/xray-core-modified/common/protocol/quic"
"github.com/xvguardian/xray-core-modified/common/protocol/tls"
)

type SniffResult interface {
Expand Down
6 changes: 3 additions & 3 deletions app/dispatcher/stats.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package dispatcher

import (
"github.com/xtls/xray-core/common"
"github.com/xtls/xray-core/common/buf"
"github.com/xtls/xray-core/features/stats"
"github.com/xvguardian/xray-core-modified/common"
"github.com/xvguardian/xray-core-modified/common/buf"
"github.com/xvguardian/xray-core-modified/features/stats"
)

type SizeStatWriter struct {
Expand Down
6 changes: 3 additions & 3 deletions app/dispatcher/stats_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package dispatcher_test
import (
"testing"

. "github.com/xtls/xray-core/app/dispatcher"
"github.com/xtls/xray-core/common"
"github.com/xtls/xray-core/common/buf"
. "github.com/xvguardian/xray-core-modified/app/dispatcher"
"github.com/xvguardian/xray-core-modified/common"
"github.com/xvguardian/xray-core-modified/common/buf"
)

type TestCounter int64
Expand Down
8 changes: 4 additions & 4 deletions app/dns/config.go
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package dns

import (
"github.com/xtls/xray-core/common/errors"
"github.com/xtls/xray-core/common/net"
"github.com/xtls/xray-core/common/strmatcher"
"github.com/xtls/xray-core/common/uuid"
"github.com/xvguardian/xray-core-modified/common/errors"
"github.com/xvguardian/xray-core-modified/common/net"
"github.com/xvguardian/xray-core-modified/common/strmatcher"
"github.com/xvguardian/xray-core-modified/common/uuid"
)

var typeMap = map[DomainMatchingType]strmatcher.Type{
Expand Down
4 changes: 2 additions & 2 deletions app/dns/config.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions app/dns/dns.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ import (
"strings"
"sync"

"github.com/xtls/xray-core/app/router"
"github.com/xtls/xray-core/common"
"github.com/xtls/xray-core/common/errors"
"github.com/xtls/xray-core/common/net"
"github.com/xtls/xray-core/common/session"
"github.com/xtls/xray-core/common/strmatcher"
"github.com/xtls/xray-core/features"
"github.com/xtls/xray-core/features/dns"
"github.com/xvguardian/xray-core-modified/app/router"
"github.com/xvguardian/xray-core-modified/common"
"github.com/xvguardian/xray-core-modified/common/errors"
"github.com/xvguardian/xray-core-modified/common/net"
"github.com/xvguardian/xray-core-modified/common/session"
"github.com/xvguardian/xray-core-modified/common/strmatcher"
"github.com/xvguardian/xray-core-modified/features"
"github.com/xvguardian/xray-core-modified/features/dns"
)

// DNS is a DNS rely server.
Expand Down
28 changes: 14 additions & 14 deletions app/dns/dns_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,20 @@ import (

"github.com/google/go-cmp/cmp"
"github.com/miekg/dns"
"github.com/xtls/xray-core/app/dispatcher"
. "github.com/xtls/xray-core/app/dns"
"github.com/xtls/xray-core/app/policy"
"github.com/xtls/xray-core/app/proxyman"
_ "github.com/xtls/xray-core/app/proxyman/outbound"
"github.com/xtls/xray-core/app/router"
"github.com/xtls/xray-core/common"
"github.com/xtls/xray-core/common/errors"
"github.com/xtls/xray-core/common/net"
"github.com/xtls/xray-core/common/serial"
"github.com/xtls/xray-core/core"
feature_dns "github.com/xtls/xray-core/features/dns"
"github.com/xtls/xray-core/proxy/freedom"
"github.com/xtls/xray-core/testing/servers/udp"
"github.com/xvguardian/xray-core-modified/app/dispatcher"
. "github.com/xvguardian/xray-core-modified/app/dns"
"github.com/xvguardian/xray-core-modified/app/policy"
"github.com/xvguardian/xray-core-modified/app/proxyman"
_ "github.com/xvguardian/xray-core-modified/app/proxyman/outbound"
"github.com/xvguardian/xray-core-modified/app/router"
"github.com/xvguardian/xray-core-modified/common"
"github.com/xvguardian/xray-core-modified/common/errors"
"github.com/xvguardian/xray-core-modified/common/net"
"github.com/xvguardian/xray-core-modified/common/serial"
"github.com/xvguardian/xray-core-modified/core"
feature_dns "github.com/xvguardian/xray-core-modified/features/dns"
"github.com/xvguardian/xray-core-modified/proxy/freedom"
"github.com/xvguardian/xray-core-modified/testing/servers/udp"
)

type staticHandler struct{}
Expand Down
14 changes: 7 additions & 7 deletions app/dns/dnscommon.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ import (
"strings"
"time"

"github.com/xtls/xray-core/common"
"github.com/xtls/xray-core/common/errors"
"github.com/xtls/xray-core/common/log"
"github.com/xtls/xray-core/common/net"
"github.com/xtls/xray-core/common/session"
"github.com/xtls/xray-core/core"
dns_feature "github.com/xtls/xray-core/features/dns"
"github.com/xvguardian/xray-core-modified/common"
"github.com/xvguardian/xray-core-modified/common/errors"
"github.com/xvguardian/xray-core-modified/common/log"
"github.com/xvguardian/xray-core-modified/common/net"
"github.com/xvguardian/xray-core-modified/common/session"
"github.com/xvguardian/xray-core-modified/core"
dns_feature "github.com/xvguardian/xray-core-modified/features/dns"
"golang.org/x/net/dns/dnsmessage"
)

Expand Down
6 changes: 3 additions & 3 deletions app/dns/dnscommon_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (

"github.com/google/go-cmp/cmp"
"github.com/miekg/dns"
"github.com/xtls/xray-core/common"
"github.com/xtls/xray-core/common/net"
dns_feature "github.com/xtls/xray-core/features/dns"
"github.com/xvguardian/xray-core-modified/common"
"github.com/xvguardian/xray-core-modified/common/net"
dns_feature "github.com/xvguardian/xray-core-modified/features/dns"
"golang.org/x/net/dns/dnsmessage"
)

Expand Down
10 changes: 5 additions & 5 deletions app/dns/fakedns/fake.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ import (
"sync"
"time"

"github.com/xtls/xray-core/common"
"github.com/xtls/xray-core/common/cache"
"github.com/xtls/xray-core/common/errors"
"github.com/xtls/xray-core/common/net"
"github.com/xtls/xray-core/features/dns"
"github.com/xvguardian/xray-core-modified/common"
"github.com/xvguardian/xray-core-modified/common/cache"
"github.com/xvguardian/xray-core-modified/common/errors"
"github.com/xvguardian/xray-core-modified/common/net"
"github.com/xvguardian/xray-core-modified/features/dns"
)

type Holder struct {
Expand Down
8 changes: 4 additions & 4 deletions app/dns/fakedns/fakedns_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import (
"testing"

"github.com/stretchr/testify/assert"
"github.com/xtls/xray-core/common"
"github.com/xtls/xray-core/common/net"
"github.com/xtls/xray-core/common/uuid"
"github.com/xtls/xray-core/features/dns"
"github.com/xvguardian/xray-core-modified/common"
"github.com/xvguardian/xray-core-modified/common/net"
"github.com/xvguardian/xray-core-modified/common/uuid"
"github.com/xvguardian/xray-core-modified/features/dns"
"golang.org/x/sync/errgroup"
)

Expand Down
12 changes: 6 additions & 6 deletions app/dns/hosts.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ package dns
import (
"context"

"github.com/xtls/xray-core/common"
"github.com/xtls/xray-core/common/errors"
"github.com/xtls/xray-core/common/net"
"github.com/xtls/xray-core/common/strmatcher"
"github.com/xtls/xray-core/features"
"github.com/xtls/xray-core/features/dns"
"github.com/xvguardian/xray-core-modified/common"
"github.com/xvguardian/xray-core-modified/common/errors"
"github.com/xvguardian/xray-core-modified/common/net"
"github.com/xvguardian/xray-core-modified/common/strmatcher"
"github.com/xvguardian/xray-core-modified/features"
"github.com/xvguardian/xray-core-modified/features/dns"
)

// StaticHosts represents static domain-ip mapping in DNS server.
Expand Down
8 changes: 4 additions & 4 deletions app/dns/hosts_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import (
"testing"

"github.com/google/go-cmp/cmp"
. "github.com/xtls/xray-core/app/dns"
"github.com/xtls/xray-core/common"
"github.com/xtls/xray-core/common/net"
"github.com/xtls/xray-core/features/dns"
. "github.com/xvguardian/xray-core-modified/app/dns"
"github.com/xvguardian/xray-core-modified/common"
"github.com/xvguardian/xray-core-modified/common/net"
"github.com/xvguardian/xray-core-modified/features/dns"
)

func TestStaticHosts(t *testing.T) {
Expand Down
14 changes: 7 additions & 7 deletions app/dns/nameserver.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ import (
"strings"
"time"

"github.com/xtls/xray-core/app/router"
"github.com/xtls/xray-core/common/errors"
"github.com/xtls/xray-core/common/net"
"github.com/xtls/xray-core/common/strmatcher"
"github.com/xtls/xray-core/core"
"github.com/xtls/xray-core/features/dns"
"github.com/xtls/xray-core/features/routing"
"github.com/xvguardian/xray-core-modified/app/router"
"github.com/xvguardian/xray-core-modified/common/errors"
"github.com/xvguardian/xray-core-modified/common/net"
"github.com/xvguardian/xray-core-modified/common/strmatcher"
"github.com/xvguardian/xray-core-modified/core"
"github.com/xvguardian/xray-core-modified/features/dns"
"github.com/xvguardian/xray-core-modified/features/routing"
)

// Server is the interface for Name Server.
Expand Down
24 changes: 12 additions & 12 deletions app/dns/nameserver_doh.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,18 @@ import (
"sync/atomic"
"time"

"github.com/xtls/xray-core/common"
"github.com/xtls/xray-core/common/errors"
"github.com/xtls/xray-core/common/log"
"github.com/xtls/xray-core/common/net"
"github.com/xtls/xray-core/common/net/cnc"
"github.com/xtls/xray-core/common/protocol/dns"
"github.com/xtls/xray-core/common/session"
"github.com/xtls/xray-core/common/signal/pubsub"
"github.com/xtls/xray-core/common/task"
dns_feature "github.com/xtls/xray-core/features/dns"
"github.com/xtls/xray-core/features/routing"
"github.com/xtls/xray-core/transport/internet"
"github.com/xvguardian/xray-core-modified/common"
"github.com/xvguardian/xray-core-modified/common/errors"
"github.com/xvguardian/xray-core-modified/common/log"
"github.com/xvguardian/xray-core-modified/common/net"
"github.com/xvguardian/xray-core-modified/common/net/cnc"
"github.com/xvguardian/xray-core-modified/common/protocol/dns"
"github.com/xvguardian/xray-core-modified/common/session"
"github.com/xvguardian/xray-core-modified/common/signal/pubsub"
"github.com/xvguardian/xray-core-modified/common/task"
dns_feature "github.com/xvguardian/xray-core-modified/features/dns"
"github.com/xvguardian/xray-core-modified/features/routing"
"github.com/xvguardian/xray-core-modified/transport/internet"
"golang.org/x/net/dns/dnsmessage"
)

Expand Down
Loading

0 comments on commit 10740ee

Please sign in to comment.