OlzNet
/
srpc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

working on connection

This commit is contained in:
Matthias Fulz 2020-02-17 01:30:24 +01:00
parent 2fe79d214f
commit 8a437178d4
1 changed files with 59 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
connection.go
View File

@ -1,7 +1,9 @@
package srpc package srpc
import ( import (
"io"
"net" "net"
"sync"
) )
type RPCStatus uint8 type RPCStatus uint8
@ -40,7 +42,6 @@ type TCPConn struct {
func (tc *TCPConn) ReceiveRequest() (ret *RPCRequest, err error) { func (tc *TCPConn) ReceiveRequest() (ret *RPCRequest, err error) {
ret = new(RPCRequest) ret = new(RPCRequest)
err = nil
dec := tc.ed.NewDecoder(tc.conn) dec := tc.ed.NewDecoder(tc.conn)
if err = dec.Decode(ret); err != nil { if err = dec.Decode(ret); err != nil {
@ -52,7 +53,6 @@ func (tc *TCPConn) ReceiveRequest() (ret *RPCRequest, err error) {
func (tc *TCPConn) ReceiveResponse() (ret *RPCResponse, err error) { func (tc *TCPConn) ReceiveResponse() (ret *RPCResponse, err error) {
ret = new(RPCResponse) ret = new(RPCResponse)
err = nil
dec := tc.ed.NewDecoder(tc.conn) dec := tc.ed.NewDecoder(tc.conn)
if err = dec.Decode(ret); err != nil { if err = dec.Decode(ret); err != nil {
@ -63,8 +63,6 @@ func (tc *TCPConn) ReceiveResponse() (ret *RPCResponse, err error) {
} }
func (tc *TCPConn) SendRequest(request *RPCRequest) (err error) { func (tc *TCPConn) SendRequest(request *RPCRequest) (err error) {
err = nil
enc := tc.ed.NewEncoder(tc.conn) enc := tc.ed.NewEncoder(tc.conn)
err = enc.Encode(request) err = enc.Encode(request)
@ -72,8 +70,6 @@ func (tc *TCPConn) SendRequest(request *RPCRequest) (err error) {
} }
func (tc *TCPConn) SendResponse(response *RPCResponse) (err error) { func (tc *TCPConn) SendResponse(response *RPCResponse) (err error) {
err = nil
enc := tc.ed.NewEncoder(tc.conn) enc := tc.ed.NewEncoder(tc.conn)
err = enc.Encode(response) err = enc.Encode(response)
@ -91,3 +87,60 @@ func NewTCPConn(conn net.Conn, ed IEncoderDecoder) *TCPConn {
return ret return ret
} }
type NetHeartbeatConn struct {
sync.Mutex
conn io.ReadWriteCloser
dec IDecoder
enc IEncoder
// interfaces
IRPCConn
}
func (nhc *NetHeartbeatConn) ReceiveRequest() (ret *RPCRequest, err error) {
nhc.Lock()
defer nhc.Unlock()
ret = new(RPCRequest)
if err = nhc.dec.Decode(ret); err != nil {
return nil, err
}
return ret, err
}
func (nhc *NetHeartbeatConn) ReceiveResponse() (ret *RPCResponse, err error) {
nhc.Lock()
defer nhc.Unlock()
ret = new(RPCResponse)
if err = nhc.dec.Decode(ret); err != nil {
return nil, err
}
return ret, err
}
func (nhc *NetHeartbeatConn) SendRequest(request *RPCRequest) (err error) {
nhc.Lock()
defer nhc.Unlock()
err = nhc.enc.Encode(request)
return err
}
func (nhc *NetHeartbeatConn) SendResponse(response *RPCResponse) (err error) {
nhc.Lock()
defer nhc.Unlock()
err = nhc.enc.Encode(response)
return err
}
func (nhc *NetHeartbeatConn) Close() {
nhc.Lock()
defer nhc.Unlock()
nhc.conn.Close()
}