summaryrefslogtreecommitdiffstats
path: root/stream/stream_netstream.h
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-01-13 17:22:28 +0100
committerwm4 <wm4@nowhere>2013-01-13 17:32:39 +0100
commit97032f1b58cc4c5c17002939703ee16904691675 (patch)
treec1af3881781fb56a79ad95ece7fe9785e2d9283d /stream/stream_netstream.h
parenta27a494e665a16b55d5a0520c3acc2bdd278e4c8 (diff)
downloadmpv-97032f1b58cc4c5c17002939703ee16904691675.tar.bz2
mpv-97032f1b58cc4c5c17002939703ee16904691675.tar.xz
Remove netstream support
This allowed to move the input stream layer across the network, allowing the user to play anything that mplayer could play remotely. For example, playing a DVD related on a remote server (say, with the host name "remotehost1") could be done by starting the netstream server on that remote server, and then running: mplayer mpst://remotehost1/dvd:// This would open the DVD on the remote host, and transfer the raw DVD sector reads over network. It works the same for other protocols, and all accesses to the stream layer are marshaled over network. It's comparable to the way the cache layer (--cache) works. It has questionable use and most likely was barely used at all. There's lots of potential for breakage, because it doesn't translate the stream CTRLs to network packets. Just get rid of it. The server used to be in TOOLS/netstream.c, and was accidentally removed earlier.
Diffstat (limited to 'stream/stream_netstream.h')
-rw-r--r--stream/stream_netstream.h166
1 files changed, 0 insertions, 166 deletions
diff --git a/stream/stream_netstream.h b/stream/stream_netstream.h
deleted file mode 100644
index 5d219e3a7e..0000000000
--- a/stream/stream_netstream.h
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * Common stuff for netstream
- * Packets and so on are defined here along with a few helpers
- * wich are used by both the client and the server
- *
- * Data is always low endian
- *
- * This file is part of MPlayer.
- *
- * MPlayer 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.
- *
- * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef MPLAYER_NETSTREAM_H
-#define MPLAYER_NETSTREAM_H
-
-#include "config.h"
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#if !HAVE_WINSOCK2_H
-#include <sys/socket.h>
-#endif
-#include "core/mp_msg.h"
-#include "compat/mpbswap.h"
-
-typedef struct mp_net_stream_packet_st {
- uint16_t len;
- uint8_t cmd;
- char data[0];
-} __attribute__ ((packed)) mp_net_stream_packet_t;
-
-#define PACKET_MAX_SIZE 4096
-
-// Commands sent by the client
-#define NET_STREAM_OPEN 0
-// data is the url
-#define NET_STREAM_FILL_BUFFER 1
-// data is an uint16 wich is the max len of the data to return
-#define NET_STREAM_SEEK 3
-// data is an uint64 wich the pos where to seek
-#define NET_STREAM_CLOSE 4
-// no data
-#define NET_STREAM_RESET 5
-// no data
-
-// Server response
-#define NET_STREAM_OK 128
-// Data returned if open is successful
-typedef struct mp_net_stream_opened_st {
- uint32_t file_format;
- uint32_t flags;
- uint32_t sector_size;
- uint64_t start_pos;
- uint64_t end_pos;
-} __attribute__ ((packed)) mp_net_stream_opened_t;
-// FILL_BUFFER return the data
-// CLOSE return nothing
-#define NET_STREAM_ERROR 129
-// Data is the error message (if any ;)
-
-static int net_read(int fd, char* buf, int len) {
- int r = 0;
- while(len) {
- r = recv(fd,buf,len,0);
- if(r <= 0) {
- if(errno == EINTR) continue;
- if(r < 0)
- mp_msg(MSGT_NETST,MSGL_ERR,"Read failed: %s\n",strerror(errno));
- return 0;
- }
- len -= r;
- buf += r;
- }
- return 1;
-}
-
-static mp_net_stream_packet_t* read_packet(int fd) {
- uint16_t len;
- mp_net_stream_packet_t* pack = malloc(sizeof(mp_net_stream_packet_t));
-
- if(!net_read(fd,(char*)pack,sizeof(mp_net_stream_packet_t))) {
- free(pack);
- return NULL;
- }
- pack->len = le2me_16(pack->len);
-
- if(pack->len < sizeof(mp_net_stream_packet_t)) {
- mp_msg(MSGT_NETST,MSGL_WARN,"Got invalid packet (too small: %d)\n",pack->len);
- free(pack);
- return NULL;
- }
- if(pack->len > PACKET_MAX_SIZE) {
- mp_msg(MSGT_NETST,MSGL_WARN,"Got invalid packet (too big: %d)\n",pack->len);
- free(pack);
- return NULL;
- }
- len = pack->len;
- if(len > sizeof(mp_net_stream_packet_t)) {
- pack = realloc(pack,len);
- if(!pack) {
- mp_msg(MSGT_NETST,MSGL_ERR,"Failed to get memory for the packet (%d bytes)\n",len);
- return NULL;
- }
- if(!net_read(fd,pack->data,len - sizeof(mp_net_stream_packet_t)))
- return NULL;
- }
- // printf ("Read packet %d %d %d\n",fd,pack->cmd,pack->len);
- return pack;
-}
-
-static int net_write(int fd, char* buf, int len) {
- int w;
- while(len) {
- w = send(fd,buf,len,DEFAULT_SEND_FLAGS);
- if(w <= 0) {
- if(errno == EINTR) continue;
- if(w < 0)
- mp_msg(MSGT_NETST,MSGL_ERR,"Write failed: %s\n",strerror(errno));
- return 0;
- }
- len -= w;
- buf += w;
- }
- return 1;
-}
-
-static int write_packet(int fd, uint8_t cmd,char* data,int len) {
- mp_net_stream_packet_t* pack = malloc(len + sizeof(mp_net_stream_packet_t));
-
- if(len > 0 && data)
- memcpy(pack->data,data,len);
- pack->len = len + sizeof(mp_net_stream_packet_t);
- pack->cmd = cmd;
-
- // printf("Write packet %d %d (%p) %d\n",fd,cmd,data,len);
- pack->len = le2me_16(pack->len);
- if(net_write(fd,(char*)pack,pack->len)) {
- free(pack);
- return 1;
- }
- free(pack);
- return 0;
-}
-
-static void net_stream_opened_2_me(mp_net_stream_opened_t* o) {
- o->file_format = le2me_32(o->file_format);
- o->flags = le2me_32(o->flags);
- o->sector_size = le2me_32(o->sector_size);
- o->start_pos = le2me_64(o->start_pos);
- o->end_pos = le2me_64(o->end_pos);
-}
-
-#endif /* MPLAYER_NETSTREAM_H */