[xiph-commits] r7262 - in icecast/trunk/libshout: include/shout src

[brendan at dactyl.lonelymoon.com]

Author: brendan
Date: Thu Jul 22 17:52:34 2004
New Revision: 7262

Modified:
icecast/trunk/libshout/include/shout/shout.h.in
icecast/trunk/libshout/src/shout.c
icecast/trunk/libshout/src/shout_private.h
Log:
Non-blocking I/O, in progress (don't use)


Modified: icecast/trunk/libshout/include/shout/shout.h.in
===================================================================
--- icecast/trunk/libshout/include/shout/shout.h.in	2004-07-22 20:22:57 UTC (rev 7261)
+++ icecast/trunk/libshout/include/shout/shout.h.in	2004-07-23 00:52:31 UTC (rev 7262)
@@ -37,6 +37,8 @@
#define SHOUTERR_UNCONNECTED	(-8)
#define SHOUTERR_UNSUPPORTED	(-9)

+#define SHOUTERR_BUSY		(-10)
+
#define SHOUT_FORMAT_OGG	(0)
#define SHOUT_FORMAT_MP3	(1)
/* backward-compatibility alias */

Modified: icecast/trunk/libshout/src/shout.c
===================================================================
--- icecast/trunk/libshout/src/shout.c	2004-07-22 20:22:57 UTC (rev 7261)
+++ icecast/trunk/libshout/src/shout.c	2004-07-23 00:52:31 UTC (rev 7262)
@@ -38,6 +38,10 @@
#include "util.h"

/* -- local prototypes -- */
+static int queue_data(shout_t *self, const unsigned char *data, size_t len);
+static int queue_str(shout_t *self, const char *str);
+static int try_write (shout_t *self, const void *data, size_t len);
+
static int login_xaudiocast(shout_t *self);
static int login_icy(shout_t *self);
static int login_http_basic(shout_t *self);
@@ -754,8 +758,92 @@

/* -- static function definitions -- */

-static int send_http_request(shout_t *self, char *username, char *password)
+/* queue data in pages of SHOUT_BUFSIZE bytes */
+static int queue_data(shout_t *self, const unsigned char *data, size_t len)
{
+	shout_buf_t *buf;
+	size_t plen;
+
+	if (!len)
+		return SHOUTERR_SUCCESS;
+
+	if (!self->queue) {
+		self->queue = calloc(1, sizeof (shout_buf_t));
+		if (! self->queue)
+			return SHOUTERR_MALLOC;
+	}
+
+	for (buf = self->queue; buf->next; buf = buf->next);
+
+	/* Maybe any added data should be freed if we hit a malloc error?
+	 * Otherwise it'd be impossible to tell where to start requeueing.
+	 * (As if anyone ever tried to recover from a malloc error.) */
+	while (len > 0) {
+		if (buf->len == SHOUT_BUFSIZE) {
+			buf->next = calloc(1, sizeof (shout_buf_t));
+			if (! buf->next)
+				return SHOUTERR_MALLOC;
+			buf = buf->next;
+		}
+
+		plen = len > SHOUT_BUFSIZE - buf->len ? SHOUT_BUFSIZE - buf->len : len;
+		memcpy (buf->data + buf->len, data, plen);
+		buf->len += plen;
+		len -= plen;
+	}
+
+	return SHOUTERR_SUCCESS;
+}
+
+static int queue_str(shout_t *self, const char *str)
+{
+	return queue_data(self, str, strlen(str));
+}
+
+static int try_write (shout_t *self, const void *data, size_t len)
+{
+    int ret = sock_write_bytes (self->socket, data, len);
+
+    if (ret < 0)
+    {
+        if (sock_recoverable (sock_error()))
+        {
+            self->error = SHOUTERR_BUSY;
+            return 0;
+        }
+        self->error = SHOUTERR_SOCKET;
+    }
+    return ret;
+}
+
+static int send_queue(shout_t *self)
+{
+	shout_buf_t *buf;
+	int ret;
+
+	if (!self->queue)
+		return 0;
+
+	buf = self->queue;
+	while (buf) {
+		ret = try_write (self, buf + buf->pos, buf->len - buf->pos);
+		if (ret < 0)
+			return self->error;
+
+		buf->pos += ret;
+		if (buf->pos == buf->len) {
+			self->queue = buf->next;
+			free(buf);
+			buf = self->queue;
+		} else /* incomplete write */
+			return SHOUTERR_SUCCESS;
+	}
+
+	return self->error = SHOUTERR_SUCCESS;
+}
+
+static int send_http_request(shout_t *self)
+{
char *auth;
char *ai;

@@ -861,10 +949,10 @@
}

#if 0
-	if(send_http_request(self, NULL, NULL) != 0) {
+	if(send_http_request(self) != 0) {
#else
/* assume we'll have to authenticate, saves round trips on basic */
-	if(send_http_request(self, self->user, self->password) != 0) {
+	if(send_http_request(self) != 0) {
#endif
return self->error = SHOUTERR_SOCKET;
}

Modified: icecast/trunk/libshout/src/shout_private.h
===================================================================
--- icecast/trunk/libshout/src/shout_private.h	2004-07-22 20:22:57 UTC (rev 7261)
+++ icecast/trunk/libshout/src/shout_private.h	2004-07-23 00:52:31 UTC (rev 7262)
@@ -1,3 +1,4 @@
+/* -*- c-basic-offset: 8; -*- */
/* shout.h: Private libshout data structures and declarations
*
* $Id$
@@ -29,6 +30,16 @@
#define LIBSHOUT_DEFAULT_USER "source"
#define LIBSHOUT_DEFAULT_USERAGENT "libshout/" VERSION

+#define SHOUT_BUFSIZE 4096
+
+typedef struct _shout_buf {
+	unsigned char data[SHOUT_BUFSIZE];
+	unsigned int len;
+	unsigned int pos;
+
+	struct _shout_buf *next;
+} shout_buf_t;
+
struct shout {
/* hostname or IP of icecast server */
char *host;
@@ -71,6 +82,8 @@
int (*send)(shout_t* self, const unsigned char* buff, size_t len);
void (*close)(shout_t* self);

+	shout_buf_t *queue;
+
/* start of this period's timeclock */
uint64_t starttime;
/* amout of data we've sent (in milliseconds) */