Changeset 395cdfc1a82b88656241df8bc894d12d8995e63c

Timestamp:

27/05/04 01:15:07 (5 years ago)

Author:

Derk-Jan Hartman <hartman@videolan.org>

git-committer:

Derk-Jan Hartman <hartman@videolan.org> 1085613307 +0000

git-parent:

[56bafe479173d1c136aebf949c177e4c51230679]

git-author:

Derk-Jan Hartman <hartman@videolan.org> 1085613307 +0000

Message:

* misc/sap.c: check for packetsize attribute and increase mtu when it's large.

• some code cleanup. Please watch coding style people.
  

* demux/sgimb.c: fix an alloc

Files:

• modules/demux/sgimb.c (modified) (1 diff)
• modules/misc/sap.c (modified) (27 diffs)

modules/demux/sgimb.c

@@ -329 +329 @@
-    if( p_sys->i_packet_size && p_sys->psz_mcast_ip )
-    {
- = (char *) malloc( 20 )
+
-        p_sys->i_packet_size += 1000;
-sprintf( 
+asprintf( &
-        playlist_ItemAddOption( p_item, psz_option );
-        free( psz_option );

modules/misc/sap.c

@@ -85 +85 @@
- * Module descriptor
- *****************************************************************************/
-"SAP multicast address"
-"SAP multicast address"
-"IPv4-SAP listening"
+ "SAP multicast address" 
+ "SAP multicast address" 
+ "IPv4-SAP listening" 
-#define SAP_IPV4_LONGTEXT N_( \
-
-
-
-
-"IPv6 SAP scope"
+ 
+ 
+ 
+ 
+ "IPv6 SAP scope" 
-#define SAP_SCOPE_LONGTEXT N_( \
-
-"SAP timeout (seconds)"
+ 
+ "SAP timeout (seconds)" 
-#define SAP_TIMEOUT_LONGTEXT N_( \
-       "Sets the time before SAP items get deleted if no new announce " \
-
-"Try to parse the SAP"
+ 
+ "Try to parse the SAP" 
-#define SAP_PARSE_LONGTEXT N_( \
-       "When SAP can it will try to parse the SAP. Normal behavior is " \
@@ -114 +114 @@
-                SAP_ADDR_TEXT, SAP_ADDR_LONGTEXT, VLC_TRUE );
-    add_bool( "sap-ipv4", 1 , NULL,
-
+ 
-    add_bool( "sap-ipv6", 0 , NULL,
-
+ 
-    add_string( "sap-ipv6-scope", "8" , NULL,
-                SAP_SCOPE_TEXT, SAP_SCOPE_LONGTEXT, VLC_TRUE);
-    add_integer( "sap-timeout", 1800, NULL,
-
+ 
-    add_bool( "sap-parse", 1 , NULL,
-
+ 
-
-    set_capability( "interface", 0 );
@@ -198 +198 @@
-
-#ifdef HAVE_ZLIB_H
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-#endif
@@ -243 +247 @@
-static int Open( vlc_object_t *p_this )
-{
-intf_thread_t*
+ intf_thread_t* 
-    intf_sys_t    *p_sys  = malloc( sizeof( intf_sys_t ) );
-
-    playlist_t          *p_playlist;
-
-p_intf,"sap-timeout"
+ p_intf,"sap-timeout" 
-    p_sys->fd[0] = -1;
-    p_sys->fd[1] = -1;
@@ -268 +272 @@
-        sock.i_server_port     = 0;
-        sock.i_ttl             = 0;
-void*
+ void* 
-
-        p_network = module_Need( p_intf, "network", "ipv4", VLC_TRUE );
@@ -348 +352 @@
-static void Close( vlc_object_t *p_this )
-{
-intf_thread_t*
+ intf_thread_t* 
-    intf_sys_t    *p_sys  = p_intf->p_sys;
-    int i;
@@ -387 +391 @@
-    uint8_t    *p_end;
-    
-
-500000);    
+ 
+ 500000 );
-
-    /* read SAP packets */
@@ -410 +414 @@
-        {
-           struct sap_announce_t *p_announce;
-mtime_t)
+ mtime_t ) 
-           if( mdate() - p_intf->p_sys->pp_announces[i]->i_last > i_timeout )
-           {
-
-
-
+ 
+ 
+ 
-
-               /* Remove the playlist item */
@@ -463 +467 @@
-        if( i_version != 1 )
-        {
-Warn
+Dbg
-        }
-        i_address_type = buffer[0] & 0x10;
@@ -469 +473 @@
-        if( b_reserved != 0 )
-        {
-Warn
+Dbg
-        }
-        b_message_type = buffer[0] & 0x04;
-        if( b_message_type != 0 )
-        {
-Warn
+Dbg
-        }
-        b_encrypted = buffer[0] & 0x02;
-        if( b_encrypted )
-        {
-Warn
+Dbg
-        }
-        b_compressed = buffer[0] & 0x01;
@@ -494 +498 @@
-        {
-#ifdef HAVE_ZLIB_H
-
+
+
-            if( i_decompressed_size > 0 && i_decompressed_size < MAX_SAP_BUFFER )
-            {
@@ -542 +547 @@
-static void cfield_parse( char *psz_cfield, char **ppsz_uri )
-{
-
-    char *psz_pos;
-    if( psz_cfield )
@@ -573 +577 @@
-
-    return;
-
-}
-
@@ -668 +671 @@
-        for( i = 0 ; i< p_intf->p_sys->i_announces ; i++ )
-        {
-
-
+ 
+ 
-            {
-                p_intf->p_sys->pp_announces[i]->i_last = mdate();
-psz_uri
+ psz_uri 
-                return;
-            }
@@ -688 +691 @@
-
-        /* Remember it */
-struct sap_announce_t *
-struct sap_announce_t
+ struct sap_announce_t * 
+ struct sap_announce_t 
-        if( p_sd->psz_sessionname )
-        {
@@ -724 +727 @@
-    {
-        int i_group = p_intf->p_sys->i_group;
+        int i_packetsize = config_GetInt( p_intf, "mtu" );
-
-        /* Build what we have to put in psz_item_uri, with the m and
@@ -758 +762 @@
-        for( i = 0 ; i< p_sd->i_attributes ; i++ )
-        {
-!strcasecmp( p_sd->pp_attributes[i]->psz_field , "type"
-
+ !strcasecmp( p_sd->pp_attributes[i]->psz_field , "type" 
+ 
-            {
-                b_http = VLC_TRUE;
-            }
-!strcasecmp( p_sd->pp_attributes[i]->psz_field , "http-path")
+ !strcasecmp( p_sd->pp_attributes[i]->psz_field , "http-path" ) 
-            {
-                psz_http_path = strdup(  p_sd->pp_attributes[i]->psz_value );
-            }
-!strcasecmp( p_sd->pp_attributes[i]->psz_field , "plgroup")
+ !strcasecmp( p_sd->pp_attributes[i]->psz_field , "plgroup" ) 
-            {
-                int i_group_id;
@@ -779 +783 @@
-
-                i_group_id = playlist_GroupToId( p_playlist,
-
+ 
-                if( i_group_id != 0 )
-                {
@@ -788 +792 @@
-                    playlist_group_t *p_group =
-                            playlist_CreateGroup( p_playlist,
-
+ 
-                    i_group = p_group->i_id;
-                }
-                vlc_object_release( p_playlist );
-            }
+            if( !strcasecmp( p_sd->pp_attributes[i]->psz_field , "packetsize" ) )
+            {
+                i_packetsize = strtol( p_sd->pp_attributes[i]->psz_value, NULL, 10 );
+            }
-        }
-
@@ -798 +806 @@
-        if( b_http == VLC_FALSE )
-        {
-            psz_item_uri = malloc( strlen( psz_proto ) + strlen( psz_uri ) +
-                                 strlen( psz_port ) + 7 );
-            if( ismult( psz_uri ) )
-            {
-sprintf( 
+asprintf( &
-                         psz_proto, psz_uri, psz_port );
-            }
-            else
-            {
-sprintf( 
+asprintf( &
-                         psz_proto, psz_uri, psz_port );
-            }
@@ -859 +865 @@
-
-                    /* Change the name in the item */
-
-
-
+
+
+
+
+
+
+
+
-
-                    /* Update the stored name */
@@ -879 +890 @@
-        p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
-                                      FIND_ANYWHERE );
-
-
-
-
+
+
+
-        if( p_item )
-        {
-            vlc_mutex_lock( &p_item->input.lock );
-            playlist_ItemSetGroup( p_item, i_group );
-
+
+
+
+
+
+
+
+
-        }
-
-        /* Then remember it */
-        p_announce = (struct sap_announce_t *)malloc(
-struct sap_announce_t
+ struct sap_announce_t 
-        if(  p_sd->psz_sessionname )
-        {
@@ -935 +951 @@
-    if( p_packet[0] != 'v' || p_packet[1] != '=' )
-    {
-p_intf, "bad SDP packet"
+ p_intf, "bad SDP packet" 
-        return NULL;
-    }
@@ -963 +979 @@
-            psz_end = p_packet + strlen( p_packet );
-        }
-
+ 
-        {
-            psz_end--;
@@ -976 +992 @@
-        if( p_packet[1] != '=' )
-        {
-
+ 
-            free_sd( sd );
-            return NULL;
@@ -1101 +1117 @@
-}
-
-
-
-/*****************************************************************************
-
+Net
- *****************************************************************************
-
+
+
+
- *****************************************************************************/
-static ssize_t NetRead( intf_thread_t *p_intf,
@@ -1120 +1136 @@
-
-    /* Initialize file descriptor set */
+
-    FD_ZERO( &fds );
-    if( fd[0] > 0 ) FD_SET( fd[0], &fds );