Author: titmuss
Date: Wed Nov 5 06:58:52 2008
New Revision: 3281
URL: http://svn.slimdevices.com?rev=3281&root=Jive&view=rev
Log:
Bug: N/A
Description:
Fix crasher when remote host terminates streaming connection.
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/jive/audio/Playback.lua
7.3/trunk/squeezeplay/src/squeezeplay/src/audio/streambuf.c
7.3/trunk/squeezeplay/src/squeezeplay/src/audio/streambuf.h
Modified: 7.3/trunk/squeezeplay/src/squeezeplay/share/jive/audio/Playback.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/jive/audio/Playback.lua?rev=3281&root=Jive&r1=3280&r2=3281&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/squeezeplay/share/jive/audio/Playback.lua
(original)
+++ 7.3/trunk/squeezeplay/src/squeezeplay/share/jive/audio/Playback.lua Wed Nov
5 06:58:52 2008
@@ -332,7 +332,7 @@
n = self.stream:read(self)
end
- self:_streamDisconnect((n == false) and TCP_CLOSE_FIN or
TCP_CLOSE_LOCAL_RST)
+ self:_streamDisconnect((n == false) and TCP_CLOSE_FIN or
TCP_CLOSE_REMOTE_RST)
end
Modified: 7.3/trunk/squeezeplay/src/squeezeplay/src/audio/streambuf.c
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/src/audio/streambuf.c?rev=3281&root=Jive&r1=3280&r2=3281&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/squeezeplay/src/audio/streambuf.c (original)
+++ 7.3/trunk/squeezeplay/src/squeezeplay/src/audio/streambuf.c Wed Nov 5
06:58:52 2008
@@ -175,8 +175,9 @@
}
-size_t streambuf_feed_fd(int fd) {
- size_t n, size;
+ssize_t streambuf_feed_fd(int fd) {
+ size_t size;
+ ssize_t n;
fifo_lock(&streambuf_fifo);
@@ -484,7 +485,7 @@
u8_t buf[1024];
u8_t *buf_ptr, *body_ptr;
size_t header_len;
- int n;
+ ssize_t n;
/*
* 1: Stream (self)
@@ -521,7 +522,6 @@
return 1;
}
-
/* read buffer, but we must not overflow the stream fifo */
n = streambuf_get_freebytes();
if (n > sizeof(buf)) {
@@ -603,7 +603,8 @@
static int stream_writeL(lua_State *L) {
struct stream *stream;
const char *header;
- int n, len;
+ ssize_t n;
+ size_t len;
/*
* 1: Stream (self)
Modified: 7.3/trunk/squeezeplay/src/squeezeplay/src/audio/streambuf.h
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/src/audio/streambuf.h?rev=3281&root=Jive&r1=3280&r2=3281&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/squeezeplay/src/audio/streambuf.h (original)
+++ 7.3/trunk/squeezeplay/src/squeezeplay/src/audio/streambuf.h Wed Nov 5
06:58:52 2008
@@ -38,7 +38,7 @@
extern void streambuf_feed(u8_t *buf, size_t size);
-extern size_t streambuf_feed_fd(int fd);
+extern ssize_t streambuf_feed_fd(int fd);
extern int streambuf_readL(lua_State *L);
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
