Commit aab0bdf3 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Remove IP version thing

parent c8350bd7
/*****************************************************************************
* message.cpp : SAP Message class
****************************************************************************
* Copyright (C) 1998-2004 VideoLAN
* Copyright (C) 1998-2005 the VideoLAN team
* $Id$
*
* Authors: Damien Lucas <nitrox@videolan.org>
......@@ -132,16 +132,15 @@ void Message::BuildHeader(const char* payload_type)
void Message::AddProgram(Program *p)
{
/* FIXME */
/* Currently only announces a single mediasession
* and only a MPEG2 TS/RTP stream announce is supported
* RFC 2327 Compliance ? */
/* RFC 2327 Compliance ? */
string ipv = (p->GetAddress().find(':') == string::npos) ? "IP4" : "IP6";
string v="v=0\n"; // SDP version
string ver="";
stringstream ssin(ver);
ssin << version;
ver = ssin.str();
string o="o="+p->GetUser()+" "+ver+" 1 IN IP4 "+p->GetMachine()+"\n";
string o="o="+p->GetUser()+" "+ver+" 1 IN "+ipv+" "+p->GetMachine()+"\n";
string s="s="+p->GetName()+"\n";
string u="u="+p->GetSite()+"\n";
string t;
......@@ -161,10 +160,7 @@ void Message::AddProgram(Program *p)
string c;
if(p->GetIPVersion() == 6)
c="c=IN IP6 ["+p->GetAddress()+"]/"+p->GetTTL()+"\n";
else
c="c=IN IP4 "+p->GetAddress()+"/"+p->GetTTL()+"\n";
c="c=IN "+ipv+" "+p->GetAddress()+"/"+p->GetTTL()+"\n";
// TODO ttl type should be specified
string a = p->IsRTP()
......
......@@ -304,13 +304,6 @@ int Config::Parse()
pp->SetTTL(tline);
}
if(strstr(line,"program_ipversion="))
{
strgeta(line,tline,'=');
something=1;
pp->SetIPVersion(tline);
}
if(strstr(line,"playlist_group="))
{
ICONV_CONST char *tptr;
......
......@@ -38,7 +38,6 @@ class Program
string GetPort();
string GetTTL();
string GetPlGroup();
int GetIPVersion();
/* Functions to set the values */
void SetName(char*);
......@@ -50,7 +49,6 @@ class Program
void SetTTL(char *);
void SetPlGroup(char *);
void SetHasPlGroup(bool);
void SetIPVersion(char *);
void SetRTP(bool);
bool IsPermanent();
......@@ -66,7 +64,6 @@ class Program
string port;
string program_ttl;
string pl_group;
int program_ipversion;
bool permanent;
bool b_rtp;
bool b_has_pl_group;
......
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