Refactor czar

Author: mohanson

protocol/czar/engine.go

@@ -27,25 +27,25 @@ import (
 // To open a stream:
 //
 // +-----+-----+-----+-----+
-// | Sid |  0  |    Rsv    |
+// |  0  | Sid |    Rsv    |
 // +-----+-----+-----+-----+
 //
 // Both server and client can push data to each other.
 //
 // +-----+-----+-----+-----+-----+-----+
-// | Sid |  1  |    Len    |    Msg    |
+// |  1  | Sid |    Len    |    Msg    |
 // +-----+-----+-----+-----+-----+-----+
 //
 // Close the specified stream.
 //
 // +-----+-----+-----+-----+
-// | Sid |  2  | 0/1 | Rsv |
+// |  2  | Sid | 0/1 | Rsv |
 // +-----+-----+-----+-----+
 //
 // Keep alive probe and reply.
 //
 // +-----+-----+-----+-----+
-// | 0x0 |  3  | 0/1 | Rsv |
+// |  3  | 0x0 | 0/1 | Rsv |
 // +-----+-----+-----+-----+
 
 // Conf is acting as package level configuration.

protocol/czar/mux.go

@@ -28,7 +28,7 @@ func (s *Stream) Close() error {
 	s.wer.Put(io.ErrClosedPipe)
 	s.zo0.Do(func() {
 		s.mux.pri.Pri(0, func() error {
-			s.mux.con.Write([]byte{s.idx, 0x02, 0x00, 0x00})
+			s.mux.con.Write([]byte{0x02, s.idx, 0x00, 0x00})
 			return nil
 		})
 	})
@@ -41,7 +41,7 @@ func (s *Stream) Esolc() error {
 	s.wer.Put(io.ErrClosedPipe)
 	s.zo0.Do(func() {
 		s.mux.pri.Pri(0, func() error {
-			s.mux.con.Write([]byte{s.idx, 0x02, 0x01, 0x00})
+			s.mux.con.Write([]byte{0x02, s.idx, 0x01, 0x00})
 			return nil
 		})
 	})
@@ -98,8 +98,8 @@ func (s *Stream) Write(p []byte) (int, error) {
 		case len(p) >= 0:
 			return n, nil
 		}
-		buf[0] = s.idx
-		buf[1] = 0x01
+		buf[0] = 0x01
+		buf[1] = s.idx
 		binary.BigEndian.PutUint16(buf[2:4], uint16(l))
 		copy(buf[4:], p[:l])
 		p = p[l:]
@@ -177,7 +177,7 @@ func (m *Mux) Open() (*Stream, error) {
 		return nil, err
 	}
 	err = m.pri.Pri(0, func() error {
-		return doa.Err(m.con.Write([]byte{idx, 0x00, 0x00, 0x00}))
+		return doa.Err(m.con.Write([]byte{0x00, idx, 0x00, 0x00}))
 	})
 	if err != nil {
 		m.idp.Put(idx)
@@ -200,7 +200,7 @@ func (m *Mux) Recv() {
 		old *Stream
 		prb = time.AfterFunc(Conf.IdleProbeDuration, func() {
 			if m.pri.Pri(0, func() error {
-				return doa.Err(m.con.Write([]byte{0x00, 0x03, 0x00, 0x00}))
+				return doa.Err(m.con.Write([]byte{0x03, 0x00, 0x00, 0x00}))
 			}) != nil {
 				m.Close()
 			}
@@ -218,8 +218,8 @@ func (m *Mux) Recv() {
 			m.rer.Put(err)
 			break
 		}
-		idx = buf[0]
-		cmd = buf[1]
+		cmd = buf[0]
+		idx = buf[1]
 		switch {
 		case cmd == 0x00:
 			// Make sure the stream has been closed properly.
@@ -257,7 +257,7 @@ func (m *Mux) Recv() {
 			switch buf[2] {
 			case 0x00:
 				m.pri.Pri(0, func() error {
-					return doa.Err(m.con.Write([]byte{0x00, 0x03, 0x01, 0x00}))
+					return doa.Err(m.con.Write([]byte{0x03, 0x00, 0x01, 0x00}))
 				})
 			case 0x01:
 			}