diff options
| author | pjd <pjd@FreeBSD.org> | 2010-04-29 15:36:32 +0000 |
|---|---|---|
| committer | pjd <pjd@FreeBSD.org> | 2010-04-29 15:36:32 +0000 |
| commit | 0dcf2ac7ada163fca882dcaa5c89ddfcef286bf9 (patch) | |
| tree | 8e157b7fbed074af6570c80464a3a00cc302ae60 /sbin/hastd/token.l | |
| parent | 37a9ab0c6732ace50747a5e47b4eae9c67b72bba (diff) | |
| download | FreeBSD-src-0dcf2ac7ada163fca882dcaa5c89ddfcef286bf9.zip FreeBSD-src-0dcf2ac7ada163fca882dcaa5c89ddfcef286bf9.tar.gz | |
Fix a problem where hastd will stuck in recv(2) after sending request to
secondary, which died between send(2) and recv(2). Do it by adding timeout
to recv(2) for primary incoming and outgoing sockets and secondary outgoing
socket.
Reported by: Mikolaj Golub <to.my.trociny@gmail.com>
Tested by: Mikolaj Golub <to.my.trociny@gmail.com>
MFC after: 3 days
Diffstat (limited to 'sbin/hastd/token.l')
| -rw-r--r-- | sbin/hastd/token.l | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sbin/hastd/token.l b/sbin/hastd/token.l index 7b80384..e5d4ca1 100644 --- a/sbin/hastd/token.l +++ b/sbin/hastd/token.l @@ -48,6 +48,7 @@ control { DP; return CONTROL; } listen { DP; return LISTEN; } port { DP; return PORT; } replication { DP; return REPLICATION; } +timeout { DP; return TIMEOUT; } resource { DP; return RESOURCE; } name { DP; return NAME; } local { DP; return LOCAL; } |
