mirror of
https://github.com/VDR4Arch/vdr.git
synced 2023-10-10 13:36:52 +02:00
Fixed a hanging SVDRP connection if the client dies without issuing QUIT
This commit is contained in:
parent
497183cd73
commit
1930e13961
1
HISTORY
1
HISTORY
@ -551,3 +551,4 @@ Video Disk Recorder Revision History
|
|||||||
- Fixed handling the "Green" button in the "Schedules" menu for channels that
|
- Fixed handling the "Green" button in the "Schedules" menu for channels that
|
||||||
have a second audio PID.
|
have a second audio PID.
|
||||||
- Fixed high system load when displaying a still picture in replay.
|
- Fixed high system load when displaying a still picture in replay.
|
||||||
|
- Fixed a hanging SVDRP connection if the client dies without issuing QUIT.
|
||||||
|
6
svdrp.c
6
svdrp.c
@ -10,7 +10,7 @@
|
|||||||
* and interact with the Video Disk Recorder - or write a full featured
|
* and interact with the Video Disk Recorder - or write a full featured
|
||||||
* graphical interface that sits on top of an SVDRP connection.
|
* graphical interface that sits on top of an SVDRP connection.
|
||||||
*
|
*
|
||||||
* $Id: svdrp.c 1.18 2001/04/01 16:06:54 kls Exp $
|
* $Id: svdrp.c 1.19 2001/07/14 09:45:55 kls Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define _GNU_SOURCE
|
#define _GNU_SOURCE
|
||||||
@ -955,9 +955,11 @@ void cSVDRP::Process(void)
|
|||||||
}
|
}
|
||||||
lastActivity = time(NULL);
|
lastActivity = time(NULL);
|
||||||
}
|
}
|
||||||
else if (r < 0)
|
else if (r <= 0) {
|
||||||
|
isyslog(LOG_INFO, "lost connection to SVDRP client");
|
||||||
Close();
|
Close();
|
||||||
}
|
}
|
||||||
|
}
|
||||||
else if (Setup.SVDRPTimeout && time(NULL) - lastActivity > Setup.SVDRPTimeout) {
|
else if (Setup.SVDRPTimeout && time(NULL) - lastActivity > Setup.SVDRPTimeout) {
|
||||||
isyslog(LOG_INFO, "timeout on SVDRP connection");
|
isyslog(LOG_INFO, "timeout on SVDRP connection");
|
||||||
Close(true);
|
Close(true);
|
||||||
|
Loading…
Reference in New Issue
Block a user