Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
G
getty
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wei.xuan
getty
Commits
2c81cca2
Commit
2c81cca2
authored
Mar 19, 2018
by
AlexStocks
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
check udp connection alive
parent
b796edc5
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
54 additions
and
30 deletions
+54
-30
change_log.md
change_log.md
+6
-1
client.go
client.go
+22
-0
session.go
session.go
+26
-29
No files found.
change_log.md
View file @
2c81cca2
...
@@ -14,6 +14,11 @@
...
@@ -14,6 +14,11 @@
## develop history ##
## develop history ##
---
---
-
2018/03/18
> improvement
*
nerr -> netError
*
check udp connection alive after connect()
-
2018/03/17
-
2018/03/17
> improvement
> improvement
*
add end point type
*
add end point type
...
@@ -284,7 +289,7 @@
...
@@ -284,7 +289,7 @@
>
>
> 4 reconstruct session output token string session.go:(Session)sessionToken
> 4 reconstruct session output token string session.go:(Session)sessionToken
>
>
> 5 use err instead of ne
r
r in session.go:(Session)handlePackage:defer:OnError
> 5 use err instead of ne
tErro
r in session.go:(Session)handlePackage:defer:OnError
>
>
> 6 version: 0.2.07
> 6 version: 0.2.07
...
...
client.go
View file @
2c81cca2
...
@@ -22,6 +22,7 @@ import (
...
@@ -22,6 +22,7 @@ import (
)
)
import
(
import
(
"github.com/AlexStocks/goext/log"
"github.com/AlexStocks/goext/sync"
"github.com/AlexStocks/goext/sync"
log
"github.com/AlexStocks/log4go"
log
"github.com/AlexStocks/log4go"
"github.com/gorilla/websocket"
"github.com/gorilla/websocket"
...
@@ -31,6 +32,7 @@ const (
...
@@ -31,6 +32,7 @@ const (
connInterval
=
3e9
// 3s
connInterval
=
3e9
// 3s
connectTimeout
=
5e9
connectTimeout
=
5e9
maxTimes
=
10
maxTimes
=
10
pingPacket
=
"ping"
)
)
/////////////////////////////////////////
/////////////////////////////////////////
...
@@ -143,8 +145,11 @@ func (c *client) dialUDP() Session {
...
@@ -143,8 +145,11 @@ func (c *client) dialUDP() Session {
conn
*
net
.
UDPConn
conn
*
net
.
UDPConn
localAddr
*
net
.
UDPAddr
localAddr
*
net
.
UDPAddr
peerAddr
*
net
.
UDPAddr
peerAddr
*
net
.
UDPAddr
length
int
buf
[]
byte
)
)
buf
=
make
([]
byte
,
128
)
localAddr
=
&
net
.
UDPAddr
{
IP
:
net
.
IPv4zero
,
Port
:
0
}
localAddr
=
&
net
.
UDPAddr
{
IP
:
net
.
IPv4zero
,
Port
:
0
}
peerAddr
,
_
=
net
.
ResolveUDPAddr
(
"udp"
,
c
.
addr
)
peerAddr
,
_
=
net
.
ResolveUDPAddr
(
"udp"
,
c
.
addr
)
for
{
for
{
...
@@ -155,6 +160,23 @@ func (c *client) dialUDP() Session {
...
@@ -155,6 +160,23 @@ func (c *client) dialUDP() Session {
if
err
==
nil
&&
conn
.
LocalAddr
()
.
String
()
==
conn
.
RemoteAddr
()
.
String
()
{
if
err
==
nil
&&
conn
.
LocalAddr
()
.
String
()
==
conn
.
RemoteAddr
()
.
String
()
{
err
=
errSelfConnect
err
=
errSelfConnect
}
}
// check connection alive by write/read action
copy
(
buf
,
[]
byte
(
pingPacket
))
conn
.
SetWriteDeadline
(
wheel
.
Now
()
.
Add
(
1e9
))
if
length
,
err
=
conn
.
Write
(
buf
[
:
len
(
pingPacket
)]);
err
!=
nil
{
log
.
Warn
(
"conn.Write(%s) = {length:%d, err:%s}"
,
pingPacket
,
length
,
err
)
continue
}
conn
.
SetReadDeadline
(
wheel
.
Now
()
.
Add
(
1e9
))
length
,
err
=
conn
.
Read
(
buf
)
if
netErr
,
ok
:=
err
.
(
net
.
Error
);
ok
&&
netErr
.
Timeout
()
{
err
=
nil
}
if
err
!=
nil
{
log
.
Info
(
"conn{%#v}.Read() = err{%s}"
,
conn
,
err
)
continue
}
if
err
==
nil
{
if
err
==
nil
{
return
newUDPSession
(
conn
,
c
.
endPointType
)
return
newUDPSession
(
conn
,
c
.
endPointType
)
}
}
...
...
session.go
View file @
2c81cca2
...
@@ -21,7 +21,6 @@ import (
...
@@ -21,7 +21,6 @@ import (
import
(
import
(
"github.com/AlexStocks/goext/context"
"github.com/AlexStocks/goext/context"
"github.com/AlexStocks/goext/log"
"github.com/AlexStocks/goext/sync"
"github.com/AlexStocks/goext/sync"
"github.com/AlexStocks/goext/time"
"github.com/AlexStocks/goext/time"
log
"github.com/AlexStocks/log4go"
log
"github.com/AlexStocks/log4go"
...
@@ -461,7 +460,7 @@ LOOP:
...
@@ -461,7 +460,7 @@ LOOP:
case
inPkg
=
<-
s
.
rQ
:
case
inPkg
=
<-
s
.
rQ
:
// 这个条件分支通过(session)rQ排空确保(session)handlePackage gr不会阻塞在(session)rQ上
// 这个条件分支通过(session)rQ排空确保(session)handlePackage gr不会阻塞在(session)rQ上
if
flag
{
if
flag
{
gxlog
.
CInfo
(
"%#v <-s.rQ"
,
inPkg
)
log
.
Debug
(
"%#v <-s.rQ"
,
inPkg
)
s
.
listener
.
OnMessage
(
s
,
inPkg
)
s
.
listener
.
OnMessage
(
s
,
inPkg
)
s
.
incReadPkgCount
()
s
.
incReadPkgCount
()
}
else
{
}
else
{
...
@@ -515,7 +514,6 @@ func (s *session) handlePackage() {
...
@@ -515,7 +514,6 @@ func (s *session) handlePackage() {
grNum
=
atomic
.
AddInt32
(
&
(
s
.
grNum
),
-
1
)
grNum
=
atomic
.
AddInt32
(
&
(
s
.
grNum
),
-
1
)
log
.
Info
(
"%s, [session.handlePackage] gr will exit now, left gr num %d"
,
s
.
sessionToken
(),
grNum
)
log
.
Info
(
"%s, [session.handlePackage] gr will exit now, left gr num %d"
,
s
.
sessionToken
(),
grNum
)
s
.
stop
()
s
.
stop
()
// if s.errFlag {
if
err
!=
nil
{
if
err
!=
nil
{
log
.
Error
(
"%s, [session.handlePackage] error{%s}"
,
s
.
sessionToken
(),
err
)
log
.
Error
(
"%s, [session.handlePackage] error{%s}"
,
s
.
sessionToken
(),
err
)
s
.
listener
.
OnError
(
s
,
err
)
s
.
listener
.
OnError
(
s
,
err
)
...
@@ -542,16 +540,16 @@ func (s *session) handlePackage() {
...
@@ -542,16 +540,16 @@ func (s *session) handlePackage() {
// get package from tcp stream(packet)
// get package from tcp stream(packet)
func
(
s
*
session
)
handleTCPPackage
()
error
{
func
(
s
*
session
)
handleTCPPackage
()
error
{
var
(
var
(
ok
bool
ok
bool
err
error
err
error
ne
rr
net
.
Error
ne
tError
net
.
Error
conn
*
gettyTCPConn
conn
*
gettyTCPConn
exit
bool
exit
bool
bufLen
int
bufLen
int
pkgLen
int
pkgLen
int
buf
[]
byte
buf
[]
byte
pktBuf
*
bytes
.
Buffer
pktBuf
*
bytes
.
Buffer
pkg
interface
{}
pkg
interface
{}
)
)
buf
=
make
([]
byte
,
maxReadBufLen
)
buf
=
make
([]
byte
,
maxReadBufLen
)
...
@@ -569,7 +567,7 @@ func (s *session) handleTCPPackage() error {
...
@@ -569,7 +567,7 @@ func (s *session) handleTCPPackage() error {
// s.conn.SetReadTimeout(time.Now().Add(s.rTimeout))
// s.conn.SetReadTimeout(time.Now().Add(s.rTimeout))
bufLen
,
err
=
conn
.
read
(
buf
)
bufLen
,
err
=
conn
.
read
(
buf
)
if
err
!=
nil
{
if
err
!=
nil
{
if
ne
rr
,
ok
=
err
.
(
net
.
Error
);
ok
&&
ner
r
.
Timeout
()
{
if
ne
tError
,
ok
=
err
.
(
net
.
Error
);
ok
&&
netErro
r
.
Timeout
()
{
break
break
}
}
log
.
Error
(
"%s, [session.conn.read] = error{%s}"
,
s
.
sessionToken
(),
err
)
log
.
Error
(
"%s, [session.conn.read] = error{%s}"
,
s
.
sessionToken
(),
err
)
...
@@ -620,15 +618,15 @@ func (s *session) handleTCPPackage() error {
...
@@ -620,15 +618,15 @@ func (s *session) handleTCPPackage() error {
// get package from udp packet
// get package from udp packet
func
(
s
*
session
)
handleUDPPackage
()
error
{
func
(
s
*
session
)
handleUDPPackage
()
error
{
var
(
var
(
ok
bool
ok
bool
err
error
err
error
ne
rr
net
.
Error
ne
tError
net
.
Error
conn
*
gettyUDPConn
conn
*
gettyUDPConn
bufLen
int
bufLen
int
buf
[]
byte
buf
[]
byte
addr
*
net
.
UDPAddr
addr
*
net
.
UDPAddr
pkgLen
int
pkgLen
int
pkg
interface
{}
pkg
interface
{}
)
)
conn
=
s
.
Connection
.
(
*
gettyUDPConn
)
conn
=
s
.
Connection
.
(
*
gettyUDPConn
)
...
@@ -643,8 +641,8 @@ func (s *session) handleUDPPackage() error {
...
@@ -643,8 +641,8 @@ func (s *session) handleUDPPackage() error {
}
}
bufLen
,
addr
,
err
=
conn
.
read
(
buf
)
bufLen
,
addr
,
err
=
conn
.
read
(
buf
)
gxlog
.
CInfo
(
"conn.read() = bufLen:%d, addr:%#v, err:%s"
,
bufLen
,
pkgLen
,
err
)
log
.
Debug
(
"conn.read() = bufLen:%d, addr:%#v, err:%s"
,
bufLen
,
pkgLen
,
err
)
if
ne
rr
,
ok
=
err
.
(
net
.
Error
);
ok
&&
ner
r
.
Timeout
()
{
if
ne
tError
,
ok
=
err
.
(
net
.
Error
);
ok
&&
netErro
r
.
Timeout
()
{
continue
continue
}
}
if
err
!=
nil
{
if
err
!=
nil
{
...
@@ -653,7 +651,7 @@ func (s *session) handleUDPPackage() error {
...
@@ -653,7 +651,7 @@ func (s *session) handleUDPPackage() error {
}
}
pkg
,
pkgLen
,
err
=
s
.
reader
.
Read
(
s
,
buf
[
:
bufLen
])
pkg
,
pkgLen
,
err
=
s
.
reader
.
Read
(
s
,
buf
[
:
bufLen
])
gxlog
.
CInfo
(
"s.reader.Read() = pkg:%#v, pkgLen:%d, err:%s"
,
pkg
,
pkgLen
,
err
)
log
.
Debug
(
"s.reader.Read() = pkg:%#v, pkgLen:%d, err:%s"
,
pkg
,
pkgLen
,
err
)
if
err
==
nil
&&
s
.
maxMsgLen
>
0
&&
bufLen
>
int
(
s
.
maxMsgLen
)
{
if
err
==
nil
&&
s
.
maxMsgLen
>
0
&&
bufLen
>
int
(
s
.
maxMsgLen
)
{
err
=
ErrMsgTooLong
err
=
ErrMsgTooLong
}
}
...
@@ -673,7 +671,7 @@ func (s *session) handleWSPackage() error {
...
@@ -673,7 +671,7 @@ func (s *session) handleWSPackage() error {
var
(
var
(
ok
bool
ok
bool
err
error
err
error
ne
rr
net
.
Error
ne
tError
net
.
Error
length
int
length
int
conn
*
gettyWSConn
conn
*
gettyWSConn
pkg
[]
byte
pkg
[]
byte
...
@@ -686,8 +684,7 @@ func (s *session) handleWSPackage() error {
...
@@ -686,8 +684,7 @@ func (s *session) handleWSPackage() error {
break
break
}
}
pkg
,
err
=
conn
.
read
()
pkg
,
err
=
conn
.
read
()
if
nerr
,
ok
=
err
.
(
net
.
Error
);
ok
&&
nerr
.
Timeout
()
{
if
netError
,
ok
=
err
.
(
net
.
Error
);
ok
&&
netError
.
Timeout
()
{
continue
continue
}
}
if
err
!=
nil
{
if
err
!=
nil
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment