Skip to content

V
vlc-2-2
Commit 7ef7ca63 authored by Derk-Jan Hartman's avatar Derk-Jan Hartman
Browse files
Options

* Fixed the udp SDPs. More spec compliant now. 

* Removed the old SAP code. announce.? in modules/stream_out is 
  still required for SLP announces.
parent 2120e79e
Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 549 deletions
modules/stream_out/announce.c deleted 100644 → 0
View file @ 2120e79e
/*****************************************************************************
* announce.c : Session announcement
*****************************************************************************
* Copyright (C) 2002 VideoLAN
*
* Authors: Clment Stenac <zorglub@via.ecp.fr>
* Damien Lucas <nitrox@via.ecp.fr>
*
* 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> /* free() */
#include <errno.h> /* ENOMEM */
#include <stdio.h> /* sprintf() */
#include <vlc/vlc.h>
#include <vlc/sout.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
#ifdef WIN32
# include <winsock2.h>
# include <ws2tcpip.h>
# ifndef IN_MULTICAST
# define IN_MULTICAST(a) IN_CLASSD(a)
# endif
#else
# include <sys/socket.h>
#endif
#ifdef HAVE_SLP_H
# include <slp.h>
#endif
#include "announce.h"
#include "network.h"
#define SAP_IPV4_ADDR "224.2.127.254" /* Standard port and address for SAP */
#define SAP_PORT 9875
#define SAP_IPV6_ADDR_1 "FF0"
#define SAP_IPV6_ADDR_2 "::2:7FFE"
#define DEFAULT_PORT 1234
/*****************************************************************************
* SDPGenerateUDP: create a SDP file
*****************************************************************************/
char * SDPGenerateUDP(char * psz_name_arg,char * psz_url_arg)
{
/* Create the SDP content */
/* Do not add spaces at beginning of the lines ! */
char * psz_sdp;
vlc_url_t * p_url; /*where parsed url will be stored*/
/*Allocate the URL structure*/
p_url = (vlc_url_t *) malloc( sizeof( vlc_url_t) );
if ( ! p_url )
{
return NULL;
}
vlc_UrlParse( p_url, psz_url_arg , 0);
if (!p_url->psz_host)
{
return NULL;
}
if(p_url->i_port == 0)
{
p_url->i_port = DEFAULT_PORT;
}
psz_sdp = malloc( sizeof("v=0\r\n"
"o=VideoLAN 3247692199 3247895918 IN IP4 VideoLAN\r\n"
"s=\r\n"
"u=VideoLAN\r\n"
"t=0 0\r\n"
"m=video udp 33\r\n"
"c=IN IP4 /15\r\n"
"a=type:test\r\n")
+ strlen(psz_name_arg)
+ 20 /*lengh of a 64 bits int"*/
+ strlen(p_url->psz_host)+1);
if ( !psz_sdp )
{
return NULL;
}
sprintf( psz_sdp,"v=0\r\n"
"o=VideoLAN 3247692199 3247895918 IN IP4 VideoLAN\r\n"
"s=%s\r\n"
"u=VideoLAN\r\n"
"t=0 0\r\n"
"m=video %i udp 33\r\n"
"c=IN IP4 %s/15\r\n"
"a=type:test\n",
psz_name_arg, p_url->i_port, p_url->psz_host );
vlc_UrlClean( p_url );
if (p_url)
{
free(p_url);
}
p_url = NULL;
return psz_sdp;
}
/*****************************************************************************
* sout_SAPNew: Creates a SAP Session
*****************************************************************************/
sap_session_t2 * sout_SAPNew ( sout_instance_t *p_sout,
char * psz_sdp_arg,
int ip_version,
char * psz_v6_scope )
{
sap_session_t2 *p_sap; /* The SAP structure */
char *sap_ipv6_addr = NULL; /* IPv6 built address */
vlc_value_t val;
var_Create( p_sout, "ipv6", VLC_VAR_BOOL );
var_Create( p_sout, "ipv4", VLC_VAR_BOOL );
/* Allocate the SAP structure */
p_sap = (sap_session_t2 *) malloc( sizeof ( sap_session_t2 ) ) ;
if ( !p_sap )
{
msg_Err( p_sout, "out of memory" );
return NULL;
}
p_sap->i_socket = 0;
p_sap->psz_sdp=NULL;
p_sap->i_ip_version = ip_version;
p_sap->psz_sdp = psz_sdp_arg;
if( ip_version != 6 )
{
val.b_bool = VLC_FALSE;
var_Set( p_sout, "ipv6", val);
val.b_bool = VLC_TRUE;
var_Set( p_sout, "ipv4", val);
p_sap->i_socket = net_OpenUDP(p_sout, "", 0, SAP_IPV4_ADDR, SAP_PORT );
}
else
{
val.b_bool = VLC_TRUE;
var_Set( p_sout, "ipv6", val);
val.b_bool = VLC_FALSE;
var_Set( p_sout, "ipv4", val);
sap_ipv6_addr = (char *) malloc( 28 * sizeof(char) );
if ( !sap_ipv6_addr )
{
msg_Err( p_sout, "out of memory" );
return NULL;
}
sprintf( sap_ipv6_addr, "%s%c%s",
SAP_IPV6_ADDR_1, psz_v6_scope[0], SAP_IPV6_ADDR_2 );
p_sap->i_socket = net_OpenUDP(p_sout, "", 0, sap_ipv6_addr, SAP_PORT );
if( sap_ipv6_addr )
{
free( sap_ipv6_addr );
}
}
if((int)p_sap->i_socket <= 0)
{
msg_Warn(p_sout, "invalid SAP socket");
return NULL;
}
/* Free what we allocated */
msg_Dbg( p_sout, "SAP initialization complete" );
return p_sap;
}
/*****************************************************************************
* sout_SAPDelete: Deletes a SAP Session
*****************************************************************************/
void sout_SAPDelete( sout_instance_t *p_sout, sap_session_t2 * p_sap )
{
int i_ret;
#if defined( UNDER_CE )
i_ret = CloseHandle( (HANDLE)p_sap->i_socket );
#elif defined( WIN32 )
i_ret = closesocket( p_sap->i_socket );
#else
i_ret = close( p_sap->i_socket );
#endif
if( i_ret )
{
msg_Err( p_sout, "unable to close SAP socket" );
}
if (p_sap->psz_sdp)
{
free(p_sap->psz_sdp);
p_sap->psz_sdp = NULL;
}
free( p_sap );
}
/*****************************************************************************
* sout_SAPSend: Sends a SAP packet
*****************************************************************************/
void sout_SAPSend( sout_instance_t *p_sout, sap_session_t2 * p_sap )
{
char *psz_msg; /* SDP content */
char *psz_head; /* SAP header */
char *psz_send; /* What we send */
char *psz_type = "application/sdp";
int i_header_size; /* SAP header size */
int i_msg_size; /* SDP content size */
int i_size; /* Total size */
int i_ret = 0;
/* We send a packet every 24 calls to the function */
if( p_sap->i_calls++ < 24 )
{
return;
}
i_header_size = 8 + strlen( psz_type ) + 1;
psz_head = (char *) malloc( i_header_size * sizeof( char ) );
if( ! psz_head )
{
msg_Err( p_sout, "out of memory" );
return;
}
/* Create the SAP headers */
psz_head[0] = 0x20; /* Means IPv4, not encrypted, not compressed */
psz_head[1] = 0x00; /* No authentification */
psz_head[2] = 0x42; /* Version */
psz_head[3] = 0x12; /* Version */
psz_head[4] = 0x01; /* Source IP FIXME: we should get the real address */
psz_head[5] = 0x02; /* idem */
psz_head[6] = 0x03; /* idem */
psz_head[7] = 0x04; /* idem */
strncpy( psz_head + 8, psz_type, 15 );
psz_head[ i_header_size-1 ] = '\0';
psz_msg = p_sap->psz_sdp;
if(!psz_msg)
{
msg_Err( p_sout, "no sdp packet" );
return;
}
i_msg_size = strlen( psz_msg );
i_size = i_msg_size + i_header_size;
/* Create the message */
psz_send = (char *) malloc( i_size*sizeof(char) );
if( !psz_send )
{
msg_Err( p_sout, "out of memory" );
return;
}
memcpy( psz_send, psz_head, i_header_size );
memcpy( psz_send + i_header_size, psz_msg, i_msg_size );
if( i_size < 1024 ) /* We mustn't send packets larger than 1024B */
{
i_ret = net_Write(p_sout, p_sap->i_socket, psz_send, i_size );
}
if( i_ret <= 0 )
{
msg_Warn( p_sout, "SAP send failed on socket %i (%s)",
p_sap->i_socket, strerror(errno) );
}
p_sap->i_calls = 0;
/* Free what we allocated */
free( psz_send );
free( psz_head );
}
#ifdef HAVE_SLP_H
/*****************************************************************************
* sout_SLPBuildName: Builds a service name according to SLP standard
*****************************************************************************/
static char * sout_SLPBuildName(char *psz_url,char *psz_name)
{
char *psz_service;
unsigned int i_size;
/* name to build is: service:vlc.services.videolan://$(url) */
i_size = 8 + 12 + 12 + 5 + strlen(psz_url) + 1;
psz_service=(char *)malloc(i_size * sizeof(char));
snprintf( psz_service , i_size,
"service:vlc.services.videolan://udp:@%s",
psz_url);
/* How piggy ! */
psz_service[i_size]='\0'; /* Just to make sure */
return psz_service;
}
/*****************************************************************************
* sout_SLPReport: Reporting function. Unused at the moment but needed
*****************************************************************************/
static void sout_SLPReport(SLPHandle slp_handle,SLPError slp_error,void* cookie)
{
}
#endif
/*****************************************************************************
* sout_SLPReg: Registers the program with SLP
*****************************************************************************/
int sout_SLPReg( sout_instance_t *p_sout, char * psz_url,
char * psz_name)
{
#ifdef HAVE_SLP_H
SLPHandle slp_handle;
SLPError slp_res;
char *psz_service= sout_SLPBuildName(psz_url,psz_name);
if( SLPOpen( NULL, SLP_FALSE, &slp_handle ) != SLP_OK)
{
msg_Warn(p_sout,"Unable to initialize SLP");
return -1;
}
msg_Info(p_sout , "Registering %s (name: %s) in SLP",
psz_service , psz_name);
slp_res = SLPReg ( slp_handle,
psz_service,
SLP_LIFETIME_MAXIMUM,
NULL,
psz_name,
SLP_TRUE,
sout_SLPReport,
NULL );
if( slp_res != SLP_OK )
{
msg_Warn(p_sout,"Error while registering service: %i", slp_res );
return -1;
}
return 0;
#else /* This function should never be called if this is false */
return -1;
#endif
}
/*****************************************************************************
* sout_SLDePReg: Unregisters the program from SLP
*****************************************************************************/
int sout_SLPDereg( sout_instance_t *p_sout, char * psz_url,
char * psz_name)
{
#ifdef HAVE_SLP_H
SLPHandle slp_handle;
SLPError slp_res;
char *psz_service= sout_SLPBuildName(psz_url,psz_name);
if( SLPOpen( NULL, SLP_FALSE, &slp_handle ) != SLP_OK)
{
msg_Warn(p_sout,"Unable to initialize SLP");
return -1;
}
msg_Info(p_sout , "Unregistering %s from SLP",
psz_service);
slp_res = SLPDereg ( slp_handle,
psz_service,
sout_SLPReport,
NULL );
if( slp_res != SLP_OK )
{
msg_Warn(p_sout,"Error while registering service: %i", slp_res );
return -1;
}
return 0;
#else /* This function should never be called if this is false */
return -1;
#endif
}
modules/stream_out/announce.h deleted 100644 → 0
View file @ 2120e79e
/*****************************************************************************
* announce.h : Session announcement
*****************************************************************************
* Copyright (C) 2002 VideoLAN
* $Id$
*
* Authors: Clment Stenac <zorglub@via.ecp.fr>
*
* 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
*****************************************************************************/
#if defined( UNDER_CE )
# include <winsock.h>
#elif defined( WIN32 )
# include <winsock2.h>
# include <ws2tcpip.h>
# define close closesocket
#else
# include <netdb.h> /* hostent ... */
# include <sys/socket.h>
# include <netinet/in.h>
# ifdef HAVE_ARPA_INET_H
# include <arpa/inet.h> /* inet_ntoa(), inet_aton() */
# endif
#endif
#ifdef HAVE_SLP_H
# include <slp.h>
#endif
#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
#endif
/*****************************************************************************
* sap_session_t: SAP Session descriptor
*****************************************************************************/
struct sap_session_t2
{
char * psz_sdp;
module_t p_network;
unsigned int i_socket;
unsigned int i_calls;
int i_ip_version;
};
typedef struct sap_session_t2 sap_session_t2;
/*****************************************************************************
* slp_session_t: SLP Session descriptor
*****************************************************************************/
struct slp_session_t
{
char *psz_url;
char *psz_name;
};
typedef struct slp_session_t slp_session_t;
/*****************************************************************************
* Prototypes
*****************************************************************************/
sap_session_t2 * sout_SAPNew (sout_instance_t *, char * psz_sdp_arg,
int ip_version,
char * psz_v6_scope );
char * SDPGenerateUDP(char * ,char *);
void sout_SAPDelete (sout_instance_t *,sap_session_t2*);
void sout_SAPSend (sout_instance_t *,sap_session_t2 *);
int sout_SLPReg (sout_instance_t *,char *,char *);
int sout_SLPDereg (sout_instance_t *,char *,char *);
/*
VLC_EXPORT( sap_session_t *, sout_SAPNew, ( sout_instance_t *,char * , char * , int , char *) );
VLC_EXPORT( void, sout_SAPSend, ( sout_instance_t *,sap_session_t *) );
VLC_EXPORT( void, sout_SAPDelete, ( sout_instance_t *,sap_session_t * ) );
VLC_EXPORT( int, sout_SLPReg, (sout_instance_t*,char*,char*) );
VLC_EXPORT( int, sout_SLPDereg, (sout_instance_t*,char*,char*) );*/
src/stream_output/sap.c
View file @ 7ef7ca63
......@@ -2,7 +2,7 @@
* sap.c : SAP announce handler
*****************************************************************************
* Copyright (C) 2002-2004 VideoLAN
* $Id: sap.c 7307 2004-04-07 23:13:03Z fenrir $
* $Id$
*
* Authors: Clment Stenac <zorglub@videolan.org>
*
......@@ -436,14 +436,19 @@ static int announce_SendSAPAnnounce( sap_handler_t *p_sap,
static int SDPGenerate( sap_handler_t *p_sap, session_descriptor_t *p_session )
{
int64_t i_sdp_id = mdate();
int i_sdp_version = 1 + p_sap->i_sessions + (rand()&0xfff);
/* see the lists in modules/stream_out/rtp.c for compliance stuff */
p_session->psz_sdp = (char *)malloc(
sizeof("v=0\n"
"o=- 12 12 IN IP4 127.0.0.1\n" /* FIXME */
"s=\n"
"c=IN IP4 /\n"
"m=video udp\n"
"a=tool:VLC "VERSION"\n"
"a=type:broadcast")
sizeof("v=0\r\n"
"o=- 45383436098 45398 IN IP4 127.0.0.1\r\n" /* FIXME */
"s=\r\n"
"t=0 0\r\n"
"c=IN IP4 /\r\n"
"m=video udp\r\n"
"a=tool:"PACKAGE_STRING"\r\n"
"a=type:broadcast\r\n")
+ strlen( p_session->psz_name )
+ strlen( p_session->psz_uri ) + 300 );
if( !p_session->psz_sdp )
......@@ -452,13 +457,15 @@ static int SDPGenerate( sap_handler_t *p_sap, session_descriptor_t *p_session )
return VLC_ENOMEM;
}
sprintf( p_session->psz_sdp,
"v=0\n"
"o=- 12 12 IN IP4 127.0.0.1\n"
"s=%s\n"
"c=IN IP4 %s/%d\n"
"m=video %d udp %d\n"
"a=tool:VLC "VERSION"\n"
"a=type:broadcast\n",
"v=0\r\n"
"o=- "I64Fd" %d IN IP4 127.0.0.1\r\n"
"s=%s\r\n"
"t=0 0\r\n"
"c=IN IP4 %s/%d\r\n"
"m=video %d udp %d\r\n"
"a=tool:"PACKAGE_STRING"\r\n"
"a=type:broadcast\r\n",
i_sdp_id, i_sdp_version,
p_session->psz_name,
p_session->psz_uri, p_session->i_ttl,
p_session->i_port, p_session->i_payload );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment