Changeset 5c8acc49f87cb734a2d072cf1b3f5c0f067b5ade

Timestamp:

27/07/05 18:30:19 (3 years ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1122481819 +0000

git-parent:

[0f55beac49400edec7c44f7a178976641a0770bf]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1122481819 +0000

Message:

Put correct owner address in SAP-generated SDP

Files:

• include/stream_output.h (modified) (2 diffs)
• include/vlc_symbols.h (modified) (1 diff)
• modules/stream_out/standard.c (modified) (1 diff)
• src/stream_output/announce.c (modified) (2 diffs)
• src/stream_output/sap.c (modified) (12 diffs)

include/stream_output.h

@@ -258 +258 @@
-{
-    int i_type;
-
-    /* For SAP */
-    char *psz_address; /* If we use a custom address */
-};
-
@@ -292 +289 @@
-    int i_current_session;
-
-,announce_method_t*
+
-    int (*pf_del)  ( sap_handler_t*, session_descriptor_t *);
-

include/vlc_symbols.h

@@ -93 +93 @@
-    int * (*__net_ListenTCP_inner) (vlc_object_t *, const char *, int);
-    int (*__net_Accept_inner) (vlc_object_t *, int *, mtime_t);
-har *psz_bind, int i_bind,
+onst char *psz_bind, int i_bind, const
-    void (*net_Close_inner) (int fd);
-    int (*__net_Read_inner) (vlc_object_t *p_this, int fd, v_socket_t *, uint8_t *p_data, int i_data, vlc_bool_t b_retry);

modules/stream_out/standard.c

@@ -362 +362 @@
-        vlc_UrlClean( &url );
-
-        /* FIXME: Free p_method */
-        if( p_method->psz_address) free( p_method->psz_address );
-        free( p_method );
-    }

src/stream_output/announce.c

@@ -200 +200 @@
-
-    p_method = (announce_method_t *)malloc( sizeof(announce_method_t) );
-
-
-
-
-
-
-
-
+
+
+
+
-    return p_method;
-}
@@ -287 +283 @@
-        /* this will set p_session->p_sap for later deletion */
-        msg_Dbg( p_announce, "adding SAP session");
-, p_method
+
-    }
-    else if( p_method->i_type == METHOD_TYPE_SLP )

src/stream_output/sap.c

