Commit 27f3b188 authored by Damien Lucas's avatar Damien Lucas

. Removed configure file from the cvs

. Added a bootstrap

. Added a configure option to keep backward compatibility to telnet functions
  (./configure --with-extrafunc=manager_backwardcomp.cpp)

. Begin of backward compatibility (start --loop option fix), still
  a lot of work to do

. fixed 2 segfaults

. added port 1234 as default if none specified at net4output construction

. Some optims
parent ebe8a9c9
......@@ -82,6 +82,7 @@ LCFLAGS+=-D_REENTRANT
# Specific flags
#
CCFLAGS+=-DCONFIG_PATH='"$(sysconfdir)/videolan/vls"'
CCFLAGS+= @MANAGER_EXTRA_FLAG@
VLS_LCFLAGS = @VLS_LCFLAGS@
VLS_LIB = @VLS_LIB@
......@@ -109,7 +110,6 @@ VLS_LIB += $(BUILTINS_LIB)
CCFLAGS+=-DBUGGY_VLC -DYY_NO_UNPUT
################################################################################
# Build control
################################################################################
......
#! /bin/sh
## Minimalistic boostrap file for vls
## $Id: bootstrap,v 1.1 2003/08/13 15:59:31 nitrox Exp $
LANG=C
export LANG
CYGWIN=binmode
export CYGWIN
echo "+ Remove stuff"
rm -f src/core/defs.h.in
rm -f configure
rm -f aclocal.m4
echo "+ Check for auto* tools"
# Automake
have_autoconf="no"
if autoconf --version >/dev/null 2>&1;
then
have_autoconf="yes"
fi
if test "${have_autoconf}" = "no"; then
echo "- You need autoconf"
echo "- Unable to continue"
exit 1
fi
echo "+ Generating configure file"
aclocal
autoconf
echo "+ Generating header files"
autoheader 2&> /dev/null
exit 0
This diff is collapsed.
......@@ -501,6 +501,16 @@ then
esac
fi
dnl Extra manager functions
AC_ARG_WITH(extrafunc,
AC_HELP_STRING(--with-extrafunc=FILE, File containing extra functions definitions))
if test "x$with_extrafunc" = x
then
MANAGER_EXTRA_FLAG=""
else
MANAGER_EXTRA_FLAG="-DMANAGER_EXTRA='\"${with_extrafunc}\"'"
fi
dnl
dnl Configuration is finished
......@@ -538,6 +548,7 @@ AC_SUBST(V4LINPUT_CCFLAGS)
AC_SUBST(V4LINPUT_DCFLAGS)
AC_SUBST(V4LINPUT_LCFLAGS)
AC_SUBST(MANAGER_EXTRA_FLAG)
AC_SUBST(VLS_LCFLAGS)
AC_SUBST(VLS_LIB)
......
......@@ -2,7 +2,7 @@
* netchannel.cpp: network channel
*-------------------------------------------------------------------------------
* (c)1999-2001 VideoLAN
* $Id: netchannel.cpp,v 1.8 2003/08/05 23:18:19 nitrox Exp $
* $Id: netchannel.cpp,v 1.9 2003/08/13 15:59:31 nitrox Exp $
*
* Authors: Benoit Steiner <benny@via.ecp.fr>
* Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
......@@ -76,7 +76,7 @@ C_NetChannel::C_NetChannel(C_Module* pModule,
const C_ChannelConfig& cConfig) : C_Channel(pModule,
cConfig)
{
m_pOutput = NULL;
if(cConfig.m_strDomain == "inet4")
m_pOutput = new C_Net4Output(cConfig);
#ifdef HAVE_IPV6
......
......@@ -2,7 +2,7 @@
* netoutput.cpp: network output
*-------------------------------------------------------------------------------
* (c)1999-2001 VideoLAN
* $Id: netoutput.cpp,v 1.14 2003/08/05 23:18:19 nitrox Exp $
* $Id: netoutput.cpp,v 1.15 2003/08/13 15:59:31 nitrox Exp $
*
* Authors: Benoit Steiner <benny@via.ecp.fr>
* Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
......@@ -62,8 +62,16 @@ C_NetOutput::C_NetOutput(const C_ChannelConfig& cConfig)
m_strSrcHost = cConfig.m_strSrcHost;
m_strSrcPort = cConfig.m_strSrcPort;
m_strDstHost = cConfig.m_strDstHost;
m_strDstPort = cConfig.m_strDstPort;
m_strType = cConfig.m_strType;
if(cConfig.m_strDstPort == "")
{
m_strDstPort = "1234";
}
else
{
m_strDstPort = cConfig.m_strDstPort;
}
m_strType = cConfig.m_strStreamType;
m_strInterface = cConfig.m_strInterface;
m_iTTL = cConfig.m_iTTL;
......
......@@ -2,7 +2,7 @@
* admin.cpp:
*-------------------------------------------------------------------------------
* (c)1999-2001 VideoLAN
* $Id: admin.cpp,v 1.28 2003/08/08 15:57:50 nitrox Exp $
* $Id: admin.cpp,v 1.29 2003/08/13 15:59:31 nitrox Exp $
*
* Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
*
......@@ -506,7 +506,7 @@ int C_Admin::Init()
"deletes a configured broadcast.",
"\"broadcast_del\" deletes a configures broadcast."
"\n");
pStr = new C_String("name");
pStr = new C_String("broadcast");
pCmdDesc->m_vMandatoryArgs.Add(pStr);
pStr = new C_String("force");
pCmdDesc->m_vBooleans.Add(pStr);
......@@ -576,17 +576,11 @@ int C_Admin::Init()
pCmdDesc->BuildUsage();
m_cCmdDescriptions.Add(pCmdDesc->m_strName, pCmdDesc);
pCmdDesc = new C_CommandDesc("set",
"",
"\n");
pStr = new C_String("susp");
pCmdDesc->m_vMandatoryArgs.Add(pStr);
pCmdDesc->BuildUsage();
m_cCmdDescriptions.Add(pCmdDesc->m_strName, pCmdDesc);
#ifdef MANAGER_EXTRA
# define EXTRA_DEF
# include MANAGER_EXTRA
# undef EXTRA_DEF
#endif
// Groups
C_Vector<C_Setting> vGroups = pApp->GetSettings("Groups");
......@@ -890,7 +884,7 @@ C_Answer C_Admin::ParseCmdLine(C_AdminSession* pSession,
if(!pCmdDesc)
{
cAnswer.SetStatus(ADMIN_UNKNOWN_COMMAND);
cAnswer.AddMessage(strCmd + ": unknown command.");
cAnswer.AddMessage(strCmd + ": unknown command.");
return cAnswer;
}
......@@ -1044,7 +1038,7 @@ C_Answer C_Admin::ValidateRequest(C_AdminSession* pSession,
if(!pCmdDesc)
{
cAnswer.SetStatus(ADMIN_UNKNOWN_COMMAND);
cAnswer.AddMessage(strCmd + ": unknown command.");
cAnswer.AddMessage(strCmd + ": unknown command.");
return cAnswer;
}
......@@ -1108,7 +1102,7 @@ C_Answer C_Admin::ValidateRequest(C_AdminSession* pSession,
//------------------------------------------------------------------------------
//
//------------------------------------------------------------------------------
C_Answer C_Admin::HandleRequest(const C_Request& cRequest)
C_Answer C_Admin::HandleRequest(C_Request& cRequest)
{
C_Answer cAnswer("Admin");
......@@ -1119,7 +1113,7 @@ C_Answer C_Admin::HandleRequest(const C_Request& cRequest)
m_cRequestLock.Lock();
C_String strCmd = cRequest.GetCmd();
if(strCmd.Find("help") != GEN_ERR)
if(strCmd.Find("help") != GEN_ERR || strCmd == "help")
{
C_String strArg = cRequest.GetArg("command");
if(strArg.Length() == 0)
......
......@@ -2,7 +2,7 @@
* admin.h: Admin class definition
*-------------------------------------------------------------------------------
* (c)1999-2001 VideoLAN
* $Id: admin.h,v 1.5 2003/02/05 01:25:32 tooney Exp $
* $Id: admin.h,v 1.6 2003/08/13 15:59:31 nitrox Exp $
*
* Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
*
......@@ -170,7 +170,7 @@ class C_Admin : public C_EventHandler, public C_RequestHandler
C_Answer ParseCmdLine(C_AdminSession* pSession, const C_String& strCmdLine,
C_Request& cRequest);
C_Answer ValidateRequest(C_AdminSession* pSession, C_Request& cRequest);
C_Answer HandleRequest(const C_Request& cRequest);
C_Answer HandleRequest(C_Request& cRequest);
// Event handling
void HandleEvent(const C_Event& cEvent);
......
......@@ -2,7 +2,7 @@
* channel.cpp: Channel encapsulation
*-------------------------------------------------------------------------------
* (c)1999-2001 VideoLAN
* $Id: channel.cpp,v 1.6 2003/08/05 23:18:19 nitrox Exp $
* $Id: channel.cpp,v 1.7 2003/08/13 15:59:31 nitrox Exp $
*
* Authors: Benoit Steiner <benny@via.ecp.fr>
* Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
......@@ -67,7 +67,7 @@ C_Channel::C_Channel(C_Module* pModule, const C_ChannelConfig& cConfig) :
C_Channel::~C_Channel()
{
ASSERT(m_pOutput);
delete m_pOutput;
if (m_pOutput) delete m_pOutput;
m_pModule->Unref();
}
......
......@@ -2,7 +2,7 @@
* input.cpp: Input streams
*-------------------------------------------------------------------------------
* (c)1999-2001 VideoLAN
* $Id: input.cpp,v 1.13 2003/06/02 20:48:09 jpsaman Exp $
* $Id: input.cpp,v 1.14 2003/08/13 15:59:31 nitrox Exp $
*
* Authors: Benoit Steiner <benny@via.ecp.fr>
*
......@@ -209,7 +209,7 @@ C_Answer C_Input::StartStreaming(C_Broadcast* pBroadcast)
pBroadcast->SetStatus(BROADCAST_RUNNING);
// Build the answer
cAnswer.SetStatus(NO_ERR);
cAnswer.SetStatus(ANS_NO_ERR);
cAnswer.AddMessage("Program " + strPgrmName + " started");
}
catch(E_Exception e)
......@@ -499,7 +499,8 @@ C_Answer C_Input::StopStreaming(C_Broadcast* pBroadcast)
// Ask the child to stop the streaming
if((pBroadcast->GetStatus() == BROADCAST_RUNNING) ||
(pBroadcast->GetStatus() == BROADCAST_FORWARD) ||
(pBroadcast->GetStatus() == BROADCAST_REWIND) ) {
(pBroadcast->GetStatus() == BROADCAST_REWIND) ||
(pBroadcast->GetStatus() == BROADCAST_SUSPENDED)) {
LogDbg(m_hLog, "Stopping reception of pgrm "+strPgrmName);
OnStopStreaming(pBroadcast);
pBroadcast->SetStatus(BROADCAST_STOPPED);
......
This diff is collapsed.
......@@ -2,7 +2,7 @@
* manager.h: Manager class definition
*-------------------------------------------------------------------------------
* (c)1999-2001 VideoLAN
* $Id: manager.h,v 1.9 2003/08/08 15:57:50 nitrox Exp $
* $Id: manager.h,v 1.10 2003/08/13 15:59:31 nitrox Exp $
*
* Authors: Benoit Steiner <benny@via.ecp.fr>
* Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
......@@ -44,7 +44,7 @@ class C_Manager : public C_RequestHandler, public C_EventHandler
int Destroy();
// Handlers
virtual C_Answer HandleRequest(const C_Request& cRequest);
virtual C_Answer HandleRequest(C_Request& cRequest);
virtual void HandleEvent(const C_Event& cEvent);
protected:
......@@ -64,31 +64,29 @@ class C_Manager : public C_RequestHandler, public C_EventHandler
void StopPrograms();
// Commands processing
C_Answer Ls(const C_Request& cRequest);
C_Answer Browse(const C_Request& cRequest);
C_Answer Show(const C_Request& cRequest);
C_Answer Start(const C_Request& cRequest);
C_Answer Config(const C_Request& cRequest);
C_Answer Program(const C_Request& cRequest);
C_Answer Input(const C_Request& cRequest);
C_Answer Channel(const C_Request& cRequest);
C_Answer Broadcast(const C_Request& cRequest);
C_Answer Broadcast_Ls(const C_Request& cRequest);
C_Answer Broadcast_Add(const C_Request& cRequest);
C_Answer Broadcast_Del(const C_Request& cRequest);
C_Answer Broadcast_Start(const C_Request& cRequest);
C_Answer Broadcast_Resume(const C_Request& cRequest);
C_Answer Broadcast_Suspend(const C_Request& cRequest);
C_Answer Broadcast_Stop(const C_Request& cRequest);
C_Answer Broadcast_Forward(const C_Request& cRequest);
C_Answer Broadcast_Rewind(const C_Request& cRequest);
C_Answer Channel_Ls(const C_Request& cRequest);
C_Answer Channel_Add(const C_Request& cRequest);
C_Answer Channel_Del(const C_Request& cRequest);
C_Answer Program_Ls(const C_Request& cRequest);
C_Answer Ls(C_Request& cRequest);
C_Answer Config(C_Request& cRequest);
C_Answer Broadcast_Ls(C_Request& cRequest);
C_Answer Broadcast_Add(C_Request& cRequest);
C_Answer Broadcast_Del(C_Request& cRequest);
C_Answer Broadcast_Start(C_Request& cRequest);
C_Answer Broadcast_Resume(C_Request& cRequest);
C_Answer Broadcast_Suspend(C_Request& cRequest);
C_Answer Broadcast_Stop(C_Request& cRequest);
C_Answer Broadcast_Forward(C_Request& cRequest);
C_Answer Broadcast_Rewind(C_Request& cRequest);
C_Answer Channel_Ls(C_Request& cRequest);
C_Answer Channel_Add(C_Request& cRequest);
C_Answer Channel_Del(C_Request& cRequest);
C_Answer Program_Ls(C_Request& cRequest);
#ifdef MANAGER_EXTRA
# define EXTRA_DECL
# include MANAGER_EXTRA
# undef EXTRA_DECL
#endif
virtual void PrivHandleEvent(const C_Event& cEvent);
C_Broadcast* CreateBroadcast(C_String&,C_String&,
......@@ -113,8 +111,7 @@ private:
C_Repository<C_String, C_Channel> m_cChannelList;
//Functions
//C_Answer (C_Manager::**m_cFunctionsTable)(const C_Request&);
C_HashTable<C_String, C_Answer (C_Manager::*)(const C_Request&)> m_cFunctions;
C_HashTable<C_String, C_Answer (C_Manager::*)(C_Request&)> m_cFunctions;
// Programs
C_PgrmDirectory m_cProgramList;
......
This diff is collapsed.
......@@ -2,7 +2,7 @@
* manager_broadcast.cpp: Brodacast mtehods for Vls manager
*-------------------------------------------------------------------------------
* (c)1999-2003 VideoLAN
* $Id: manager_broadcast.cpp,v 1.3 2003/08/08 15:57:50 nitrox Exp $
* $Id: manager_broadcast.cpp,v 1.4 2003/08/13 15:59:31 nitrox Exp $
*
* Authors: Damien Lucas <damien.lucas@anevia.com>
* Benoit Steiner <benny@via.ecp.fr>
......@@ -86,7 +86,7 @@ C_Broadcast* C_Manager::CreateBroadcast(C_String& strName,
C_Answer C_Manager::Broadcast_Ls(const C_Request& cRequest)
C_Answer C_Manager::Broadcast_Ls(C_Request& cRequest)
{
C_Answer cAnswer("Manager");
......@@ -103,6 +103,7 @@ C_Answer C_Manager::Broadcast_Ls(const C_Request& cRequest)
C_Broadcast* pBroadcast = cIterator1.GetNextItem();
C_Answer cBroadcast(pBroadcast->GetChannel()->GetName());
cBroadcast.SetStatus(NO_ERR);
cBroadcast.AddMessage("broadcast "+pBroadcast->GetName());
cBroadcast.AddMessage("channel "+pBroadcast->GetChannel()->GetName());
cBroadcast.AddMessage("program "+pBroadcast->GetProgram()->GetName());
cBroadcast.AddMessage("input "+pBroadcast->GetInput()->GetName());
......@@ -120,7 +121,7 @@ C_Answer C_Manager::Broadcast_Ls(const C_Request& cRequest)
return cAnswer;
}
C_Answer C_Manager::Broadcast_Add(const C_Request& cRequest)
C_Answer C_Manager::Broadcast_Add(C_Request& cRequest)
{
C_Answer cAnswer("Manager");
C_Broadcast* pBroadcast;
......@@ -144,18 +145,17 @@ C_Answer C_Manager::Broadcast_Add(const C_Request& cRequest)
}
C_Answer C_Manager::Broadcast_Del(const C_Request& cRequest)
C_Answer C_Manager::Broadcast_Del(C_Request& cRequest)
{
C_Answer cAnswer("Manager");
cAnswer.SetStatus(ANS_NO_ERR);
C_String strName = cRequest.GetArg("name");
// Lock the broadcast list
m_cBroadcastsList.Lock();
C_String strName = cRequest.GetArg("broadcast");
// check if broadcast is already known
C_Broadcast* pBroadcast = m_cBroadcastsList.Get(strName);
if(!pBroadcast)
{
cAnswer.SetStatus(ANS_BROADCAST_UNKNOWN);
......@@ -176,9 +176,9 @@ C_Answer C_Manager::Broadcast_Del(const C_Request& cRequest)
cAnswer.Add(cInputAnswer);
//Release repository items (Channel, Program, Input)
m_cChannelList.Release(pBroadcast->GetChannel()->GetName());
m_cProgramList.ReleasePgrm(pBroadcast->GetProgram()->GetName());
m_cInputList.Release(pInput->GetName());
// m_cChannelList.Release(pBroadcast->GetChannel()->GetName());
// m_cProgramList.ReleasePgrm(pBroadcast->GetProgram()->GetName());
// m_cInputList.Release(pInput->GetName());
}
else
{
......@@ -186,13 +186,15 @@ C_Answer C_Manager::Broadcast_Del(const C_Request& cRequest)
cAnswer.AddMessage("Broadcast is busy");
pBroadcast = NULL;
m_cBroadcastsList.Release(strName);
m_cBroadcastsList.UnLock();
return cAnswer;
}
}
m_cBroadcastsList.Release(strName);
// Lock the broadcast list
m_cBroadcastsList.Lock();
// So now, we can remove broadcast from all the lists
int iRc = m_cBroadcastsList.Remove(strName);
......@@ -220,7 +222,7 @@ C_Answer C_Manager::Broadcast_Del(const C_Request& cRequest)
C_Answer C_Manager::Broadcast_Start(const C_Request& cRequest)
C_Answer C_Manager::Broadcast_Start(C_Request& cRequest)
{
C_Answer cAnswer("Manager");
......@@ -253,7 +255,7 @@ C_Answer C_Manager::Broadcast_Start(const C_Request& cRequest)
//------------------------------------------------------------------------------
//
//------------------------------------------------------------------------------
C_Answer C_Manager::Broadcast_Resume(const C_Request& cRequest)
C_Answer C_Manager::Broadcast_Resume(C_Request& cRequest)
{
C_Answer cAnswer("Manager");
cAnswer.SetStatus(ANS_NO_ERR);
......@@ -293,7 +295,7 @@ C_Answer C_Manager::Broadcast_Resume(const C_Request& cRequest)
//------------------------------------------------------------------------------
//
//------------------------------------------------------------------------------
C_Answer C_Manager::Broadcast_Suspend(const C_Request& cRequest)
C_Answer C_Manager::Broadcast_Suspend(C_Request& cRequest)
{
C_Answer cAnswer("Manager");
cAnswer.SetStatus(ANS_NO_ERR);
......@@ -332,7 +334,7 @@ C_Answer C_Manager::Broadcast_Suspend(const C_Request& cRequest)
//------------------------------------------------------------------------------
//
//------------------------------------------------------------------------------
C_Answer C_Manager::Broadcast_Forward(const C_Request& cRequest)
C_Answer C_Manager::Broadcast_Forward(C_Request& cRequest)
{
C_Answer cAnswer("Manager");
cAnswer.SetStatus(ANS_NO_ERR);
......@@ -373,7 +375,7 @@ C_Answer C_Manager::Broadcast_Forward(const C_Request& cRequest)
//------------------------------------------------------------------------------
//
//------------------------------------------------------------------------------
C_Answer C_Manager::Broadcast_Rewind(const C_Request& cRequest)
C_Answer C_Manager::Broadcast_Rewind(C_Request& cRequest)
{
C_Answer cAnswer("Manager");
cAnswer.SetStatus(ANS_NO_ERR);
......@@ -412,7 +414,7 @@ C_Answer C_Manager::Broadcast_Rewind(const C_Request& cRequest)
//------------------------------------------------------------------------------
//
//------------------------------------------------------------------------------
C_Answer C_Manager::Broadcast_Stop(const C_Request& cRequest)
C_Answer C_Manager::Broadcast_Stop(C_Request& cRequest)
{
C_Answer cAnswer("Manager");
cAnswer.SetStatus(ANS_NO_ERR);
......
......@@ -2,7 +2,7 @@
* manager_channel.cpp: Channel methods for Vls manager
*-------------------------------------------------------------------------------
* (c)1999-2003 VideoLAN
* $Id: manager_channel.cpp,v 1.3 2003/08/05 23:18:19 nitrox Exp $
* $Id: manager_channel.cpp,v 1.4 2003/08/13 15:59:31 nitrox Exp $
*
* Authors: Damien Lucas <damien.lucas@anevia.com>
* Benoit Steiner <benny@via.ecp.fr>
......@@ -25,7 +25,7 @@
*-------------------------------------------------------------------------------
*
*******************************************************************************/
C_Answer C_Manager::Channel_Ls(const C_Request& cRequest)
C_Answer C_Manager::Channel_Ls(C_Request& cRequest)
{
C_Answer cAnswer("Manager");
cAnswer.AddMessage("channels");
......@@ -83,7 +83,7 @@ C_Answer C_Manager::Channel_Ls(const C_Request& cRequest)
C_Answer C_Manager::Channel_Add (const C_Request& cRequest)
C_Answer C_Manager::Channel_Add (C_Request& cRequest)
{
C_ChannelConfig cConfig;
C_Answer cAnswer("Manager");
......@@ -174,12 +174,12 @@ C_Answer C_Manager::Channel_Add (const C_Request& cRequest)
C_Answer C_Manager::Channel_Del(const C_Request& cRequest)
C_Answer C_Manager::Channel_Del(C_Request& cRequest)
{
C_Answer cAnswer("Manager");
cAnswer.SetStatus(ANS_NO_ERR);
C_String strChannelName = cRequest.GetArg("name");
C_String strChannelName = cRequest.GetArg("channel");
ASSERT(strChannelName != "");
/* C_String strChannelType = cRequest.GetArg("type");
......
......@@ -2,7 +2,7 @@
* manager_broadcast.cpp: Brodacast mtehods for Vls manager
*-------------------------------------------------------------------------------
* (c)1999-2003 VideoLAN
* $Id: manager_program.cpp,v 1.1 2003/08/05 23:18:19 nitrox Exp $
* $Id: manager_program.cpp,v 1.2 2003/08/13 15:59:31 nitrox Exp $
*
* Authors: Damien Lucas <damien.lucas@anevia.com>
* Benoit Steiner <benny@via.ecp.fr>
......@@ -27,7 +27,7 @@
*******************************************************************************/
C_Answer C_Manager::Program_Ls(const C_Request& pRequest)
C_Answer C_Manager::Program_Ls(C_Request& pRequest)
{
C_Answer cAnswer("Manager");
cAnswer.AddMessage("programs");
......
......@@ -2,7 +2,7 @@
* request.h: User requests encapsulation
*-------------------------------------------------------------------------------
* (c)1999-2001 VideoLAN
* $Id: request.h,v 1.5 2003/08/04 08:27:23 nitrox Exp $
* $Id: request.h,v 1.6 2003/08/13 15:59:31 nitrox Exp $
*
* Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
*
......@@ -47,7 +47,7 @@ class C_Broadcast;
#define ANS_CHANNEL_UNKNOWN 0x611 // Channel is unknown
#define ANS_CHANNEL_BUSY 0x612 // Channel is busy
#define ANS_INPUT_UNKNOWN 0X631 // Input is unknown
#define ANS_INPUT_UNKNOWN 0X404 // Input is unknown
#define ANS_BROADCAST_UNKNOWN 0x641 // Broadcast is unknown
#define ANS_BROADCAST_BUSY 0x642 // Broadcast is busy
......@@ -233,7 +233,7 @@ private:
class C_RequestHandler
{
public:
virtual C_Answer HandleRequest(const C_Request& cRequest) = 0;
virtual C_Answer HandleRequest(C_Request& cRequest) = 0;
};
......@@ -259,7 +259,7 @@ public:
class C_RequestHub
{
public:
virtual C_Answer ForwardRequest(const C_Request& cRequest) = 0;
virtual C_Answer ForwardRequest(C_Request& cRequest) = 0;
};
......
......@@ -2,7 +2,7 @@
* vls.cpp: vls main file
*-------------------------------------------------------------------------------
* (c)1999-2001 VideoLAN
* $Id: vls.cpp,v 1.14 2003/08/04 08:27:23 nitrox Exp $
* $Id: vls.cpp,v 1.15 2003/08/13 15:59:31 nitrox Exp $
*
* Authors: Benoit Steiner <benny@via.ecp.fr>
*
......@@ -214,7 +214,7 @@ int C_Vls::OnAppDestroy()
//------------------------------------------------------------------------------
//
//------------------------------------------------------------------------------
C_Answer C_Vls::ForwardRequest(const C_Request& cRequest)
C_Answer C_Vls::ForwardRequest(C_Request& cRequest)
{
// For now, request only come from the admin and go to the manager: simply
// forward the request to the manager
......
......@@ -2,7 +2,7 @@
* vls.h: vls class definition
*-------------------------------------------------------------------------------
* (c)1999-2001 VideoLAN
* $Id: vls.h,v 1.4 2002/09/30 09:39:30 jpsaman Exp $
* $Id: vls.h,v 1.5 2003/08/13 15:59:31 nitrox Exp $
*
* Authors: Benoit Steiner <benny@via.ecp.fr>
*
......@@ -49,7 +49,7 @@ protected:
virtual int OnAppExit();
virtual int OnAppDestroy();
virtual C_Answer ForwardRequest(const C_Request& cRequest);
virtual C_Answer ForwardRequest(C_Request& cRequest);
virtual void ForwardEvent(const C_Event& cEvent);
int CheckEnvir();
......
......@@ -17,7 +17,7 @@ BEGIN "Groups"
# groupname = "cmd1|cmd2|..."
# --- Example:
monitor = "help|browse|logout"
master = "cd|ls|help|browse|start|broadcast_resume|broadcast_suspend|broadcast_stop|shutdown|logout|config|program|input|channel|show|broadcast_ls|broadcast_add|broadcast_del|channel_add|broadcast_start"
master = "cd|ls|help|browse|start|broadcast_resume|broadcast_suspend|broadcast_stop|shutdown|logout|config|program|input|channel|show|broadcast_ls|broadcast_add|broadcast_del|channel_add|broadcast_start|channel_add|channel_del"
END
# The section "Users" describes each user
......
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