kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-12-01 02:31:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

res_audiosocket: fix temporarily unavailable

Browse Source 
Operations on non-blocking sockets may return a resource temporarily unavailable error (EAGAIN or EWOULDBLOCK). This is not a fatal error but a normal condition indicating that the operation would block.

This patch corrects the handling of this case. Instead of incorrectly treating it as a reason to terminate the connection, the code now waits for data to arrive on the socket.
This commit is contained in:
Roman Pertsev
2025-10-07 12:49:12 +03:00
parent b9c71dd40d
commit 797902effc
1 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
res/res_audiosocket.c
View File

@@ -297,10 +297,29 @@ struct ast_frame *ast_audiosocket_receive_frame_with_hangup(const int svc,
*hangup = 0; *hangup = 0;
} }
n = read(svc, &header, 3); while (i < 3) {
if (n == -1) { n = read(svc, header, 3);
ast_log(LOG_WARNING, "Failed to read header from AudioSocket because: %s\n", strerror(errno)); if (n == -1) {
return NULL; if (errno == EAGAIN || errno == EWOULDBLOCK) {
int poll_result = ast_wait_for_input(svc, 5);
if (poll_result == 1) {
continue;
} else if (poll_result == 0) {
ast_debug(1, "Poll timed out while waiting for header data\n");
continue;
} else {
ast_log(LOG_WARNING, "Poll error: %s\n", strerror(errno));
}
}
ast_log(LOG_ERROR, "Failed to read header from AudioSocket because: %s\n", strerror(errno));
return NULL;
}
if (n == 0) {
break;
}
i += n;
} }
if (n == 0 || *kind == AST_AUDIOSOCKET_KIND_HANGUP) { if (n == 0 || *kind == AST_AUDIOSOCKET_KIND_HANGUP) {