Skip to content

Instantly share code, notes, and snippets.

@Vudentz
Created January 10, 2019 16:03
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save Vudentz/eb85c3a3d02b2a9bef74d9d6a110561d to your computer and use it in GitHub Desktop.
Save Vudentz/eb85c3a3d02b2a9bef74d9d6a110561d to your computer and use it in GitHub Desktop.
diff --git a/unit/test-sdp.c b/unit/test-sdp.c
index 5a50cbbf1..66da038cd 100644
--- a/unit/test-sdp.c
+++ b/unit/test-sdp.c
@@ -29,6 +29,7 @@
#include <stdlib.h>
#include <stdbool.h>
#include <sys/socket.h>
+#include <sys/uio.h>
#include <glib.h>
@@ -191,31 +192,23 @@ static gboolean send_pdu(gpointer user_data)
{
struct context *context = user_data;
const struct sdp_pdu *req_pdu;
- uint16_t pdu_len;
- unsigned char *buf;
+ struct iovec iov[2];
ssize_t len;
req_pdu = &context->data->pdu_list[context->pdu_offset];
- pdu_len = req_pdu->raw_size + context->cont_size;
+ iov[0].iov_base = (void *) req_pdu->raw_data;
+ iov[0].iov_len = req_pdu->raw_size;
- buf = g_malloc0(pdu_len);
+ iov[1].iov_base = context->cont_data;
+ iov[1].iov_len = context->cont_size;
- memcpy(buf, req_pdu->raw_data, req_pdu->raw_size);
+ if (context->cont_size && context->cont_size != req_pdu->cont_len)
+ put_be16(req_pdu->cont_len, iov[1].iov_base + 4);
- if (context->cont_size > 0) {
- memcpy(buf + req_pdu->raw_size, context->cont_data,
- context->cont_size);
- if (context->cont_size != req_pdu->cont_len)
- put_be16(req_pdu->cont_len,
- buf + req_pdu->raw_size + 4);
- }
-
- len = write(context->fd, buf, pdu_len);
-
- g_free(buf);
+ len = writev(context->fd, iov, 2);
- g_assert(len == pdu_len);
+ g_assert(len == (ssize_t) (iov[0].iov_len + iov[1].iov_len));
return FALSE;
}
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment