* network.h: interface to communicate with network plug-ins
*****************************************************************************
* Copyright (C) 2002 VideoLAN
- * $Id: network.h,v 1.5 2003/11/07 17:44:43 fenrir Exp $
+ * $Id: network.h,v 1.6 2004/01/05 14:10:58 fenrir Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Laurent Aimar <fenrir@via.ecp.fr>
url->psz_option = NULL;
}
+#define net_OpenTCP(a, b, c) __net_OpenTCP(VLC_OBJECT(a), b, c)
+VLC_EXPORT( int, __net_OpenTCP, ( vlc_object_t *p_this, char *psz_host, int i_port ) );
+
+VLC_EXPORT( void, net_Close, ( int fd ) );
+
+#define net_Read(a,b,c,d,e) __net_Read(VLC_OBJECT(a),b,c,d,e)
+VLC_EXPORT( int, __net_Read, ( vlc_object_t *p_this, int fd, uint8_t *p_data, int i_data, vlc_bool_t b_retry ) );
+
+#define net_Write(a,b,c,d) __net_Write(VLC_OBJECT(a),b,c,d)
+VLC_EXPORT( int, __net_Write, ( vlc_object_t *p_this, int fd, uint8_t *p_data, int i_data ) );
+
+#define net_Gets(a,b) __net_Gets(VLC_OBJECT(a),b)
+VLC_EXPORT( char *, __net_Gets, ( vlc_object_t *p_this, int fd ) );
+
+VLC_EXPORT( int, net_Printf, ( vlc_object_t *p_this, int fd, char *psz_fmt, ... ) );
+
--- /dev/null
+/*****************************************************************************
+ * net.c:
+ *****************************************************************************
+ * Copyright (C) 2004 VideoLAN
+ * $Id: net.c,v 1.1 2004/01/05 14:10:58 fenrir Exp $
+ *
+ * Authors: Laurent Aimar <fenrir@videolan.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, USA.
+ *****************************************************************************/
+
+/*****************************************************************************
+ * Preamble
+ *****************************************************************************/
+#include <stdlib.h>
+#include <vlc/vlc.h>
+
+#ifdef HAVE_ERRNO_H
+# include <errno.h>
+#endif
+
+#ifdef HAVE_FCNTL_H
+# include <fcntl.h>
+#endif
+
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
+
+#if defined( UNDER_CE )
+# include <winsock.h>
+#elif defined( WIN32 )
+# include <winsock2.h>
+# include <ws2tcpip.h>
+# ifndef IN_MULTICAST
+# define IN_MULTICAST(a) IN_CLASSD(a)
+# endif
+#else
+# include <sys/socket.h>
+#endif
+
+#include <unistd.h>
+#include "network.h"
+
+
+/*****************************************************************************
+ * vsprintf_m:
+ *****************************************************************************
+ * do like vsprintf but auto allocated memory
+ * XXX: should be move elsewhere (under vlc_vasprintf)
+ *****************************************************************************/
+static char *vsprintf_m( const char *fmt, va_list args )
+{
+ /* Guess we need no more than 100 bytes. */
+ int i_size = 100;
+ char *p = malloc( i_size );
+ int n;
+
+ if( p == NULL )
+ {
+ return NULL;
+ }
+
+ for( ;; )
+ {
+ /* Try to print in the allocated space. */
+ n = vsnprintf( p, i_size, fmt, args );
+
+ /* If that worked, return the string. */
+ if (n > -1 && n < i_size)
+ {
+ return p;
+ }
+ /* Else try again with more space. */
+ if (n > -1) /* glibc 2.1 */
+ {
+ i_size = n+1; /* precisely what is needed */
+ }
+ else /* glibc 2.0 */
+ {
+ i_size *= 2; /* twice the old size */
+ }
+ if( (p = realloc( p, i_size ) ) == NULL)
+ {
+ return NULL;
+ }
+ }
+}
+
+
+/*****************************************************************************
+ * __net_OpenTCP:
+ *****************************************************************************
+ * Open a TCP connection and return a handle
+ *****************************************************************************/
+int __net_OpenTCP( vlc_object_t *p_this, char *psz_host, int i_port )
+{
+ vlc_value_t val;
+ void *private;
+
+ char *psz_network = "";
+ network_socket_t sock;
+ module_t *p_network;
+
+
+ /* Check if we have force ipv4 or ipv6 */
+ var_Create( p_this, "ipv4", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
+ var_Get( p_this, "ipv4", &val );
+ if( val.b_bool )
+ {
+ psz_network = "ipv4";
+ }
+
+ var_Create( p_this, "ipv6", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
+ var_Get( p_this, "ipv6", &val );
+ if( val.b_bool )
+ {
+ psz_network = "ipv6";
+ }
+
+ /* Prepare the network_socket_t structure */
+ sock.i_type = NETWORK_TCP;
+ sock.psz_bind_addr = "";
+ sock.i_bind_port = 0;
+ sock.psz_server_addr = psz_host;
+ sock.i_server_port = i_port;
+ sock.i_ttl = 0;
+
+ msg_Dbg( p_this, "net: connecting to '%s:%d'", psz_host, i_port );
+ private = p_this->p_private;
+ p_this->p_private = (void*)&sock;
+ if( ( p_network = module_Need( p_this, "network", psz_network ) ) == NULL )
+ {
+ msg_Dbg( p_this, "net: connection to '%s:%d' failed", psz_host, i_port );
+ return -1;
+ }
+ module_Unneed( p_this, p_network );
+ p_this->p_private = private;
+
+ return sock.i_handle;
+}
+
+/*****************************************************************************
+ * __net_Close:
+ *****************************************************************************
+ * Close a network handle
+ *****************************************************************************/
+void net_Close( int fd )
+{
+#ifdef UNDER_CE
+ CloseHandle( (HANDLE)fd );
+#elif defined( WIN32 )
+ closesocket( fd );
+#else
+ close( fd );
+#endif
+}
+
+/*****************************************************************************
+ * __net_Read:
+ *****************************************************************************
+ * Read from a network socket
+ * If b_rety is true, then we repeat until we have read the right amount of
+ * data
+ *****************************************************************************/
+int __net_Read( vlc_object_t *p_this, int fd, uint8_t *p_data, int i_data, vlc_bool_t b_retry )
+{
+ struct timeval timeout;
+ fd_set fds;
+ int i_recv;
+ int i_total = 0;
+ int i_ret;
+
+ while( i_data > 0 )
+ {
+ do
+ {
+ if( p_this->b_die || p_this->b_error )
+ {
+ return 0;
+ }
+
+ /* Initialize file descriptor set */
+ FD_ZERO( &fds );
+ FD_SET( fd, &fds );
+
+ /* We'll wait 0.5 second if nothing happens */
+ timeout.tv_sec = 0;
+ timeout.tv_usec = 500000;
+ } while( ( i_ret = select( fd + 1, &fds, NULL, NULL, &timeout )) == 0 ||
+ ( i_ret < 0 && errno == EINTR ) );
+
+ if( i_ret < 0 )
+ {
+ msg_Err( p_this, "network select error (%s)", strerror(errno) );
+ return i_total > 0 ? i_total : -1;
+ }
+
+ if( ( i_recv = recv( fd, p_data, i_data, 0 ) ) < 0 )
+ {
+ msg_Err( p_this, "recv failed (%s)", strerror(errno) );
+ return i_total > 0 ? i_total : -1;
+ }
+
+ p_data += i_recv;
+ i_data -= i_recv;
+ i_total+= i_recv;
+ if( !b_retry )
+ {
+ break;
+ }
+ }
+ return i_total;
+}
+
+/* Write exact amount requested */
+int __net_Write( vlc_object_t *p_this, int fd, uint8_t *p_data, int i_data )
+{
+ struct timeval timeout;
+ fd_set fds;
+ int i_send;
+ int i_total = 0;
+ int i_ret;
+
+ while( i_data > 0 )
+ {
+ do
+ {
+ if( p_this->b_die || p_this->b_error )
+ {
+ return 0;
+ }
+
+ /* Initialize file descriptor set */
+ FD_ZERO( &fds );
+ FD_SET( fd, &fds );
+
+ /* We'll wait 0.5 second if nothing happens */
+ timeout.tv_sec = 0;
+ timeout.tv_usec = 500000;
+ } while( ( i_ret = select( fd + 1, NULL, &fds, NULL, &timeout )) == 0 ||
+ ( i_ret < 0 && errno == EINTR ) );
+
+ if( i_ret < 0 )
+ {
+ msg_Err( p_this, "network select error (%s)", strerror(errno) );
+ return i_total > 0 ? i_total : -1;
+ }
+
+ if( ( i_send = send( fd, p_data, i_data, 0 ) ) < 0 )
+ {
+ msg_Err( p_this, "recv failed (%s)", strerror(errno) );
+ return i_total > 0 ? i_total : -1;
+ }
+
+ p_data += i_send;
+ i_data -= i_send;
+ i_total+= i_send;
+ }
+ return i_total;
+}
+
+char *__net_Gets( vlc_object_t *p_this, int fd )
+{
+ char *psz_line = malloc( 1024 );
+ int i_line = 0;
+ int i_max = 1024;
+
+
+ for( ;; )
+ {
+ if( net_Read( p_this, fd, &psz_line[i_line], 1, VLC_TRUE ) != 1 )
+ {
+ break;
+ }
+ if( psz_line[i_line] == '\n' || psz_line[i_line] == '\r' )
+ {
+ break;
+ }
+
+ i_line++;
+
+ if( i_line >= i_max )
+ {
+ i_max += 1024;
+ psz_line = realloc( psz_line, i_max );
+ }
+ }
+
+ if( i_line <= 0 )
+ {
+ free( psz_line );
+ return NULL;
+ }
+
+ while( i_line >= 0 &&
+ ( psz_line[i_line] == '\n' || psz_line[i_line] == '\r' ) )
+ {
+ psz_line[i_line] = '\0';
+ i_line--;
+ }
+ return psz_line;
+}
+
+int net_Printf( vlc_object_t *p_this, int fd, char *psz_fmt, ... )
+{
+ va_list args;
+ char *psz;
+ int i_size;
+
+ va_start( args, psz_fmt );
+ psz = vsprintf_m( psz_fmt, args );
+ va_end( args );
+
+ i_size = strlen( psz );
+
+ return __net_Write( p_this, fd, psz, i_size ) < i_size ? -1 : i_size;
+}
+
+
+
projects / vlc / commitdiff