Changeset 2db764f9f8ebd952f53af8a6333b773ba3bfa93c

Timestamp:

26/05/03 15:45:52 (6 years ago)

Author:

Clément Stenac <zorglub@videolan.org>

git-committer:

Clément Stenac <zorglub@videolan.org> 1053956752 +0000

git-parent:

[9de7a7eb3966c9b459ea899544fd3c982c1a7c21]

git-author:

Clément Stenac <zorglub@videolan.org> 1053956752 +0000

Message:

* The VLC-integrated SAP server now sends compliant packets. They can

only be viewed with the CVS version of VLC

Files:

• include/announce.h (modified) (3 diffs)
• modules/stream_out/standard.c (modified) (3 diffs)
• src/stream_output/announce.c (modified) (5 diffs)

include/announce.h

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2002 VideoLAN
-1 2003/05/20 16:20:33
+2 2003/05/26 13:45:51
- *
- * Authors: Christophe Massiot <massiot@via.ecp.fr>
@@ -52 +52 @@
-        char psz_url[256];
-        char psz_name[1024];
+        char psz_port[8];
-        module_t p_network;
-        unsigned int socket;
@@ -63 +64 @@
- * Prototypes
- *****************************************************************************/
-
+, char * 
-VLC_EXPORT( void,            sout_SAPSend,        ( sout_instance_t *,sap_session_t * ) );
-VLC_EXPORT( void,            sout_SAPDelete,      ( sap_session_t * ) );

modules/stream_out/standard.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001, 2002 VideoLAN
-2 2003/05/20 16:20:33
+3 2003/05/26 13:45:52
- *
- * Authors: Laurent Aimar <fenrir@via.ecp.fr>
@@ -78 +78 @@
-    char                *psz_sap = NULL;
-
+    char                *psz_port = "1234";
+    
-    sap_session_t       *p_sap = NULL;
-    
@@ -127 +129 @@
-    {        
-        msg_Dbg( p_sout , "Creating SAP" );
-
+port , psz_
-    }   
-    

src/stream_output/announce.c

@@ -4 +4 @@
- * Copyright (C) 2002 VideoLAN
- *
-
-
-
+
+
- *
- * This program is free software; you can redistribute it and/or modify
@@ -38 +37 @@
-#include <network.h>
-
-
+ /* Standard port and address for SAP */
-#define SAP_PORT 9875
-
@@ -44 +43 @@
- * sout_SAPNew: Creates a SAP Session
- *****************************************************************************/
-
+psz_port_arg , char *
-{
-        sap_session_t           *p_new;
@@ -57 +56 @@
-        sprintf ( p_new->psz_url , "%s" , psz_url_arg );
-        sprintf ( p_new->psz_name , "%s" , psz_name_arg );
+        sprintf ( p_new->psz_port, "%s" , psz_port_arg ); /* Not implemented in SO */
-        
-        msg_Dbg (p_sout , "Creating SAP Socket" );
@@ -107 +107 @@
-void sout_SAPSend( sout_instance_t *p_sout, sap_session_t * p_this )
-{ 
-sap_msg[2048]
-*user="VideoLAN"
-machine="VideoLAN"
-site="VideoLAN
+*sap_head
+sap_msg[1000]
+sap_send
+payload_type="application/sdp
-      int i_send_result;
+      int i;
+      int i_header_size;
+      int i_msg_size;
+      int i_size;
-     
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-     
+     i_msg_size = strlen( sap_msg );     
+     i_size = i_msg_size + i_header_size;
+     
+     sap_send = ( char* )malloc( i_size*sizeof(char) ); 
+          
+      for(i=0 ; i<i_header_size ; i++)
+      {
+           sap_send[i] = sap_head[i];
+       }
+
+     for( ;  i<i_size; i++)
+     {
+         sap_send[i] = sap_msg[i-i_header_size];
+     }
+    
+    /* What we send is the SAP header and the SDP packet */
+     
+     if(i_size<1024) /* We mustn't send packets larger than 1024B */     
+         i_send_result =  sendto( p_this->socket , sap_send , i_size , 0 , (struct sockaddr *)&p_this->addr , sizeof(p_this->addr) );
+    
-     if(i_send_result == -1)
-     {
-    
-   perror("send
+
+perror("sendto
-     }
-
-
-
+
+
+
+
+
-}