@@ -66 +66 @@
-{
-    char *psz_address;
+    char psz_machine[NI_MAXNUMERICHOST];
-    int i_port;
-    int i_rfd; /* Read socket */
@@ -84 +85 @@
-static void RunThread( vlc_object_t *p_this);
-static int CalculateRate( sap_handler_t *p_sap, sap_address_t *p_address );
-
+
+
+
-
-static int announce_SendSAPAnnounce( sap_handler_t *p_sap,
@@ -91 +94 @@
-
-static int announce_SAPAnnounceAdd( sap_handler_t *p_sap,
-
-
+
-
-static int announce_SAPAnnounceDel( sap_handler_t *p_sap,
@@ -126 +128 @@
-    free( psz_charset );
-    if( p_sap->iconvHandle == (vlc_iconv_t)(-1) )
-    {
-        msg_Warn( p_sap, "Unable to do requested conversion" );
-    }
-
-    p_sap->pf_add = announce_SAPAnnounceAdd;
@@ -253 +253 @@
-/* Add a SAP announce */
-static int announce_SAPAnnounceAdd( sap_handler_t *p_sap,
-
-
+
-{
-    int i;
-
+onst c
-    int i_header_size;
-    char *psz_head;
-found = VLC_FALSE, b_
+
-    sap_session_t *p_sap_session;
-    mtime_t i_hash;
+    char psz_buf[NI_MAXNUMERICHOST], *ptr;
+    const char *psz_addr;
+    struct addrinfo hints, *res;
+        
-
-    vlc_mutex_lock( &p_sap->object_lock );
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-        else
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-    }
-    else
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    /* XXX: Check for dupes */
-    p_sap_session = (sap_session_t*)malloc(sizeof(sap_session_t));
-
-
-
+
-
-    /* Add the address to the buffer */
-
-
-
-
+
+
+
-        {
-            p_sap_session->p_address = p_sap->pp_addresses[i];
-            b_found = VLC_TRUE;
-            break;
-        }
-    }
-
+
+
-    {
-        sap_address_t *p_address = (sap_address_t *)
@@ -387 +366 @@
-            return VLC_ENOMEM;
-        }
-_method->psz_address
+sz_addr
-        p_address->i_port  =  9875;
-
-
+
-                                        p_address->i_port );
-        if( p_address->i_wfd != -1 )
+        {
-            net_StopRecv( p_address->i_wfd );
+            net_GetSockAddress( p_sap, p_address->i_wfd,
+                                p_address->psz_machine, NULL );
+        }
-
-        if( p_sap->b_control == VLC_TRUE )
-        {
-
-
-
+
+
-            if( p_address->i_rfd != -1 )
-                net_StopSend( p_address->i_rfd );
@@ -430 +411 @@
-    }
-
+
-    /* Build the SAP Headers */
-    i_header_size = ( b_ipv6 ? 20 : 8 ) + strlen( psz_type ) + 1;
-    psz_head = (char *) malloc( i_header_size * sizeof( char ) );
-! psz_head
+psz_head == NULL
-    {
-        msg_Err( p_sap, "out of memory" );
@@ -484 +466 @@
-        strncpy( psz_head + 8, psz_type, 15 );
-    }
+
+    /* If needed, build the SDP */
+    if( p_session->psz_sdp == NULL )
+    {
+        p_session->psz_sdp = SDPGenerate( p_sap, p_session,
+                                          p_sap_session->p_address );
+        if( p_session->psz_sdp == NULL )
+        {
+            vlc_mutex_unlock( &p_sap->object_lock );
+            return VLC_ENOMEM;
+        }
+    }
+
+    p_sap_session->psz_sdp = strdup( p_session->psz_sdp );
+    p_sap_session->i_last = 0;
-
-    psz_head[ i_header_size-1 ] = '\0';
@@ -571 +568 @@
-                           p_session->psz_data,
-                           p_session->i_length );
-
+(int)
-        {
-            msg_Warn( p_sap, "SAP send failed on address %s (%i %i)",
@@ -588 +585 @@
-}
-
-
+
+
+
-{
-    int64_t i_sdp_id = mdate();
-    int     i_sdp_version = 1 + p_sap->i_sessions + (rand()&0xfff);
-
+
+
-    char ipv;
-
-    psz_group = convert_to_utf8( p_sap, p_session->psz_group );
-    psz_name = convert_to_utf8( p_sap, p_session->psz_name );
+    if( psz_name == NULL )
+    {
+        FREE( psz_group );
+        return NULL;
+    }
-
-    /* FIXME: really check that psz_uri is a real IP address
@@ -619 +624 @@
-
-    /* see the lists in modules/stream_out/rtp.c for compliance stuff */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-                            "v=0\r\n"
-4 127.0.0.1
+%c %s
-                            "s=%s\r\n"
-                            "t=0 0\r\n"
@@ -650 +634 @@
-                            "a=type:broadcast\r\n",
-                            i_sdp_id, i_sdp_version,
+                            ipv, p_addr->psz_machine,
-                            psz_name, ipv,
-                            psz_uri, p_session->i_ttl,
-
+
+
+
+
+
+
+
-    free( psz_name );
-
-    if( psz_group )
-    {
-sprintf( p_session->psz_sdp, "%sa=x-plgroup:%s\r\n",
-                             p_session->
+/* FIXME: this is illegal use of sprintf */
+sprintf( psz_sdp, "%sa=x-plgroup:%s\r\n", 
-        free( psz_group );
-    }
-
-_session->p
-       p_session->
-VLC_SUCCESS
+
+
+psz_sdp
-}
-