1
0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-06-27 01:45:23 +00:00

dice.RandomUint16

This commit is contained in:
Darien Raymond 2017-02-14 22:29:44 +01:00
parent 3c032f0d53
commit 48eb40ff39
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
7 changed files with 13 additions and 8 deletions

View File

@ -84,7 +84,7 @@ func (v *UDPNameServer) AssignUnusedID(response chan<- *ARecord) uint16 {
} }
for { for {
id = uint16(dice.Roll(65536)) id = dice.RandomUint16()
if _, found := v.requests[id]; found { if _, found := v.requests[id]; found {
continue continue
} }

View File

@ -15,6 +15,11 @@ func Roll(n int) int {
return rand.Intn(n) return rand.Intn(n)
} }
// RandomUint16 returns a random uint16 value.
func RandomUint16() uint16 {
return uint16(rand.Intn(65536))
}
func init() { func init() {
rand.Seed(time.Now().Unix()) rand.Seed(time.Now().Unix())
} }

View File

@ -2,9 +2,9 @@ package srtp
import ( import (
"context" "context"
"math/rand"
"v2ray.com/core/common" "v2ray.com/core/common"
"v2ray.com/core/common/dice"
"v2ray.com/core/common/serial" "v2ray.com/core/common/serial"
) )
@ -27,7 +27,7 @@ func (v *SRTP) Write(b []byte) (int, error) {
func NewSRTP(ctx context.Context, config interface{}) (interface{}, error) { func NewSRTP(ctx context.Context, config interface{}) (interface{}, error) {
return &SRTP{ return &SRTP{
header: 0xB5E8, header: 0xB5E8,
number: uint16(rand.Intn(65536)), number: dice.RandomUint16(),
}, nil }, nil
} }

View File

@ -2,9 +2,9 @@ package utp
import ( import (
"context" "context"
"math/rand"
"v2ray.com/core/common" "v2ray.com/core/common"
"v2ray.com/core/common/dice"
"v2ray.com/core/common/serial" "v2ray.com/core/common/serial"
) )
@ -29,7 +29,7 @@ func NewUTP(ctx context.Context, config interface{}) (interface{}, error) {
return &UTP{ return &UTP{
header: 1, header: 1,
extension: 0, extension: 0,
connectionId: uint16(rand.Intn(65536)), connectionId: dice.RandomUint16(),
}, nil }, nil
} }

View File

@ -26,7 +26,7 @@ func (vc *VideoChat) Write(b []byte) (int, error) {
func NewVideoChat(ctx context.Context, config interface{}) (interface{}, error) { func NewVideoChat(ctx context.Context, config interface{}) (interface{}, error) {
return &VideoChat{ return &VideoChat{
sn: dice.Roll(65535), sn: int(dice.RandomUint16()),
}, nil }, nil
} }

View File

@ -20,7 +20,7 @@ import (
) )
var ( var (
globalConv = uint32(dice.Roll(65536)) globalConv = uint32(dice.RandomUint16())
globalPool = internal.NewConnectionPool() globalPool = internal.NewConnectionPool()
) )

View File

@ -20,7 +20,7 @@ import (
func TestV2RayClose(t *testing.T) { func TestV2RayClose(t *testing.T) {
assert := assert.On(t) assert := assert.On(t)
port := v2net.Port(dice.Roll(65535)) port := v2net.Port(dice.RandomUint16())
config := &Config{ config := &Config{
Inbound: []*proxyman.InboundHandlerConfig{ Inbound: []*proxyman.InboundHandlerConfig{
{ {