Add a nice_socket_recv convenience function similar to nice_socket_send

2 files changed, 21 insertions, 1 deletions

diff --git a/socket/socket.c b/socket/socket.c
index 8c78a42..a92d2d9 100644
--- a/socket/socket.c
+++ b/socket/socket.c
@@ -195,6 +195,23 @@ nice_socket_send_messages_reliable (NiceSocket *sock, const NiceAddress *to,
   return sock->send_messages_reliable (sock, to, messages, n_messages);
 }
 
+/* Convenience wrapper around nice_socket_recv_messages(). Returns the number of
+ * bytes received on success (which will be @len), zero if sending would block, or
+ * -1 on error. */
+gssize
+nice_socket_recv (NiceSocket *sock, NiceAddress *from, gsize len,
+    gchar *buf)
+{
+  GInputVector local_buf = { buf, len };
+  NiceInputMessage local_message = { &local_buf, 1, from, 0};
+  gint ret;
+
+  ret = sock->recv_messages (sock, &local_message, 1);
+  if (ret == 1)
+    return local_message.length;
+  return ret;
+}
+
 /* Convenience wrapper around nice_socket_send_messages(). Returns the number of
  * bytes sent on success (which will be @len), zero if sending would block, or
  * -1 on error. */
diff --git a/socket/socket.h b/socket/socket.h
index c0b2600..d2aa7af 100644
--- a/socket/socket.h
+++ b/socket/socket.h
@@ -99,7 +99,10 @@ gint
 nice_socket_send_messages_reliable (NiceSocket *sock, const NiceAddress *addr,
     const NiceOutputMessage *messages, guint n_messages);
 gssize
-nice_socket_send (NiceSocket *sock, const NiceAddress *addr, gsize len,
+nice_socket_recv (NiceSocket *sock, NiceAddress *from, gsize len,
+    gchar *buf);
+gssize
+nice_socket_send (NiceSocket *sock, const NiceAddress *to, gsize len,
     const gchar *buf);
 gssize
 nice_socket_send_reliable (NiceSocket *sock, const NiceAddress *addr, gsize len,