format code

This commit is contained in:
V2Ray committed 2015-09-16 00:06:22 +02:00
1 parent 4c963a51ed
commit 54fe1ed8b1
10 files changed
+119 -119

No files matched your search

+35 -35
View File
@@ -57,7 +57,7 @@ func ReadAuthentication(reader io.Reader) (auth Socks5AuthenticationRequest, err
return
}
if nBytes - 2 != int(auth.nMethods) {
if nBytes-2 != int(auth.nMethods) {
err = fmt.Errorf("Unmatching number of auth methods, expecting %d, but got %d", auth.nMethods, nBytes)
return
}
@@ -78,7 +78,7 @@ func NewAuthenticationResponse(authMethod byte) *Socks5AuthenticationResponse {
}
func (r *Socks5AuthenticationResponse) ToBytes() []byte {
return []byte{r.version, r.authMethod}
return []byte{r.version, r.authMethod}
}
func WriteAuthentication(writer io.Writer, response *Socks5AuthenticationResponse) error {
@@ -87,54 +87,54 @@ func WriteAuthentication(writer io.Writer, response *Socks5AuthenticationRespons
}
type Socks5UserPassRequest struct {
version byte
username string
password string
version byte
username string
password string
}
func (request Socks5UserPassRequest) IsValid(username string, password string) bool {
return request.username == username && request.password == password
return request.username == username && request.password == password
}
func ReadUserPassRequest(reader io.Reader) (request Socks5UserPassRequest, err error) {
buffer := make([]byte, 256)
_, err = reader.Read(buffer[0:2])
if err != nil {
return
}
request.version = buffer[0]
nUsername := buffer[1]
nBytes, err := reader.Read(buffer[:nUsername])
if err != nil {
return
}
request.username = string(buffer[:nBytes])
_, err = reader.Read(buffer[0:1])
if err != nil {
return
}
nPassword := buffer[0]
nBytes, err = reader.Read(buffer[:nPassword])
if err != nil {
return
}
request.password = string(buffer[:nBytes])
return
buffer := make([]byte, 256)
_, err = reader.Read(buffer[0:2])
if err != nil {
return
}
request.version = buffer[0]
nUsername := buffer[1]
nBytes, err := reader.Read(buffer[:nUsername])
if err != nil {
return
}
request.username = string(buffer[:nBytes])
_, err = reader.Read(buffer[0:1])
if err != nil {
return
}
nPassword := buffer[0]
nBytes, err = reader.Read(buffer[:nPassword])
if err != nil {
return
}
request.password = string(buffer[:nBytes])
return
}
type Socks5UserPassResponse struct {
version byte
status byte
version byte
status byte
}
func NewSocks5UserPassResponse(status byte) Socks5UserPassResponse {
return Socks5UserPassResponse{socksVersion, status}
return Socks5UserPassResponse{socksVersion, status}
}
func WriteUserPassResponse(writer io.Writer, response Socks5UserPassResponse) error {
_, err := writer.Write([]byte{response.version, response.status})
return err
_, err := writer.Write([]byte{response.version, response.status})
return err
}
const (
+5 -5
View File
@@ -65,8 +65,8 @@ func (r *VMessRequestReader) Read(reader io.Reader) (*VMessRequest, error) {
if err != nil {
return nil, err
}
log.Debug("Read user hash: %v", buffer[:nBytes])
log.Debug("Read user hash: %v", buffer[:nBytes])
userId, timeSec, valid := r.vUserSet.GetUser(buffer[:nBytes])
if !valid {
@@ -187,9 +187,9 @@ func NewVMessRequestWriter() *VMessRequestWriter {
func (w *VMessRequestWriter) Write(writer io.Writer, request *VMessRequest) error {
buffer := make([]byte, 0, 300)
userHash, timeSec := request.UserId.TimeRangeHash(30)
log.Debug("Writing userhash: %v", userHash)
userHash, timeSec := request.UserId.TimeRangeHash(30)
log.Debug("Writing userhash: %v", userHash)
buffer = append(buffer, userHash...)
encryptionBegin := len(buffer)
+1 -1
View File
@@ -13,7 +13,7 @@ import (
)
func TestVMessSerialization(t *testing.T) {
t.Skip();
t.Skip()
assert := unit.Assert(t)
userId, err := core.NewID("2b2966ac-16aa-4fbf-8d81-c5f172a3da51")