oops forgot to add these
git-svn-id: https://svn.musicpd.org/mpd/trunk@1050 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
parent
48a58073dd
commit
aed844a67d
86
src/inputStream_file.c
Normal file
86
src/inputStream_file.c
Normal file
@ -0,0 +1,86 @@
|
|||||||
|
/* the Music Player Daemon (MPD)
|
||||||
|
* (c)2003-2004 by Warren Dukes (shank@mercury.chem.pitt.edu)
|
||||||
|
* This project's homepage is: http://www.musicpd.org
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation; either version 2 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program; if not, write to the Free Software
|
||||||
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "inputStream_file.h"
|
||||||
|
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <sys/types.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
#include <errno.h>
|
||||||
|
|
||||||
|
int inputStream_fileOpen(InputStream * inStream, char * filename) {
|
||||||
|
FILE * fp;
|
||||||
|
|
||||||
|
fp = fopen(filename,"r");
|
||||||
|
if(!fp) {
|
||||||
|
inStream->error = errno;
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
inStream->offset = 0;
|
||||||
|
|
||||||
|
fseek(fp,0,SEEK_END);
|
||||||
|
inStream->size = ftell(fp);
|
||||||
|
fseek(fp,0,SEEK_SET);
|
||||||
|
|
||||||
|
inStream->data = fp;
|
||||||
|
inStream->seekFunc = inputStream_fileSeek;
|
||||||
|
inStream->closeFunc = inputStream_fileClose;
|
||||||
|
inStream->readFunc = inputStream_fileRead;
|
||||||
|
inStream->atEOFFunc = inputStream_fileAtEOF;
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
int inputStream_fileSeek(InputStream * inStream, long offset, int whence) {
|
||||||
|
if(fseek((FILE *)inStream->data,offset,whence)==0) {
|
||||||
|
inStream->offset = ftell((FILE *)inStream->data);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
inStream->error = errno;
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
size_t inputStream_fileRead(InputStream * inStream, void * ptr, size_t size,
|
||||||
|
size_t nmemb)
|
||||||
|
{
|
||||||
|
size_t readSize;
|
||||||
|
|
||||||
|
readSize = fread(ptr,size,nmemb,(FILE *)inStream->data);
|
||||||
|
|
||||||
|
if(readSize>0) inStream->offset+=readSize;
|
||||||
|
|
||||||
|
return readSize;
|
||||||
|
}
|
||||||
|
|
||||||
|
int inputStream_fileClose(InputStream * inStream) {
|
||||||
|
if(fclose((FILE *)inStream->data)<0) {
|
||||||
|
inStream->error = errno;
|
||||||
|
}
|
||||||
|
else return -1;
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
int inputStream_fileAtEOF(InputStream * inStream) {
|
||||||
|
return feof((FILE *)inStream->data);
|
||||||
|
}
|
||||||
|
/* vim:set shiftwidth=4 tabstop=8 expandtab: */
|
36
src/inputStream_file.h
Normal file
36
src/inputStream_file.h
Normal file
@ -0,0 +1,36 @@
|
|||||||
|
/* the Music Player Daemon (MPD)
|
||||||
|
* (c)2003-2004 by Warren Dukes (shank@mercury.chem.pitt.edu)
|
||||||
|
* This project's homepage is: http://www.musicpd.org
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation; either version 2 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program; if not, write to the Free Software
|
||||||
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef INPUT_STREAM_FILE_H
|
||||||
|
#define INPUT_STREAM_FILE_H
|
||||||
|
|
||||||
|
#include "inputStream.h"
|
||||||
|
|
||||||
|
int inputStream_fileOpen(InputStream * inStream, char * filename);
|
||||||
|
|
||||||
|
int inputStream_fileSeek(InputStream * inStream, long offset, int whence);
|
||||||
|
|
||||||
|
size_t inputStream_fileRead(InputStream * inStream, void * ptr, size_t size,
|
||||||
|
size_t nmemb);
|
||||||
|
|
||||||
|
int inputStream_fileClose(InputStream * inStream);
|
||||||
|
|
||||||
|
int inputStream_fileAtEOF(InputStream * inStream);
|
||||||
|
|
||||||
|
#endif
|
||||||
|
/* vim:set shiftwidth=8 tabstop=8 expandtab: */
|
507
src/inputStream_http.c
Normal file
507
src/inputStream_http.c
Normal file
@ -0,0 +1,507 @@
|
|||||||
|
/* the Music Player Daemon (MPD)
|
||||||
|
* (c)2003-2004 by Warren Dukes (shank@mercury.chem.pitt.edu)
|
||||||
|
* This project's homepage is: http://www.musicpd.org
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation; either version 2 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program; if not, write to the Free Software
|
||||||
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "inputStream_http.h"
|
||||||
|
|
||||||
|
#include "utils.h"
|
||||||
|
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <sys/types.h>
|
||||||
|
#include <sys/socket.h>
|
||||||
|
#include <netdb.h>
|
||||||
|
#include <sys/param.h>
|
||||||
|
#include <netinet/in.h>
|
||||||
|
#include <arpa/inet.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
#include <errno.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <string.h>
|
||||||
|
#include <fcntl.h>
|
||||||
|
|
||||||
|
#define HTTP_CONN_STATE_CLOSED 0
|
||||||
|
#define HTTP_CONN_STATE_INIT 1
|
||||||
|
#define HTTP_CONN_STATE_HELLO 2
|
||||||
|
#define HTTP_CONN_STATE_OPEN 3
|
||||||
|
#define HTTP_CONN_STATE_REOPEN 4
|
||||||
|
|
||||||
|
#define HTTP_BUFFER_SIZE 524289
|
||||||
|
|
||||||
|
#define HTTP_REDIRECT_MAX 10
|
||||||
|
|
||||||
|
typedef struct _InputStreemHTTPData {
|
||||||
|
char * host;
|
||||||
|
char * path;
|
||||||
|
int port;
|
||||||
|
int sock;
|
||||||
|
int connState;
|
||||||
|
char buffer[HTTP_BUFFER_SIZE];
|
||||||
|
int buflen;
|
||||||
|
int canSeek;
|
||||||
|
int timesRedirected;
|
||||||
|
int icyMetaint;
|
||||||
|
} InputStreamHTTPData;
|
||||||
|
|
||||||
|
static InputStreamHTTPData * newInputStreamHTTPData() {
|
||||||
|
InputStreamHTTPData * ret = malloc(sizeof(InputStreamHTTPData));
|
||||||
|
|
||||||
|
ret->host = NULL;
|
||||||
|
ret->path = NULL;
|
||||||
|
ret->port = 80;
|
||||||
|
ret->connState = HTTP_CONN_STATE_CLOSED;
|
||||||
|
ret->canSeek = 0;
|
||||||
|
ret->timesRedirected = 0;
|
||||||
|
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void freeInputStreamHTTPData(InputStreamHTTPData * data) {
|
||||||
|
if(data->host) free(data->host);
|
||||||
|
if(data->path) free(data->path);
|
||||||
|
|
||||||
|
free(data);
|
||||||
|
}
|
||||||
|
|
||||||
|
static int parseUrl(InputStreamHTTPData * data, char * url) {
|
||||||
|
char * temp;
|
||||||
|
char * colon;
|
||||||
|
char * slash;
|
||||||
|
int len;
|
||||||
|
|
||||||
|
if(strncmp("http://",url,strlen("http://"))!=0) return -1;
|
||||||
|
|
||||||
|
temp = url+strlen("http://");
|
||||||
|
|
||||||
|
slash = strchr(temp, '/');
|
||||||
|
colon = strchr(temp, ':');
|
||||||
|
|
||||||
|
if(slash && colon && slash <= colon) return -1;
|
||||||
|
|
||||||
|
/* fetch the host portion */
|
||||||
|
if(colon) len = colon-temp+1;
|
||||||
|
else if(slash) len = slash-temp+1;
|
||||||
|
else len = strlen(temp)+1;
|
||||||
|
|
||||||
|
if(len<=1) return -1;
|
||||||
|
|
||||||
|
data->host = malloc(len);
|
||||||
|
strncpy(data->host,temp,len-1);
|
||||||
|
data->host[len-1] = '\0';
|
||||||
|
|
||||||
|
/* fetch the port */
|
||||||
|
if(colon && (!slash || slash != colon+1)) {
|
||||||
|
char * test;
|
||||||
|
data->port = strtol(colon+1,&test,10);
|
||||||
|
|
||||||
|
if(data->port <= 0 || (*test != '\0' && *test != '/')) {
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* fetch the path */
|
||||||
|
data->path = strdup(slash ? slash : "/");
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int initHTTPConnection(InputStream * inStream) {
|
||||||
|
struct hostent * he;
|
||||||
|
struct sockaddr * dest;
|
||||||
|
socklen_t destlen;
|
||||||
|
struct sockaddr_in sin;
|
||||||
|
InputStreamHTTPData * data = (InputStreamHTTPData *)inStream->data;
|
||||||
|
int flags;
|
||||||
|
int ret;
|
||||||
|
#ifdef HAVE_IPV6
|
||||||
|
struct sockaddr_in6 sin6;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
if(!(he = gethostbyname(data->host))) {
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
memset(&sin,0,sizeof(struct sockaddr_in));
|
||||||
|
sin.sin_family = AF_INET;
|
||||||
|
sin.sin_port = htons(data->port);
|
||||||
|
#ifdef HAVE_IPV6
|
||||||
|
memset(&sin6,0,sizeof(struct sockaddr_in6));
|
||||||
|
sin6.sin6_family = AF_INET6;
|
||||||
|
sin6.sin6_port = sin.sin_port;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
switch(he->h_addrtype) {
|
||||||
|
case AF_INET:
|
||||||
|
memcpy((char *)&sin.sin_addr.s_addr,(char *)he->h_addr,
|
||||||
|
he->h_length);
|
||||||
|
dest = (struct sockaddr *)&sin;
|
||||||
|
destlen = sizeof(struct sockaddr_in);
|
||||||
|
break;
|
||||||
|
#ifdef HAVE_IPV6
|
||||||
|
case AF_INET6:
|
||||||
|
if(!ipv6Supported()) {
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
memcpy((char *)&sin6.sin6_addr.s6_addr,(char *)he->h_addr,
|
||||||
|
he->h_length);
|
||||||
|
dest = (struct sockaddr *)&sin6;
|
||||||
|
destlen = sizeof(struct sockaddr_in6);
|
||||||
|
break;
|
||||||
|
#endif
|
||||||
|
default:
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
if((data->sock = socket(dest->sa_family,SOCK_STREAM,0)) < 0) {
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
flags = fcntl(data->sock, F_GETFL, 0);
|
||||||
|
fcntl(data->sock, F_SETFL, flags | O_NONBLOCK);
|
||||||
|
|
||||||
|
ret = connect(data->sock,dest,destlen);
|
||||||
|
if(ret < 0 && errno!=EINPROGRESS) {
|
||||||
|
close(data->sock);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
data->connState = HTTP_CONN_STATE_INIT;
|
||||||
|
|
||||||
|
data->buflen = 0;
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int finishHTTPInit(InputStream * inStream) {
|
||||||
|
InputStreamHTTPData * data = (InputStreamHTTPData *)inStream->data;
|
||||||
|
struct timeval tv;
|
||||||
|
fd_set writeSet;
|
||||||
|
fd_set errorSet;
|
||||||
|
int error;
|
||||||
|
int error_len = sizeof(int);
|
||||||
|
int ret;
|
||||||
|
char request[2049];
|
||||||
|
|
||||||
|
tv.tv_sec = 0;
|
||||||
|
tv.tv_usec = 0;
|
||||||
|
|
||||||
|
FD_ZERO(&writeSet);
|
||||||
|
FD_ZERO(&errorSet);
|
||||||
|
FD_SET(data->sock, &writeSet);
|
||||||
|
FD_SET(data->sock, &errorSet);
|
||||||
|
|
||||||
|
ret = select(data->sock+1, NULL, &writeSet, &errorSet, &tv);
|
||||||
|
|
||||||
|
if(ret == 0 || (ret < 0 && errno==EINTR)) return 0;
|
||||||
|
|
||||||
|
if(ret < 0) {
|
||||||
|
close(data->sock);
|
||||||
|
data->connState = HTTP_CONN_STATE_CLOSED;
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
getsockopt(data->sock, SOL_SOCKET, SO_ERROR, &error, &error_len);
|
||||||
|
if(error) {
|
||||||
|
close(data->sock);
|
||||||
|
data->connState = HTTP_CONN_STATE_CLOSED;
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
memset(request, 0, 2048);
|
||||||
|
snprintf(request, 2048, "GET %s HTTP/1.1\r\n"
|
||||||
|
"Host: %s\r\n"
|
||||||
|
"Connection: close\r\n"
|
||||||
|
"User-Agent: %s/%s\r\n"
|
||||||
|
"Range: bytes=%ld-\r\n"
|
||||||
|
"Icy-Metadata:1\r\n"
|
||||||
|
"\r\n",
|
||||||
|
data->path, data->host, "httpTest", "0.0.0",
|
||||||
|
inStream->offset);
|
||||||
|
|
||||||
|
ret = write(data->sock, request, strlen(request));
|
||||||
|
if(ret!=strlen(request)) {
|
||||||
|
close(data->sock);
|
||||||
|
data->connState = HTTP_CONN_STATE_CLOSED;
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
data->connState = HTTP_CONN_STATE_HELLO;
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int getHTTPHello(InputStream * inStream) {
|
||||||
|
InputStreamHTTPData * data = (InputStreamHTTPData *)inStream->data;
|
||||||
|
fd_set readSet;
|
||||||
|
struct timeval tv;
|
||||||
|
int ret;
|
||||||
|
char * needle;
|
||||||
|
char * cur = data->buffer;
|
||||||
|
int rc;
|
||||||
|
int readed;
|
||||||
|
|
||||||
|
FD_ZERO(&readSet);
|
||||||
|
FD_SET(data->sock, &readSet);
|
||||||
|
|
||||||
|
tv.tv_sec = 0;
|
||||||
|
tv.tv_usec = 0;
|
||||||
|
|
||||||
|
ret = select(data->sock+1,&readSet,NULL,NULL,&tv);
|
||||||
|
|
||||||
|
if(ret == 0 || (ret < 0 && errno==EINTR)) return 0;
|
||||||
|
|
||||||
|
if(ret < 0) {
|
||||||
|
data->connState = HTTP_CONN_STATE_CLOSED;
|
||||||
|
close(data->sock);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(data->buflen >= HTTP_BUFFER_SIZE-1) {
|
||||||
|
data->connState = HTTP_CONN_STATE_CLOSED;
|
||||||
|
close(data->sock);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
readed = recv(data->sock, data->buffer+data->buflen,
|
||||||
|
HTTP_BUFFER_SIZE-1-data->buflen, 0);
|
||||||
|
|
||||||
|
if(readed < 0 && (errno == EAGAIN || errno == EINTR)) return 0;
|
||||||
|
|
||||||
|
if(readed <= 0) {
|
||||||
|
data->connState = HTTP_CONN_STATE_CLOSED;
|
||||||
|
close(data->sock);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
data->buffer[data->buflen+readed] = '\0';
|
||||||
|
data->buflen += readed;
|
||||||
|
|
||||||
|
needle = strstr(data->buffer,"\r\n\r\n");
|
||||||
|
|
||||||
|
if(!needle) return 0;
|
||||||
|
|
||||||
|
if(0 == strncmp(cur, "HTTP/1.0 ", 9)) {
|
||||||
|
data->canSeek = 0;
|
||||||
|
rc = atoi(cur+9);
|
||||||
|
}
|
||||||
|
else if(0 == strncmp(cur, "HTTP/1.1 ", 9)) {
|
||||||
|
data->canSeek = 1;
|
||||||
|
rc = atoi(cur+9);
|
||||||
|
}
|
||||||
|
else if(0 == strncmp(cur, "ICY 200 OK", 10)) {
|
||||||
|
data->canSeek = 0;
|
||||||
|
rc = 200;
|
||||||
|
}
|
||||||
|
else if(0 == strncmp(cur, "ICY 400 Server Full", 19)) rc = 400;
|
||||||
|
else if(0 == strncmp(cur, "ICY 404", 7)) rc = 404;
|
||||||
|
else {
|
||||||
|
close(data->sock);
|
||||||
|
data->connState = HTTP_CONN_STATE_CLOSED;
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
switch(rc) {
|
||||||
|
case 200:
|
||||||
|
case 206:
|
||||||
|
break;
|
||||||
|
case 301:
|
||||||
|
case 302:
|
||||||
|
cur = strstr(cur, "Location: ");
|
||||||
|
if(cur) {
|
||||||
|
char * url;
|
||||||
|
int curlen = 0;
|
||||||
|
cur+= strlen("Location: ");
|
||||||
|
while(*(cur+curlen)!='\0' && *(cur+curlen)!='\r') {
|
||||||
|
curlen++;
|
||||||
|
}
|
||||||
|
url = malloc(curlen+1);
|
||||||
|
memcpy(url,cur,curlen);
|
||||||
|
url[curlen] = '\0';
|
||||||
|
ret = parseUrl(data,url);
|
||||||
|
free(url);
|
||||||
|
if(ret == 0 && data->timesRedirected <
|
||||||
|
HTTP_REDIRECT_MAX)
|
||||||
|
{
|
||||||
|
data->timesRedirected++;
|
||||||
|
close(data->sock);
|
||||||
|
data->connState = HTTP_CONN_STATE_REOPEN;
|
||||||
|
data->buflen = 0;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
case 404:
|
||||||
|
case 400:
|
||||||
|
case 401:
|
||||||
|
default:
|
||||||
|
close(data->sock);
|
||||||
|
data->connState = HTTP_CONN_STATE_CLOSED;
|
||||||
|
data->buflen = 0;
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
cur = strstr(data->buffer, "\r\nContent-Length: ");
|
||||||
|
if(cur) {
|
||||||
|
if(!inStream->size) inStream->size = atol(cur+18);
|
||||||
|
}
|
||||||
|
else data->canSeek = 0;
|
||||||
|
|
||||||
|
cur = strstr(data->buffer, "\r\nicy-metaint:");
|
||||||
|
if(cur) {
|
||||||
|
data->icyMetaint = atoi(cur+14);
|
||||||
|
}
|
||||||
|
else data->icyMetaint = 0;
|
||||||
|
|
||||||
|
needle += 4; /* 4 == strlen("\r\n\r\n") */
|
||||||
|
memmove(data->buffer, needle, data->buffer+data->buflen-needle);
|
||||||
|
data->buflen -= data->buffer+data->buflen-needle;
|
||||||
|
|
||||||
|
data->connState = HTTP_CONN_STATE_OPEN;
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
int inputStream_httpOpen(InputStream * inStream, char * url) {
|
||||||
|
InputStreamHTTPData * data = newInputStreamHTTPData();
|
||||||
|
|
||||||
|
inStream->data = data;
|
||||||
|
|
||||||
|
if(parseUrl(data,url) < 0) {
|
||||||
|
freeInputStreamHTTPData(data);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(initHTTPConnection(inStream) < 0) {
|
||||||
|
freeInputStreamHTTPData(data);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
inStream->seekFunc = inputStream_httpSeek;
|
||||||
|
inStream->closeFunc = inputStream_httpClose;
|
||||||
|
inStream->readFunc = inputStream_httpRead;
|
||||||
|
inStream->atEOFFunc = inputStream_httpAtEOF;
|
||||||
|
|
||||||
|
inStream->offset = 0;
|
||||||
|
inStream->size = 0;
|
||||||
|
inStream->error = 0;
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
int inputStream_httpSeek(InputStream * inStream, long offset, int whence) {
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
size_t inputStream_httpRead(InputStream * inStream, void * ptr, size_t size,
|
||||||
|
size_t nmemb)
|
||||||
|
{
|
||||||
|
InputStreamHTTPData * data = (InputStreamHTTPData *)inStream->data;
|
||||||
|
int readed = 0;
|
||||||
|
int inlen = size*nmemb;
|
||||||
|
fd_set readSet;
|
||||||
|
struct timeval tv;
|
||||||
|
int ret;
|
||||||
|
|
||||||
|
if(data->connState == HTTP_CONN_STATE_REOPEN) {
|
||||||
|
if(initHTTPConnection(inStream) < 0) return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(data->connState == HTTP_CONN_STATE_INIT) {
|
||||||
|
if(finishHTTPInit(inStream) < 0) return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(data->connState == HTTP_CONN_STATE_HELLO) {
|
||||||
|
if(getHTTPHello(inStream) < 0) return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
switch(data->connState) {
|
||||||
|
case HTTP_CONN_STATE_OPEN:
|
||||||
|
case HTTP_CONN_STATE_CLOSED:
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(data->connState == HTTP_CONN_STATE_OPEN &&
|
||||||
|
data->buflen < HTTP_BUFFER_SIZE-1)
|
||||||
|
{
|
||||||
|
FD_ZERO(&readSet);
|
||||||
|
FD_SET(data->sock, &readSet);
|
||||||
|
|
||||||
|
tv.tv_sec = 0;
|
||||||
|
tv.tv_usec = 0;
|
||||||
|
|
||||||
|
ret = select(data->sock+1,&readSet,NULL,NULL,&tv);
|
||||||
|
if(ret == 0 || (ret < 0 && errno == EINTR)) ret = 0;
|
||||||
|
else if(ret < 0) {
|
||||||
|
data->connState = HTTP_CONN_STATE_CLOSED;
|
||||||
|
close(data->sock);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(ret == 1) {
|
||||||
|
readed = recv(data->sock,
|
||||||
|
data->buffer+data->buflen,
|
||||||
|
HTTP_BUFFER_SIZE-1-data->buflen, 0);
|
||||||
|
|
||||||
|
if(readed < 0 && (errno == EAGAIN ||
|
||||||
|
errno == EINTR))
|
||||||
|
{
|
||||||
|
readed = 0;
|
||||||
|
}
|
||||||
|
else if(readed <= 0) {
|
||||||
|
close(data->sock);
|
||||||
|
data->connState = HTTP_CONN_STATE_CLOSED;
|
||||||
|
}
|
||||||
|
else data->buflen += readed;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
readed = inlen > data->buflen ? data->buflen : inlen;
|
||||||
|
|
||||||
|
memcpy(ptr, data->buffer, readed);
|
||||||
|
data->buflen -= readed;
|
||||||
|
memmove(data->buffer, data->buffer+readed, data->buflen);
|
||||||
|
|
||||||
|
inStream->offset = readed;
|
||||||
|
|
||||||
|
return readed;
|
||||||
|
}
|
||||||
|
|
||||||
|
int inputStream_httpClose(InputStream * inStream) {
|
||||||
|
InputStreamHTTPData * data = (InputStreamHTTPData *)inStream->data;
|
||||||
|
|
||||||
|
switch(data->connState) {
|
||||||
|
case HTTP_CONN_STATE_CLOSED:
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
close(data->sock);
|
||||||
|
}
|
||||||
|
|
||||||
|
freeInputStreamHTTPData(data);
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
int inputStream_httpAtEOF(InputStream * inStream) {
|
||||||
|
InputStreamHTTPData * data = (InputStreamHTTPData *)inStream->data;
|
||||||
|
switch(data->connState) {
|
||||||
|
case HTTP_CONN_STATE_CLOSED:
|
||||||
|
if(data->buflen == 0) return 1;
|
||||||
|
default:
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
/* vim:set shiftwidth=8 tabstop=8 expandtab: */
|
36
src/inputStream_http.h
Normal file
36
src/inputStream_http.h
Normal file
@ -0,0 +1,36 @@
|
|||||||
|
/* the Music Player Daemon (MPD)
|
||||||
|
* (c)2003-2004 by Warren Dukes (shank@mercury.chem.pitt.edu)
|
||||||
|
* This project's homepage is: http://www.musicpd.org
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation; either version 2 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program; if not, write to the Free Software
|
||||||
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef INPUT_STREAM_HTTP_H
|
||||||
|
#define INPUT_STREAM_HTTP_H
|
||||||
|
|
||||||
|
#include "inputStream.h"
|
||||||
|
|
||||||
|
int inputStream_httpOpen(InputStream * inStream, char * filename);
|
||||||
|
|
||||||
|
int inputStream_httpSeek(InputStream * inStream, long offset, int whence);
|
||||||
|
|
||||||
|
size_t inputStream_httpRead(InputStream * inStream, void * ptr, size_t size,
|
||||||
|
size_t nmemb);
|
||||||
|
|
||||||
|
int inputStream_httpClose(InputStream * inStream);
|
||||||
|
|
||||||
|
int inputStream_httpAtEOF(InputStream * inStream);
|
||||||
|
|
||||||
|
#endif
|
||||||
|
/* vim:set shiftwidth=8 tabstop=8 expandtab: */
|
Loading…
x
Reference in New Issue
Block a user