kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-04 11:58:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

chan_sip: Don't send trailing \0 on keep alive packets

Browse Source 
This is a partial fix for ASTERISK~25817 but does not address the
comments regarding RFC 5626.

Change-Id: I227e2d10c0035bbfa1c6e46ae2318fd1122d8420
This commit is contained in:
Sean Bright
2017-12-12 16:28:54 -05:00
parent 28eddc7ea6
commit e1a358a6e4
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
channels/chan_sip.c
View File

@@ -30068,6 +30068,7 @@ static int sip_send_keepalive(const void *data)
struct sip_peer *peer = (struct sip_peer*) data; struct sip_peer *peer = (struct sip_peer*) data;
int res = 0; int res = 0;
const char keepalive[] = "\r\n"; const char keepalive[] = "\r\n";
size_t count = sizeof(keepalive) - 1;
peer->keepalivesend = -1; peer->keepalivesend = -1;
@@ -30078,13 +30079,13 @@ static int sip_send_keepalive(const void *data)
/* Send the packet out using the proper method for this peer */ /* Send the packet out using the proper method for this peer */
if ((peer->socket.fd != -1) && (peer->socket.type == AST_TRANSPORT_UDP)) { if ((peer->socket.fd != -1) && (peer->socket.type == AST_TRANSPORT_UDP)) {
res = ast_sendto(peer->socket.fd, keepalive, sizeof(keepalive), 0, &peer->addr); res = ast_sendto(peer->socket.fd, keepalive, count, 0, &peer->addr);
} else if ((peer->socket.type & (AST_TRANSPORT_TCP | AST_TRANSPORT_TLS)) && } else if ((peer->socket.type & (AST_TRANSPORT_TCP | AST_TRANSPORT_TLS)) &&
(peer->socket.tcptls_session) && (peer->socket.tcptls_session) &&
(peer->socket.tcptls_session->fd != -1)) { (peer->socket.tcptls_session->fd != -1)) {
res = sip_tcptls_write(peer->socket.tcptls_session, keepalive, sizeof(keepalive)); res = sip_tcptls_write(peer->socket.tcptls_session, keepalive, count);
} else if (peer->socket.type == AST_TRANSPORT_UDP) { } else if (peer->socket.type == AST_TRANSPORT_UDP) {
res = ast_sendto(sipsock, keepalive, sizeof(keepalive), 0, &peer->addr); res = ast_sendto(sipsock, keepalive, count, 0, &peer->addr);
} }
if (res == -1) { if (res == -1) {
@@ -30098,7 +30099,7 @@ static int sip_send_keepalive(const void *data)
} }
} }
if (res != sizeof(keepalive)) { if (res != count) {
ast_log(LOG_WARNING, "sip_send_keepalive to %s returned %d: %s\n", ast_sockaddr_stringify(&peer->addr), res, strerror(errno)); ast_log(LOG_WARNING, "sip_send_keepalive to %s returned %d: %s\n", ast_sockaddr_stringify(&peer->addr), res, strerror(errno));
} }