Fix some memleaks

[vlc] / include / network.h

diff --git a/include/network.h b/include/network.h
index d484ba6bcb4fd995b4c92c3f29d7b9e9aeae7130..7463f6e5b1e34780858f7994941d573b3b533f92 100644 (file)
--- a/include/network.h
+++ b/include/network.h
@@ -20,7 +20,7 @@
  *
  * 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.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef __VLC_NETWORK_H
@@ -89,7 +89,7 @@ typedef struct
     char *psz_path;
 
     char *psz_option;
-    
+
     char *psz_buffer; /* to be freed */
 } vlc_url_t;
 
@@ -114,7 +114,7 @@ static inline void vlc_UrlParse( vlc_url_t *url, const char *psz_url,
     url->i_port       = 0;
     url->psz_path     = NULL;
     url->psz_option   = NULL;
-    
+
     if( psz_url == NULL )
     {
         url->psz_buffer = NULL;
@@ -235,7 +235,7 @@ static inline int isurlsafe( int c )
 }
 
 /*****************************************************************************
- * vlc_UrlEncode: 
+ * vlc_UrlEncode:
  *****************************************************************************
  * perform URL encoding
  * (you do NOT want to do URL decoding - it is not reversible - do NOT do it)
@@ -305,46 +305,63 @@ static inline int vlc_UrlIsNotEncoded( const char *psz_url )
  *****************************************************************************/
 static inline char *vlc_b64_encode( char *src )
 {
-    static const char b64[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-                                                                                
-    char *dst = (char *)malloc( strlen( src ) * 4 / 3 + 12 );
-    char *ret = dst;
-    unsigned i_bits = 0;
-    unsigned i_shift = 0;
-                                                                                
-    for( ;; )
+    static const char b64[] =
+           "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+    size_t len = strlen( src );
+
+    char *ret;
+    char *dst = (char *)malloc( ( len + 4 ) * 4 / 3 );
+    if( dst == NULL )
+        return NULL;
+
+    ret = dst;
+
+    while( len > 0 )
     {
-        if( *src )
-        {
-            i_bits = ( i_bits << 8 )|( *src++ );
-            i_shift += 8;
-        }
-        else if( i_shift > 0 )
+        /* pops (up to) 3 bytes of input */
+        uint32_t v = *src++ << 24;
+
+        if( len >= 2 )
         {
-           i_bits <<= 6 - i_shift;
-           i_shift = 6;
+            v |= *src++ << 16;
+            if( len >= 3 )
+                v |= *src++ << 8;
         }
-        else
+
+        /* pushes (up to) 4 bytes of output */
+        while( v )
         {
-            *dst++ = '=';
-            break;
+            *dst++ = b64[v >> 26];
+            v = v << 6;
         }
-                                                                                
-        while( i_shift >= 6 )
+
+        switch( len )
         {
-            i_shift -= 6;
-            *dst++ = b64[(i_bits >> i_shift)&0x3f];
+            case 1:
+                *dst++ = '=';
+                *dst++ = '=';
+                len--;
+                break;
+
+            case 2:
+                *dst++ = '=';
+                len -= 2;
+                break;
+
+            default:
+                len -= 3;
         }
     }
-                                                                                
-    *dst++ = '\0';
-                                                                                
+
+    *dst = '\0';
+
     return ret;
 }
 
 /* Portable networking layer communication */
-#define net_OpenTCP(a, b, c) __net_OpenTCP(VLC_OBJECT(a), b, c)
-VLC_EXPORT( int, __net_OpenTCP, ( vlc_object_t *p_this, const char *psz_host, int i_port ) );
+#define net_ConnectTCP(a, b, c) __net_ConnectTCP(VLC_OBJECT(a), b, c)
+#define net_OpenTCP(a, b, c) __net_ConnectTCP(VLC_OBJECT(a), b, c)
+VLC_EXPORT( int, __net_ConnectTCP, ( vlc_object_t *p_this, const char *psz_host, int i_port ) );
 
 #define net_ListenTCP(a, b, c) __net_ListenTCP(VLC_OBJECT(a), b, c)
 VLC_EXPORT( int *, __net_ListenTCP, ( vlc_object_t *, const char *, int ) );
@@ -352,6 +369,9 @@ VLC_EXPORT( int *, __net_ListenTCP, ( vlc_object_t *, const char *, int ) );
 #define net_Accept(a, b, c) __net_Accept(VLC_OBJECT(a), b, c)
 VLC_EXPORT( int, __net_Accept, ( vlc_object_t *, int *, mtime_t ) );
 
+#define net_ConnectUDP(a, b, c, d ) __net_ConnectUDP(VLC_OBJECT(a), b, c, d)
+VLC_EXPORT( int, __net_ConnectUDP, ( vlc_object_t *p_this, const char *psz_host, int i_port, int hlim ) );
+
 #define net_OpenUDP(a, b, c, d, e ) __net_OpenUDP(VLC_OBJECT(a), b, c, d, e)
 VLC_EXPORT( int, __net_OpenUDP, ( vlc_object_t *p_this, const char *psz_bind, int i_bind, const char *psz_server, int i_server ) );
 
@@ -484,12 +504,6 @@ struct addrinfo
 #  define AI_NUMERICHOST 4
 # endif /* if !HAVE_STRUCT_ADDRINFO */
 
-/*** libidn support ***/
-# ifndef AI_IDN
-#  define AI_IDN      0
-#  define AI_CANONIDN 0
-# endif
-
 VLC_EXPORT( const char *, vlc_gai_strerror, ( int ) );
 VLC_EXPORT( int, vlc_getnameinfo, ( const struct sockaddr *, int, char *, int, int *, int ) );
 VLC_EXPORT( int, vlc_getaddrinfo, ( vlc_object_t *, const char *, int, const struct addrinfo *, struct addrinfo ** ) );
@@ -517,7 +531,7 @@ static inline vlc_bool_t net_AddressIsMulticast( vlc_object_t *p_object, const c
                  psz_addr, vlc_gai_strerror( i ) );
         return VLC_FALSE;
     }
-    
+
     if( res->ai_family == AF_INET )
     {
 #if !defined( SYS_BEOS )
@@ -533,7 +547,7 @@ static inline vlc_bool_t net_AddressIsMulticast( vlc_object_t *p_object, const c
         b_multicast = IN6_IS_ADDR_MULTICAST( &v6->sin6_addr );
     }
 #endif
-    
+
     vlc_freeaddrinfo( res );
     return b_multicast;
 }
@@ -543,7 +557,7 @@ static inline int net_GetSockAddress( int fd, char *address, int *port )
     struct sockaddr_storage addr;
     socklen_t addrlen = sizeof( addr );
 
-    return getpeername( fd, (struct sockaddr *)&addr, &addrlen )
+    return getsockname( fd, (struct sockaddr *)&addr, &addrlen )
         || vlc_getnameinfo( (struct sockaddr *)&addr, addrlen, address,
                             NI_MAXNUMERICHOST, port, NI_NUMERICHOST )
         ? VLC_EGENERIC : 0;