diff options
author | albeu <albeu@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-04-06 18:16:11 +0000 |
---|---|---|
committer | albeu <albeu@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-04-06 18:16:11 +0000 |
commit | 42ce6511351061cb3ec870eb6f31d435f22e672d (patch) | |
tree | 64e13d3a025a2f13947eb9b56712e1b96ec991ad /libmpdemux | |
parent | 73257ca2757e45a60ea5012e742b63fedd357ac2 (diff) | |
download | mpv-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 'libmpdemux')
-rw-r--r-- | libmpdemux/netstream.h | 14 | ||||
-rw-r--r-- | libmpdemux/stream_netstream.c | 7 |
2 files changed, 18 insertions, 3 deletions
diff --git a/libmpdemux/netstream.h b/libmpdemux/netstream.h index ade6ee4092..b505027b02 100644 --- a/libmpdemux/netstream.h +++ b/libmpdemux/netstream.h @@ -3,6 +3,8 @@ * 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 */ typedef struct mp_net_stream_packet_st { @@ -64,7 +66,8 @@ static mp_net_stream_packet_t* read_packet(int fd) { 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); @@ -113,6 +116,7 @@ static int write_packet(int fd, uint8_t cmd,char* data,int len) { 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; @@ -120,3 +124,11 @@ static int write_packet(int fd, uint8_t cmd,char* data,int len) { 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); +} diff --git a/libmpdemux/stream_netstream.c b/libmpdemux/stream_netstream.c index 1f21b5f6af..eb4888e89e 100644 --- a/libmpdemux/stream_netstream.c +++ b/libmpdemux/stream_netstream.c @@ -57,6 +57,7 @@ #include "help_mp.h" #include "../m_option.h" #include "../m_struct.h" +#include "../bswap.h" #include "netstream.h" @@ -158,7 +159,7 @@ static mp_net_stream_packet_t* send_net_stream_cmd(stream_t *s,uint16_t cmd,char } static int fill_buffer(stream_t *s, char* buffer, int max_len){ - uint16_t len = max_len; + uint16_t len = le2me_16(max_len); mp_net_stream_packet_t* pack; pack = send_net_stream_cmd(s,NET_STREAM_FILL_BUFFER,(char*)&len,2); @@ -179,7 +180,7 @@ static int fill_buffer(stream_t *s, char* buffer, int max_len){ static int seek(stream_t *s,off_t newpos) { - uint64_t pos = (uint64_t)newpos; + uint64_t pos = le2me_64((uint64_t)newpos); mp_net_stream_packet_t* pack; pack = send_net_stream_cmd(s,NET_STREAM_SEEK,(char*)&pos,8); @@ -259,6 +260,8 @@ static int open_s(stream_t *stream,int mode, void* opts, int* file_format) { } opened = (mp_net_stream_opened_t*)pack->data; + net_stream_opened_2_me(opened); + *file_format = opened->file_format; stream->flags = opened->flags; stream->sector_size = opened->sector_size; |