Blinker

@@ -145,10 +145,14 @@ protected:

 protected:

   SettingFile m_fileInStream; ///< input stream name file

   SettingFile m_fileBind;     ///< bind address file

+  Directory   m_dirDestsBlp;  ///< static BLP destinations directory

+  Directory   m_dirDestsEblp; ///< static EBLP destinations directory

   Directory   m_dirDestsMcuf; ///< static MCUF destinations directory

   std::string m_nameInStream; ///< name of input stream

   Stream      *m_pInStream;   ///< input stream

   SOCK        *m_pSock;       ///< socket to use for sending streams

+  Dests        m_destsBlp;    ///< current static BLP destinations

+  Dests        m_destsEblp;   ///< current static EBLP destinations

   Dests        m_destsMcuf;   ///< current static MCUF destinations

 }; // class Sender

@@ -168,6 +172,8 @@ Sender<ADDR, SOCK>::Sender(CallMgr &callMgr, StreamMgr &streamMgr,

   Module(callMgr, streamMgr, dirBase),

   m_fileInStream(dirBase.getFile("instream")),

   m_fileBind(dirBase.getFile("bind")),

+  m_dirDestsBlp(dirBase.getSubdir("blp")),

+  m_dirDestsEblp(dirBase.getSubdir("eblp")),

   m_dirDestsMcuf(dirBase.getSubdir("mcuf")),

   m_pInStream(NULL),

   m_pSock(NULL)

@@ -178,6 +184,8 @@ Sender<ADDR, SOCK>::Sender(CallMgr &callMgr, StreamMgr &streamMgr,

   createSock();

   // load static destinations

+  updateDestsFull(m_dirDestsBlp, m_destsBlp, BlinkenProtoBlp);

+  updateDestsFull(m_dirDestsEblp, m_destsEblp, BlinkenProtoEblp);

   updateDestsFull(m_dirDestsMcuf, m_destsMcuf, BlinkenProtoMcuf);

 }

@@ -214,6 +222,14 @@ void Sender<ADDR, SOCK>::updateConfig()

   // static destinations update

   // (directory modified -> full, otherwise -> light)

+  if (m_dirDestsBlp.checkModified())

+    updateDestsFull(m_dirDestsBlp, m_destsBlp, BlinkenProtoBlp);

+  else

+    updateDestsLight(m_destsBlp, BlinkenProtoBlp);

+  if (m_dirDestsEblp.checkModified())

+    updateDestsFull(m_dirDestsEblp, m_destsEblp, BlinkenProtoEblp);

+  else

+    updateDestsLight(m_destsEblp, BlinkenProtoEblp);

   if (m_dirDestsMcuf.checkModified())

     updateDestsFull(m_dirDestsMcuf, m_destsMcuf, BlinkenProtoMcuf);

   else

@@ -227,14 +243,22 @@ void Sender<ADDR, SOCK>::updateConfig()

 template<typename ADDR, typename SOCK>

 void Sender<ADDR, SOCK>::setFrame(stBlinkenFrame *pFrame)

 {

-  std::string mcuf;

+  std::string blp, eblp, mcuf;

   // convert frame to protocol data

+  if (!m_destsBlp.empty())

+    frame2data(pFrame, BlinkenProtoBlp, blp);

+  if (!m_destsEblp.empty())

+    frame2data(pFrame, BlinkenProtoEblp, eblp);

   if (!m_destsMcuf.empty())

     frame2data(pFrame, BlinkenProtoMcuf, mcuf);

-  // send frame to all static MCUF destinations

+  // send frame to all static destinations

   typename Dests::const_iterator itDest;

+  for (itDest = m_destsBlp.begin(); itDest != m_destsBlp.end(); ++itDest)

+    sendFrame(blp, itDest->m_addr);

+  for (itDest = m_destsEblp.begin(); itDest != m_destsEblp.end(); ++itDest)

+    sendFrame(eblp, itDest->m_addr);

   for (itDest = m_destsMcuf.begin(); itDest != m_destsMcuf.end(); ++itDest)

     sendFrame(mcuf, itDest->m_addr);

@@ -246,14 +270,22 @@ void Sender<ADDR, SOCK>::setFrame(stBlinkenFrame *pFrame)

 template<typename ADDR, typename SOCK>

 void Sender<ADDR, SOCK>::setNoFrame()

 {

-  std::string mcuf;

+  std::string blp, eblp, mcuf;

   // get "no frame" protocol data

+  if (!m_destsBlp.empty())

+    noFrame2data(BlinkenProtoBlp, blp);

+  if (!m_destsEblp.empty())

+    noFrame2data(BlinkenProtoEblp, eblp);

   if (!m_destsMcuf.empty())

     noFrame2data(BlinkenProtoMcuf, mcuf);

-  // send "no frame" to all static MCUF destinations

+  // send "no frame" to all staticdestinations

   typename Dests::const_iterator itDest;

+  for (itDest = m_destsBlp.begin(); itDest != m_destsBlp.end(); ++itDest)

+    sendFrame(blp, itDest->m_addr);

+  for (itDest = m_destsEblp.begin(); itDest != m_destsEblp.end(); ++itDest)

+    sendFrame(eblp, itDest->m_addr);

   for (itDest = m_destsMcuf.begin(); itDest != m_destsMcuf.end(); ++itDest)

     sendFrame(mcuf, itDest->m_addr);

@@ -522,7 +554,7 @@ void Sender<ADDR, SOCK>::noFrame2data(etBlinkenProto proto, std::string &data)

 {

   // obtain "no frame" protcol data

   (void)proto; // FIXME

-  data.clear(); // FIXME

+  data.assign("", 1); // FIXME

 }

 /* ################