From 25bc6750e1cb63d4ef123b9e61d3f744edcf72cc Mon Sep 17 00:00:00 2001
From: Ron Pedde <ron@pedde.com>
Date: Mon, 1 Dec 2003 06:55:05 +0000
Subject: [PATCH] Add arbitrary seeking

---
 src/main.c | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/main.c b/src/main.c
index 456c54ae..2859209a 100644
--- a/src/main.c
+++ b/src/main.c
@@ -76,6 +76,9 @@ void daap_handler(WS_CONNINFO *pwsc) {
     int file_fd;
     int session_id=0;
 
+    off_t offset;
+    off_t file_len;
+
     close=pwsc->close;
     pwsc->close=1;  /* in case we have any errors */
     root=NULL;
@@ -203,6 +206,11 @@ void daap_handler(WS_CONNINFO *pwsc) {
 	/* stream out the song */
 	pwsc->close=1;
 
+	if(ws_getrequestheader(pwsc,"range")) { 
+	    offset=atol(ws_getrequestheader(pwsc,"range") + 6);
+	    DPRINTF(ERR_DEBUG,"Thread %d: Skipping to byte %ld\n",pwsc->threadno,offset);
+	}
+
 	pmp3=db_find(item);
 	if(!pmp3) {
 	    ws_returnerror(pwsc,404,"File Not Found");
@@ -217,11 +225,22 @@ void daap_handler(WS_CONNINFO *pwsc) {
 		config_set_status(pwsc,session_id,NULL);
 
 	    } else {
-		ws_writefd(pwsc,"HTTP/1.1 200 OK\r\n");
+		file_len=lseek(file_fd,0,SEEK_END);
+		lseek(file_fd,0,SEEK_SET);
+		file_len -= offset;
+
+		DPRINTF(ERR_DEBUG,"Thread %d: Length of file (remaining) is %ld\n",
+			pwsc->threadno,(long)file_len);
+		ws_addresponseheader(pwsc,"Content-Length","%ld",(long)file_len);
 		ws_addresponseheader(pwsc,"Connection","Close");
+
+		ws_writefd(pwsc,"HTTP/1.1 200 OK\r\n");
 		ws_emitheaders(pwsc);
 
 		config_set_status(pwsc,session_id,"Streaming file '%s'",pmp3->fname);
+		if(offset) {
+		    lseek(file_fd,offset,SEEK_SET);
+		}
 		copyfile(file_fd,pwsc->fd);
 		config_set_status(pwsc,session_id,NULL);
 		r_close(file_fd);