lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-12-21 09:36:34 -05:00
Code Issues Releases Wiki Activity

Update protobuf version (rebased from 6d25d51519)

Browse Source 
Some change is not adopted since it would break the code base. These changes will be reintroduced at a later date.
This commit is contained in:
young-zy 2020-12-20 10:50:46 +08:00 committed by Shelikhoo
parent b05a469488
commit 12dfbc78a3
No known key found for this signature in database
GPG Key ID: C4D5E79D22B25316
6 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/reverse/portal.go
View File

@ -5,7 +5,7 @@ import (
"sync"
"time"
"github.com/golang/protobuf/proto"
"google.golang.org/protobuf/proto"
"github.com/v2fly/v2ray-core/v4/common"
"github.com/v2fly/v2ray-core/v4/common/buf"

3
common/serial/typed_message.go
View File

@ -2,9 +2,8 @@ package serial
import (
"errors"
"reflect"
"github.com/golang/protobuf/proto"
"reflect"
)
// ToTypedMessage converts a proto Message into TypedMessage.

2
infra/conf/trojan.go
View File

@ -6,7 +6,7 @@ import (
"strconv"
"syscall"
"github.com/golang/protobuf/proto"
"google.golang.org/protobuf/proto"
"github.com/v2fly/v2ray-core/v4/common/net"
"github.com/v2fly/v2ray-core/v4/common/protocol"

2
proxy/vless/encoding/addons.go
View File

@ -6,7 +6,7 @@ package encoding
import (
"io"
"github.com/golang/protobuf/proto"
"google.golang.org/protobuf/proto"
"github.com/v2fly/v2ray-core/v4/common/buf"
"github.com/v2fly/v2ray-core/v4/common/errors"

2
testing/scenarios/common.go
View File

@ -13,7 +13,7 @@ import (
"syscall"
"time"
"github.com/golang/protobuf/proto"
"google.golang.org/protobuf/proto"
core "github.com/v2fly/v2ray-core/v4"
"github.com/v2fly/v2ray-core/v4/app/dispatcher"

2
v2ray_test.go
View File

@ -3,7 +3,7 @@ package core_test
import (
"testing"
"github.com/golang/protobuf/proto"
"google.golang.org/protobuf/proto"
. "github.com/v2fly/v2ray-core/v4"
"github.com/v2fly/v2ray-core/v4/app/dispatcher"