kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-03 19:28:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "res_rtp_asterisk: Add support for sending NACK requests."

Browse Source
This commit is contained in:
George Joseph
2018-07-18 14:46:28 -05:00
committed by Gerrit Code Review
parent c8e4cd8bce 5bacde37a2
commit 85a95b8a29
4 changed files with 902 additions and 352 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
include/asterisk/data_buffer.h
View File

@@ -110,6 +110,35 @@ int ast_data_buffer_put(struct ast_data_buffer *buffer, size_t pos, void *payloa
*/
void *ast_data_buffer_get(const struct ast_data_buffer *buffer, size_t pos);
/*!
* \brief Remove a data payload from the data buffer
*
* \param buffer The data buffer
* \param pos The position of the data payload
*
* \retval non-NULL success
* \retval NULL failure
*
* \note This DOES remove the data payload from the data buffer. It does not free it, though.
*
* \since 15.5.0
*/
void *ast_data_buffer_remove(struct ast_data_buffer *buffer, size_t pos);
/*!
* \brief Remove the first payload from the data buffer
*
* \param buffer The data buffer
*
* \retval non-NULL success
* \retval NULL failure
*
* \note This DOES remove the data payload from the data buffer.
*
* \since 15.5.0
*/
void *ast_data_buffer_remove_head(struct ast_data_buffer *buffer);
/*!
* \brief Free a data buffer (and all held data payloads)
*

54
main/data_buffer.c
View File

@@ -281,6 +281,60 @@ void *ast_data_buffer_get(const struct ast_data_buffer *buffer, size_t pos)
return NULL;
}
static void data_buffer_free_buffer_payload(struct ast_data_buffer *buffer,
struct data_buffer_payload_entry *buffer_payload)
{
buffer_payload->payload = NULL;
buffer->count--;
if (buffer->cache_count < CACHED_PAYLOAD_MAX
&& buffer->cache_count < (buffer->max - buffer->count)) {
AST_LIST_INSERT_TAIL(&buffer->cached_payloads, buffer_payload, list);
buffer->cache_count++;
} else {
ast_free(buffer_payload);
}
}
void *ast_data_buffer_remove(struct ast_data_buffer *buffer, size_t pos)
{
struct data_buffer_payload_entry *buffer_payload;
ast_assert(buffer != NULL);
AST_LIST_TRAVERSE_SAFE_BEGIN(&buffer->payloads, buffer_payload, list) {
if (buffer_payload->pos == pos) {
void *payload = buffer_payload->payload;
AST_LIST_REMOVE_CURRENT(list);
data_buffer_free_buffer_payload(buffer, buffer_payload);
return payload;
}
}
AST_LIST_TRAVERSE_SAFE_END;
return NULL;
}
void *ast_data_buffer_remove_head(struct ast_data_buffer *buffer)
{
ast_assert(buffer != NULL);
if (buffer->count > 0) {
struct data_buffer_payload_entry *buffer_payload;
void *payload;
buffer_payload = AST_LIST_REMOVE_HEAD(&buffer->payloads, list);
payload = buffer_payload->payload;
data_buffer_free_buffer_payload(buffer, buffer_payload);
return payload;
}
return NULL;
}
void ast_data_buffer_free(struct ast_data_buffer *buffer)
{
struct data_buffer_payload_entry *buffer_payload;

1139
res/res_rtp_asterisk.c
View File

File diff suppressed because it is too large Load Diff

32
tests/test_data_buffer.c
View File

@@ -217,6 +217,7 @@ AST_TEST_DEFINE(buffer_resize)
AST_TEST_DEFINE(buffer_nominal)
{
RAII_VAR(struct ast_data_buffer *, buffer, NULL, ast_data_buffer_free_wrapper);
RAII_VAR(struct mock_payload *, removed_payload, NULL, ast_free_ptr);
struct mock_payload *payload;
struct mock_payload *fetched_payload;
int ret;
@@ -247,6 +248,9 @@ AST_TEST_DEFINE(buffer_nominal)
"Failed to allocate memory for payload %d", i);
ret = ast_data_buffer_put(buffer, i, payload);
if (ret) {
ast_free(payload);
}
ast_test_validate(test, ret == 0,
"Failed to add payload %d to buffer", i);
@@ -268,7 +272,11 @@ AST_TEST_DEFINE(buffer_nominal)
ast_test_validate(test, payload != NULL,
"Failed to allocate memory for payload %d", i + BUFFER_MAX_NOMINAL);
payload->id = i;
ret = ast_data_buffer_put(buffer, i + BUFFER_MAX_NOMINAL, payload);
if (ret) {
ast_free(payload);
}
ast_test_validate(test, ret == 0,
"Failed to add payload %d to buffer", i + BUFFER_MAX_NOMINAL);
@@ -289,6 +297,30 @@ AST_TEST_DEFINE(buffer_nominal)
"Failed to get payload at position %d during second loop", i + BUFFER_MAX_NOMINAL);
}
removed_payload = (struct mock_payload *)ast_data_buffer_remove_head(buffer);
ast_test_validate(test, removed_payload != NULL,
"Failed to get the payload at the HEAD of the buffer");
ast_test_validate(test, ast_data_buffer_count(buffer) == BUFFER_MAX_NOMINAL - 1,
"Removing payload from HEAD of buffer did not decrease buffer size");
ast_test_validate(test, removed_payload->id == 1,
"Removing payload from HEAD of buffer did not return expected payload");
ast_free(removed_payload);
removed_payload = (struct mock_payload *)ast_data_buffer_remove(buffer, BUFFER_MAX_NOMINAL * 2);
ast_test_validate(test, removed_payload != NULL,
"Failed to get payload at position %d from buffer", BUFFER_MAX_NOMINAL * 2);
ast_test_validate(test, ast_data_buffer_count(buffer) == BUFFER_MAX_NOMINAL - 2,
"Removing payload from buffer did not decrease buffer size");
ast_test_validate(test, removed_payload->id == BUFFER_MAX_NOMINAL,
"Removing payload from buffer did not return expected payload");
return AST_TEST_PASS;
}