Account for the root

[rbdr/mobius] / hotline / handshake.go

diff --git a/hotline/handshake.go b/hotline/handshake.go
index c54359e0e648acf41b16c3ad3cab8cfc6e73018a..b8e16c04fb61f58166252a11290dce76ecbf13e1 100644 (file)
--- a/hotline/handshake.go
+++ b/hotline/handshake.go
@@ -19,14 +19,14 @@ import (
 //
 // The following information is sent to the server:
 // Description         Size    Data    Note
 //
 // The following information is sent to the server:
 // Description         Size    Data    Note

-// Protocol ID         4               TRTP    0x54525450
-// Sub-protocol ID     4               HOTL    User defined
+// Protocol Type               4               TRTP    0x54525450
+// Sub-protocol Type   4               HOTL    User defined

 // VERSION                     2               1               Currently 1
 // Sub-version         2               2               User defined
 //
 // The server replies with the following:
 // Description         Size    Data    Note
 // VERSION                     2               1               Currently 1
 // Sub-version         2               2               User defined
 //
 // The server replies with the following:
 // Description         Size    Data    Note

-// Protocol ID         4               TRTP
+// Protocol Type               4               TRTP

 // Error code          4                               Error code returned by the server (0 = no error)
 
 type handshake struct {
 // Error code          4                               Error code returned by the server (0 = no error)
 
 type handshake struct {


@@ -53,10 +53,10 @@ func (h *handshake) Valid() bool {
 }
 
 var (
 }
 
 var (

-       // trtp represents the Protocol ID "TRTP" in hex
+       // trtp represents the Protocol Type "TRTP" in hex

        trtp = [4]byte{0x54, 0x52, 0x54, 0x50}
 
        trtp = [4]byte{0x54, 0x52, 0x54, 0x50}
 

-       // hotl represents the Sub-protocol ID "HOTL" in hex
+       // hotl represents the Sub-protocol Type "HOTL" in hex

        hotl = [4]byte{0x48, 0x4F, 0x54, 0x4C}
 
        // handshakeResponse represents the server's response after a successful handshake
        hotl = [4]byte{0x48, 0x4F, 0x54, 0x4C}
 
        // handshakeResponse represents the server's response after a successful handshake


@@ -72,15 +72,14 @@ func performHandshake(rw io.ReadWriter) error {
 
        // Copy exactly handshakeSize bytes from rw to handshake
        if _, err := io.CopyN(&h, rw, handshakeSize); err != nil {
 
        // Copy exactly handshakeSize bytes from rw to handshake
        if _, err := io.CopyN(&h, rw, handshakeSize); err != nil {

-               return fmt.Errorf("failed to read handshake data: %w", err)
+               return fmt.Errorf("read handshake: %w", err)

        }
        }

-

        if !h.Valid() {
                return errors.New("invalid protocol or sub-protocol in handshake")
        }
 
        if _, err := rw.Write(handshakeResponse[:]); err != nil {
        if !h.Valid() {
                return errors.New("invalid protocol or sub-protocol in handshake")
        }
 
        if _, err := rw.Write(handshakeResponse[:]); err != nil {

-               return fmt.Errorf("error sending handshake response: %w", err)
+               return fmt.Errorf("send handshake response: %w", err)

        }
 
        return nil
        }
 
        return nil