Skip to content

Commit

Permalink
fix error introduced by rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
xiaokangwang committed Jan 3, 2022
1 parent 0f2da63 commit 1e98e0a
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion common/net/packetaddr/config.proto
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ syntax = "proto3";

package v2ray.core.net.packetaddr;
option csharp_namespace = "V2Ray.Core.Common.Net.Packetaddr";
option go_package = "github.com/v2fly/v2ray-core/v4/common/net/packetaddr";
option go_package = "github.com/v2fly/v2ray-core/v5/common/net/packetaddr";
option java_package = "com.v2ray.core.common.net.packetaddr";
option java_multiple_files = true;

Expand Down
2 changes: 1 addition & 1 deletion common/net/packetaddr/packetaddr_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

"github.com/stretchr/testify/assert"

"github.com/v2fly/v2ray-core/v4/common/buf"
"github.com/v2fly/v2ray-core/v5/common/buf"
)

func TestPacketEncodingIPv4(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions proxy/socks/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"context"
"time"

"github.com/v2fly/v2ray-core/v4/common/net/packetaddr"
"github.com/v2fly/v2ray-core/v4/transport/internet/udp"
"github.com/v2fly/v2ray-core/v5/common/net/packetaddr"
"github.com/v2fly/v2ray-core/v5/transport/internet/udp"

core "github.com/v2fly/v2ray-core/v5"
"github.com/v2fly/v2ray-core/v5/common"
Expand Down
8 changes: 4 additions & 4 deletions proxy/socks/config.pb.go

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

4 changes: 2 additions & 2 deletions transport/internet/connection.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package internet
import (
"net"

"github.com/v2fly/v2ray-core/v4/common"
"github.com/v2fly/v2ray-core/v4/features/stats"
"github.com/v2fly/v2ray-core/v5/common"
"github.com/v2fly/v2ray-core/v5/features/stats"
)

type Connection interface {
Expand Down

0 comments on commit 1e98e0a

Please sign in to comment.