summaryrefslogtreecommitdiffstats
path: root/TOOLS
diff options
context:
space:
mode:
authoralbeu <albeu@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-04-06 18:16:11 +0000
committeralbeu <albeu@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-04-06 18:16:11 +0000
commit42ce6511351061cb3ec870eb6f31d435f22e672d (patch)
tree64e13d3a025a2f13947eb9b56712e1b96ec991ad /TOOLS
parent73257ca2757e45a60ea5012e742b63fedd357ac2 (diff)
downloadmpv-42ce6511351061cb3ec870eb6f31d435f22e672d.tar.bz2
mpv-42ce6511351061cb3ec870eb6f31d435f22e672d.tar.xz
It should now be endian aware. Untested as i only have le box :(
Would be cool if someone with a be,le network could test. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9864 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'TOOLS')
-rw-r--r--TOOLS/netstream/netstream.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/TOOLS/netstream/netstream.c b/TOOLS/netstream/netstream.c
index 6191f613d9..a79def31bf 100644
--- a/TOOLS/netstream/netstream.c
+++ b/TOOLS/netstream/netstream.c
@@ -36,6 +36,7 @@
#include <libmpdemux/stream.h>
#include <mp_msg.h>
+#include <bswap.h>
/// Netstream packets def and some helpers
#include <libmpdemux/netstream.h>
@@ -79,6 +80,7 @@ static int net_stream_open(client_t* cl,char* url) {
ret.sector_size = cl->stream->sector_size;
ret.start_pos = cl->stream->start_pos;
ret.end_pos = cl->stream->end_pos;
+ net_stream_opened_2_me(&ret);
if(!write_packet(cl->fd,NET_STREAM_OK,(char*)&ret,sizeof(mp_net_stream_opened_t)))
return 0;
@@ -102,8 +104,8 @@ static int net_stream_fill_buffer(client_t* cl,uint16_t max_len) {
pack = malloc(max_len + sizeof(mp_net_stream_packet_t));
pack->cmd = NET_STREAM_OK;
r = stream_read(cl->stream,pack->data,max_len);
- pack->len = r + sizeof(mp_net_stream_packet_t);
- if(!net_write(cl->fd,(char*)pack,pack->len)) {
+ pack->len = le2me_16(r + sizeof(mp_net_stream_packet_t));
+ if(!net_write(cl->fd,(char*)pack,le2me_16(pack->len))) {
free(pack);
return 0;
}
@@ -173,13 +175,13 @@ int handle_client(client_t* cl,mp_net_stream_packet_t* pack) {
mp_msg(MSGT_NETST,MSGL_WARN,"Got invalid fill buffer packet\n");
return 0;
}
- return net_stream_fill_buffer(cl,*((uint16_t*)pack->data));
+ return net_stream_fill_buffer(cl,le2me_16(*((uint16_t*)pack->data)));
case NET_STREAM_SEEK:
if(pack->len != sizeof(mp_net_stream_packet_t) + 8) {
mp_msg(MSGT_NETST,MSGL_WARN,"Got invalid fill buffer packet\n");
return 0;
}
- return net_stream_seek(cl,*((uint64_t*)pack->data));
+ return net_stream_seek(cl,le2me_64(*((uint64_t*)pack->data)));
case NET_STREAM_RESET:
return net_stream_reset(cl);
case NET_STREAM_CLOSE: