Commit 5ea5076a authored by Sam Hocevar's avatar Sam Hocevar

  * Fixed MacOS X 10.1 network input, thanks to Mathias Kretschmer
    <mathias@research.att.com>.
parent 3e5f531b
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* decoders. * decoders.
***************************************************************************** *****************************************************************************
* Copyright (C) 1998, 1999, 2000 VideoLAN * Copyright (C) 1998, 1999, 2000 VideoLAN
* $Id: input.c,v 1.155 2001/11/13 16:00:54 sam Exp $ * $Id: input.c,v 1.156 2001/11/15 18:50:49 sam Exp $
* *
* Authors: Christophe Massiot <massiot@via.ecp.fr> * Authors: Christophe Massiot <massiot@via.ecp.fr>
* *
...@@ -865,11 +865,8 @@ static void NetworkOpen( input_thread_t * p_input ) ...@@ -865,11 +865,8 @@ static void NetworkOpen( input_thread_t * p_input )
if( setsockopt( p_input->i_handle, SOL_SOCKET, SO_RCVBUF, if( setsockopt( p_input->i_handle, SOL_SOCKET, SO_RCVBUF,
(void *) &i_opt, sizeof( i_opt ) ) == -1 ) (void *) &i_opt, sizeof( i_opt ) ) == -1 )
{ {
intf_ErrMsg( "input error: can't configure socket (SO_RCVBUF: %s)", intf_WarnMsg( 1, "input error: can't configure socket (SO_RCVBUF: %s)",
strerror(errno)); strerror(errno));
close( p_input->i_handle );
p_input->b_error = 1;
return;
} }
/* Check if we really got what we have asked for, because Linux, etc. /* Check if we really got what we have asked for, because Linux, etc.
...@@ -880,17 +877,13 @@ static void NetworkOpen( input_thread_t * p_input ) ...@@ -880,17 +877,13 @@ static void NetworkOpen( input_thread_t * p_input )
if( getsockopt( p_input->i_handle, SOL_SOCKET, SO_RCVBUF, if( getsockopt( p_input->i_handle, SOL_SOCKET, SO_RCVBUF,
(void*) &i_opt, &i_opt_size ) == -1 ) (void*) &i_opt, &i_opt_size ) == -1 )
{ {
intf_ErrMsg( "input error: can't configure socket (SO_RCVBUF: %s)", intf_WarnMsg( 1, "input error: can't query socket (SO_RCVBUF: %s)",
strerror(errno)); strerror(errno));
close( p_input->i_handle );
p_input->b_error = 1;
return;
} }
else if( i_opt < 0x80000 )
if( i_opt < 0x80000 )
{ {
intf_WarnMsg( 1, "input warning: socket receive buffer size just 0x%x" intf_WarnMsg( 1, "input warning: socket buffer size is 0x%x"
" instead of 0x%x bytes.", i_opt, 0x80000 ); " instead of 0x%x", i_opt, 0x80000 );
} }
/* Build the local socket */ /* Build the local socket */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment