Commit 90d99033 authored by Marc Ariberti's avatar Marc Ariberti

* xml configuration is not compiled by default

* fixed a bug in the sample config file
* added .cvsignore
parent 89287adb
......@@ -4,7 +4,7 @@
# Set this to 1 if you want to compile with xerces-c
XERCESC=1
XERCESC=0
VERSION=0.2.1
#CC=g++-3.2
......
......@@ -2,7 +2,7 @@
* config.c: mini-VideoLAN Channel Server, configuration system
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: config-txt.cc,v 1.1 2002/12/04 18:10:50 marcari Exp $
* $Id: config-txt.cc,v 1.2 2002/12/20 15:53:59 marcari Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Marc Ariberti <marcari@via.ecp.fr>
......@@ -51,7 +51,7 @@
#include "config-txt.h"
///////
C_Config::C_Config(C_Logger &logger) : logger(logger), configFile(CHANNEL_CONF)
C_Config::C_Config(C_Logger &logger) : logger(logger)
{
}
......@@ -65,6 +65,7 @@ C_ConfigTxt::C_ConfigTxt(C_Logger &logger)
{
socket_port = 0;
socket_type = IPV4;
configFile = CHANNEL_CONF_TXT;
}
C_ConfigTxt::~C_ConfigTxt()
......
......@@ -2,7 +2,7 @@
* config-xml.cc: mini-VideoLAN Channel Server, configuration system
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: config-xml.cc,v 1.1 2002/12/04 18:10:50 marcari Exp $
* $Id: config-xml.cc,v 1.2 2002/12/20 15:53:59 marcari Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Marc Ariberti <marcari@via.ecp.fr>
......@@ -63,10 +63,11 @@
C_ConfigXml::C_ConfigXml(C_Logger &logger)
: C_Config(logger), channels(0), i_channel_max(0)
:C_Config(logger), channels(0), i_channel_max(0)
{
socket_port = 0;
socket_type = IPV4;
configFile = CHANNEL_CONF_XML;
}
C_ConfigXml::~C_ConfigXml()
......@@ -115,7 +116,7 @@ void C_ConfigXml::ReadFile()
return;
}
catch (...) {
logger << C_Logger::ERROR << "Unexpected Exception \n" << C_Logger::END;
logger << C_Logger::ERROR << "Unexpected Exception : " << configFile << C_Logger::END;
return;
}
......
......@@ -21,7 +21,7 @@
</group>
<group>
<name>company</name>
<ip>192.168.2.3
<ip>192.168.2.3</ip>
<subnet>192.168.3.0/255.255.255.0</subnet>
</group>
<group>
......
......@@ -2,7 +2,7 @@
* vlcs.h: VideoLAN Channel Server configuration
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: vlcs.h,v 1.1 2002/12/04 18:10:50 marcari Exp $
* $Id: vlcs.h,v 1.2 2002/12/20 15:53:59 marcari Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Marc Ariberti <marcari@via.ecp.fr>
......@@ -34,7 +34,8 @@
#define VLCS_VERSION 13
#define VLCS_PORT 6010
#define CHANNEL_CONF "vlcs.conf"
#define CHANNEL_CONF_XML "vlcs.conf"
#define CHANNEL_CONF_TXT "vlcs-old.conf"
#define NO_COLORS 0
#define LINUX_COLORS 1
......
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