Blinker

@@ -15,6 +15,8 @@

 #include "ListTracker.h"

 #include "Mgrs.h"

 #include "Module.h"

+#include "OpConn.h"

+#include "OpConnIf.h"

 #include "SettingFile.h"

 #include "Time.h"

 #include "TimeCallee.h"

@@ -23,7 +25,7 @@ namespace Blinker {

 /// phone connector (using EBIP)

 template<typename ADDR, typename SOCK>

-class Phone: public IoCallee, public Module, public TimeCallee

+class Phone: public IoCallee, public Module, public OpConnIf, public TimeCallee

 {

 protected:

   /// type for address setting file

@@ -38,6 +40,12 @@ protected:

   /// map of extensions to call (extension name  -> module name)

   typedef std::map<std::string, std::string> ExtMap;

+  /// map from line number to connection

+  typedef std::map<unsigned int, OpConn *> LineConnMap;

+

+  /// map from connection to line number

+  typedef std::map<OpConn *, unsigned int> ConnLineMap;

+

 public:

   /**

    * @brief constructor

@@ -75,6 +83,12 @@ public:

    */

   virtual void ioWriteCall(Io *io);

+  /**

+   * @brief operator connection is closed

+   * @param[in] pConn operator connection object

+   */

+  virtual void opConnClose(OpConn *pConn);

+

 protected:

   /// (re-)read server address

   void readServer();

@@ -91,6 +105,12 @@ protected:

   /// send heartbeat to server

   void sendHeartbeat();

+  /**

+   * @brief send hangup message

+   * @param[in] line number of line to hangup

+   */

+  void sendHangup(unsigned int line);

+

   /**

    * @brief send message to server

    * @param[in] msg message to send

@@ -106,6 +126,26 @@ protected:

    */

   void serverMsg(const std::string &msg);

+  /**

+   * @brief process incoming call

+   * @param[in] line number of phone line

+   * @param[in] extension extenstion called (i.e. phone number)

+   */

+  void incomingCall(unsigned int line, const std::string &extension);

+

+  /**

+   * @brief hangup on phone line

+   * @param[in] line number of phone line

+   */

+  void hangup(unsigned int line);

+

+  /**

+   * @brief key pressed on phone line

+   * @param[in] line number of phone line

+   * @param[in] key key that has been pressed

+   */

+  void keyPressed(unsigned int line, char key);

+

   /// update time callback

   void updateTimeCallback();

@@ -121,6 +161,8 @@ protected:

   Time           m_timeRegister;   ///< time to re-register

   Time           m_timeHeartbeat;  ///< time to send next heartbeat

   ExtMap         m_extMap;         ///< map of extensions to call

+  LineConnMap    m_lineConnMap;    ///< map from line number to connection

+  ConnLineMap    m_connLineMap;    ///< map from connection to line number

 }; // class Phone

 } // namespace Blinker

@@ -6,6 +6,7 @@

 #ifndef BLINKER_PHONE_IMPL_H

 #define BLINKER_PHONE_IMPL_H

+#include <sstream>

 #include <string>

 #include "Directory.h"

@@ -15,6 +16,9 @@

 #include "ListTracker_impl.h"

 #include "Mgrs.h"

 #include "Module.h"

+#include "OpConn.h"

+#include "OpConnIf.h"

+#include "OpMgr.h"

 #include "Phone.h"

 #include "PhoneExtension.h"

 #include "PhoneExtension_impl.h"

@@ -55,6 +59,14 @@ Phone<ADDR, SOCK>::~Phone()

   // unload extensions

   m_extListTracker.clear();

+  // close all connections

+  while (!m_connLineMap.empty()) {

+    ConnLineMap::iterator it = m_connLineMap.begin();

+    it->first->close();

+    sendHangup(it->second);

+    m_connLineMap.erase(it);

+  }

+

   // destroy socket

   destroySock();

@@ -117,6 +129,27 @@ void Phone<ADDR, SOCK>::ioWriteCall(Io *io)

   (void)io; // unused

 }

+/**

+ * @brief operator connection is closed

+ * @param[in] pConn operator connection object

+ */

+template<typename ADDR, typename SOCK>

+void Phone<ADDR, SOCK>::opConnClose(OpConn *pConn)

