Remove dead code

diff --git a/src/stream_output/announce.c b/src/stream_output/announce.c
index 0e60c4c037a0324a68ecf18548084ead1a2bc35e..b1d6d97d50b8dfbb0210d01656b39e1b49b8f1c1 100644 (file)
--- a/src/stream_output/announce.c
+++ b/src/stream_output/announce.c
@@ -54,32 +54,7 @@ struct announce_method_t
 static session_descriptor_t * sout_AnnounceSessionCreate (vlc_object_t *obj,
                                                    const char *cfgpref)
 {
-    size_t cfglen = strlen (cfgpref);
-    if (cfglen > 100)
-        return NULL;
-
-    char varname[cfglen + sizeof ("description")], *subvar = varname + cfglen;
-    strcpy (varname, cfgpref);
-
-    session_descriptor_t *p_session = calloc (1, sizeof (*p_session));
-    if (p_session == NULL)
-        return NULL;
-
-    strcpy (subvar, "name");
-    p_session->psz_name = var_GetNonEmptyString (obj, varname);
-    strcpy (subvar, "group");
-    p_session->psz_group = var_GetNonEmptyString (obj, varname);
-
-    strcpy (subvar, "description");
-    p_session->description = var_GetNonEmptyString (obj, varname);
-    strcpy (subvar, "url");
-    p_session->url = var_GetNonEmptyString (obj, varname);
-    strcpy (subvar, "email");
-    p_session->email = var_GetNonEmptyString (obj, varname);
-    strcpy (subvar, "phone");
-    p_session->phone = var_GetNonEmptyString (obj, varname);
-
-    return p_session;
+    return calloc (1, sizeof (session_descriptor_t));
 }
 
 /**
@@ -167,18 +142,7 @@ int sout_AnnounceUnRegister( sout_instance_t *p_sout,
  */
 void sout_AnnounceSessionDestroy( session_descriptor_t *p_session )
 {
-    if( p_session )
-    {
-        free (p_session->psz_name);
-        free (p_session->psz_group);
-        free (p_session->psz_sdp);
-        free (p_session->description);
-        free (p_session->sdpformat);
-        free (p_session->url);
-        free (p_session->email);
-        free (p_session->phone);
-        free( p_session );
-    }
+    free( p_session );
 }
 
 /**

diff --git a/src/stream_output/sap.c b/src/stream_output/sap.c
index 2950124a00d7b9dcd7e68df1a1b6a0fb0eb1964d..94a36b4b68a8ed56f694a2cb4af4bc62230b5463 100644 (file)
--- a/src/stream_output/sap.c
+++ b/src/stream_output/sap.c
@@ -90,9 +90,6 @@ struct sap_session_t {
  *****************************************************************************/
 static void RunThread( vlc_object_t *p_this);
 static int ComputeRate( sap_address_t *p_address );
-static char *SDPGenerate( sap_handler_t *p_sap,
-                          const session_descriptor_t *p_session,
-                          vlc_bool_t b_ssm );
 
 static int announce_SendSAPAnnounce( sap_handler_t *p_sap,
                                      sap_session_t *p_session );
@@ -419,9 +416,8 @@ static int announce_SAPAnnounceAdd( sap_handler_t *p_sap,
         p_sap_session->p_address = p_address;
     }
 
-    if (p_session->origlen == 0)
-        memcpy (&p_session->orig, &p_sap_session->p_address->orig,
-                p_session->origlen = p_sap_session->p_address->origlen);
+    memcpy (&p_session->orig, &p_sap_session->p_address->orig,
+             p_session->origlen = p_sap_session->p_address->origlen);
 
     size_t headsize = 20;
     switch (p_session->orig.ss_family)
@@ -442,15 +438,7 @@ static int announce_SAPAnnounceAdd( sap_handler_t *p_sap,
     }
 
     /* If needed, build the SDP */
-    if( p_session->psz_sdp == NULL )
-    {
-        p_session->psz_sdp = SDPGenerate( p_sap, p_session, b_ssm );
-        if( p_session->psz_sdp == NULL )
-        {
-            vlc_mutex_unlock( &p_sap->object_lock );
-            return VLC_ENOMEM;
-        }
-    }
+    assert( p_session->psz_sdp != NULL );
 
     p_sap_session->i_last = 0;
     p_sap_session->i_length = headsize + strlen (p_session->psz_sdp);
@@ -587,50 +575,6 @@ static int announce_SendSAPAnnounce( sap_handler_t *p_sap,
     return VLC_SUCCESS;
 }
 
-static char *SDPGenerate( sap_handler_t *p_sap,
-                          const session_descriptor_t *p_session,
-                          vlc_bool_t b_ssm )
-{
-    char *psz_group, *psz_name, *psz_sdp;
-
-     char *head = sdp_Start (p_session->psz_name, p_session->description,
-        p_session->url, p_session->email, p_session->phone,
-        (const struct sockaddr *)&p_session->orig, p_session->origlen,
-        (const struct sockaddr *)&p_session->addr, p_session->addrlen);
-    if (head == NULL)
-        return NULL;
-
-    psz_group = p_session->psz_group;
-    psz_name = p_session->psz_name;
-
-    char *plgroup;
-    if ((psz_group == NULL)
-     || (asprintf (&plgroup, "a=x-plgroup:%s\r\n", psz_group) == -1))
-        plgroup = NULL;
-
-    const char *comedia = NULL;
-    if (!strncasecmp (p_session->sdpformat, "DCCP", 4)
-     || !strncasecmp (p_session->sdpformat, "TCP", 3))
-        comedia = "a=setup:passive\r\n"
-                  "a=connection:new\r\n";
-
-    int res = asprintf (&psz_sdp, "%s" "%s" "%s"
-                        "m=video %d %s\r\n",
-                        head,
-                        plgroup ?: "",
-                        comedia ?: "",
-                        ntohs (net_GetPort ((const struct sockaddr *)&p_session->addr)),
-                        p_session->sdpformat);
-    free (plgroup);
-
-    if (res == -1)
-        return NULL;
-
-    msg_Dbg( p_sap, "Generated SDP (%u bytes):\n%s",
-             (unsigned)strlen(psz_sdp), psz_sdp );
-    return psz_sdp;
-}
-
 static int ComputeRate( sap_address_t *p_address )
 {
     uint8_t buffer[SAP_MAX_BUFFER];

diff --git a/src/stream_output/stream_output.h b/src/stream_output/stream_output.h
index a3f7719645d8900a2b1241a298358965fe404118..d91db30f47c0a4b2c79423780c2b6cf0f95bf712 100644 (file)
--- a/src/stream_output/stream_output.h
+++ b/src/stream_output/stream_output.h
@@ -75,20 +75,11 @@ struct sap_handler_t
 
 struct session_descriptor_t
 {
-    char *psz_name;
-    char *psz_group;
-
-    char *description;
-    char *url; // meta URL for SAP, potentially real URL for other cases
-    char *email;
-    char *phone;
-
     struct sockaddr_storage orig;
     socklen_t origlen;
     struct sockaddr_storage addr;
     socklen_t addrlen;
 
-    char *sdpformat; // format suitable for SDP
     char *psz_sdp;
     vlc_bool_t b_ssm;
 };