minor: v0.2.0

[rbdr/mobius] / hotline / client.go

diff --git a/hotline/client.go b/hotline/client.go
index dd113c9974438e7fc14ddfdd3d06c89497c8f11e..4ca42f38669eef3829ddaf8a804917d1cd108220 100644 (file)
--- a/hotline/client.go
+++ b/hotline/client.go
@@ -200,7 +200,7 @@ var clientHandlers = map[uint16]clientTHandler{
                Handler: handleTranServerMsg,
        },
        tranKeepAlive: clientTransaction{
                Handler: handleTranServerMsg,
        },
        tranKeepAlive: clientTransaction{

-               Name:    "tranKeepAlive",
+               Name: "tranKeepAlive",

                Handler: func(client *Client, transaction *Transaction) (t []Transaction, err error) {
                        return t, err
                },
                Handler: func(client *Client, transaction *Transaction) (t []Transaction, err error) {
                        return t, err
                },


@@ -336,8 +336,8 @@ func handleGetMsgs(c *Client, t *Transaction) (res []Transaction, err error) {
        newsTextView.SetBorder(true).SetTitle("News")
 
        c.UI.Pages.AddPage("news", newsTextView, true, true)
        newsTextView.SetBorder(true).SetTitle("News")
 
        c.UI.Pages.AddPage("news", newsTextView, true, true)

-       //c.UI.Pages.SwitchToPage("news")
-       //c.UI.App.SetFocus(newsTextView)
+       // c.UI.Pages.SwitchToPage("news")
+       // c.UI.App.SetFocus(newsTextView)

        c.UI.App.Draw()
 
        return res, err
        c.UI.App.Draw()
 
        return res, err


@@ -605,10 +605,10 @@ var ServerHandshake = []byte{
 }
 
 func (c *Client) Handshake() error {
 }
 
 func (c *Client) Handshake() error {

-       //Protocol ID   4       ‘TRTP’      0x54 52 54 50
-       //Sub-protocol ID       4               User defined
-       //Version       2       1       Currently 1
-       //Sub-version   2               User defined
+       // Protocol ID  4       ‘TRTP’      0x54 52 54 50
+       // Sub-protocol ID      4               User defined
+       // Version      2       1       Currently 1
+       // Sub-version  2               User defined

        if _, err := c.Connection.Write(ClientHandshake); err != nil {
                return fmt.Errorf("handshake write err: %s", err)
        }
        if _, err := c.Connection.Write(ClientHandshake); err != nil {
                return fmt.Errorf("handshake write err: %s", err)
        }


@@ -644,7 +644,7 @@ func (c *Client) Send(t Transaction) error {
        requestNum := binary.BigEndian.Uint16(t.Type)
        tID := binary.BigEndian.Uint32(t.ID)
 
        requestNum := binary.BigEndian.Uint16(t.Type)
        tID := binary.BigEndian.Uint32(t.ID)
 

-       //handler := TransactionHandlers[requestNum]
+       // handler := TransactionHandlers[requestNum]

 
        // if transaction is NOT reply, add it to the list to transactions we're expecting a response for
        if t.IsReply == 0 {
 
        // if transaction is NOT reply, add it to the list to transactions we're expecting a response for
        if t.IsReply == 0 {


@@ -698,18 +698,6 @@ func (c *Client) HandleTransaction(t *Transaction) error {
        return nil
 }
 
        return nil
 }
 

-func (c *Client) Connected() bool {
-       // c.Agreed == true &&
-       if c.UserAccess != nil {
-               return true
-       }
-       return false
-}
-

 func (c *Client) Disconnect() error {
 func (c *Client) Disconnect() error {

-       err := c.Connection.Close()
-       if err != nil {
-               return err
-       }
-       return nil
+       return c.Connection.Close()

 }
 }