+{

+  // get phone line of connection

+  ConnLineMap::iterator itConn = m_connLineMap.find(pConn);

+  if (itConn == m_connLineMap.end())

+    return;

+  unsigned int line = itConn->second;

+

+  // send hangup message

+  sendHangup(line);

+

+  // remove connection from maps

+  m_connLineMap.erase(itConn);

+  m_lineConnMap.erase(line);

+}

+

 /// (re-)read server address

 template<typename ADDR, typename SOCK>

 void Phone<ADDR, SOCK>::readServer()

@@ -197,6 +230,18 @@ void Phone<ADDR, SOCK>::sendHeartbeat()

   updateTimeCallback();

 }

+/**

+ * @brief send hangup message

+ * @param[in] line number of line to hangup

+ */

+template<typename ADDR, typename SOCK>

+void Phone<ADDR, SOCK>::sendHangup(unsigned int line)

+{

+  std::stringstream strm;

+  strm << line << ":hangup";

+  send(strm.str());

+}

+

 /**

  * @brief send message to server

  * @param[in] msg message to send

@@ -246,9 +291,8 @@ void Phone<ADDR, SOCK>::receiveFromSock()

 template<typename ADDR, typename SOCK>

 void Phone<ADDR, SOCK>::serverMsg(const std::string &msg)

 {

-  StringParser parser(msg);

-

   // get line number and command

+  StringParser parser(msg);

   unsigned int line;

   std::string cmd;

   if (!parser.uintNo(line) || !parser.fixChr(':') ||

@@ -261,12 +305,12 @@ void Phone<ADDR, SOCK>::serverMsg(const std::string &msg)

     if (!parser.fixChr(':') || !parser.untilDelim(":", true, caller) ||

         !parser.fixChr(':') || !parser.untilDelim(":", false, extension))

       return;

-    // TODO incomingCall(line, extension);

+    incomingCall(line, extension);

   }

   // hangup

   else if (cmd == "onhook") {

-    // TODO hangup(line);

+    hangup(line);

   }

   // DTMF symbol (i.e. key pressed)

@@ -274,8 +318,75 @@ void Phone<ADDR, SOCK>::serverMsg(const std::string &msg)

     char key;

     if (!parser.fixChr(':') || !parser.oneChrOf("0123456789*#", key))

       return;

-    // TODO keyPressed(line, key);

+    keyPressed(line, key);

+  }

+}

+

+/**

+ * @brief process incoming call

+ * @param[in] line number of phone line

+ * @param[in] extension extenstion called (i.e. phone number)

+ */

+template<typename ADDR, typename SOCK>

+void Phone<ADDR, SOCK>::incomingCall(unsigned int line,

+                                     const std::string &extension)

+{

+  // hangup old call on this line (to be on the safe side)

+  hangup(line);

+

+  // lookup extension

+  ExtMap::iterator itExt = m_extMap.find(extension);

+  if (itExt == m_extMap.end())

+    return; // unknown extension -> ignore

+

+  // try to open operator connection to module

+  OpConn *pConn = m_mgrs.m_opMgr.connect(itExt->second, this);

+  if (!pConn) // module is not ready for connection

+    return;

+

+  // add connection to maps

+  m_lineConnMap[line] = pConn;

+  m_connLineMap[pConn] = line;

 }

+

+/**

+ * @brief hangup on phone line

+ * @param[in] line number of phone line

+ */

+template<typename ADDR, typename SOCK>

+void Phone<ADDR, SOCK>::hangup(unsigned int line)

+{

+  // get connection

+  LineConnMap::iterator itLine = m_lineConnMap.find(line);

+  if (itLine == m_lineConnMap.end())

+    return; // no connection on this line

+  OpConn *pConn = itLine->second;

+

+  // close connection

+  pConn->close();

+

+  // remove connection from maps

+  m_lineConnMap.erase(itLine);

+  m_connLineMap.erase(pConn);

+}

+

+/**

+ * @brief key pressed on phone line

+ * @param[in] line number of phone line

+ * @param[in] key key that has been pressed

+ */

+template<typename ADDR, typename SOCK>

+void Phone<ADDR, SOCK>::keyPressed(unsigned int line, char key)

+{

+  // get connection

+  LineConnMap::iterator itLine = m_lineConnMap.find(line);

+  if (itLine == m_lineConnMap.end())

+    return; // no connection on this line

+  OpConn *pConn = itLine->second;

+

+  // TODO

+  (void)pConn;

+  (void)key;

 }

 /// update time callback