@@ -9,3 +9,4 @@ getarch

 getos

 sems

 sems-stats

+core/etc/*.conf

\ No newline at end of file

@@ -7,7 +7,9 @@ GIT = $(shell which git)

 SVNVERSION = $(shell which svnversion)

 ifneq ($(GIT),)

-   SCM_REV = $(shell if git --help describe |grep dirty 2>&1 >/dev/null ; then git describe --always --dirty; else git describe --always ; fi) 

+   SCM_REV = $(shell if git --help describe |grep dirty 2>&1 >/dev/null ; \

+        then git describe --always --dirty 2>/dev/null; \

+        else git describe --always 2>/dev/null; fi)

 endif

 ifeq ($(SCM_REV),)

@@ -112,7 +112,7 @@ void AnnounceTransferDialog::onSessionStart(const AmSipRequest& req)

     status = Announcing;

     callee_uri = get_session_param(req.hdrs, "Refer-To");

     if (!callee_uri.length()) {

-      callee_uri = getHeader(req.hdrs, "P-Refer-To");

+      callee_uri = getHeader(req.hdrs, "P-Refer-To", true);

       if (callee_uri.length()) {

 	INFO("Use of P-Refer-To header is deprecated. "

 	     "Use '%s: Refer-To=<uri>' instead.\n",PARAM_HDR);

@@ -140,7 +140,7 @@ void AnnounceTransferDialog::onSipRequest(const AmSipRequest& req)

      (req.method == "NOTIFY")) {

     try {

-      if (strip_header_params(getHeader(req.hdrs,"Event", "o")) != "refer") 

+      if (strip_header_params(getHeader(req.hdrs,"Event", "o", true)) != "refer") 

 	throw AmSession::Exception(481, "Subscription does not exist");

       if ((strip_header_params(req.content_type) != "message/sipfrag"))

@@ -142,7 +142,7 @@ void AnnRecorderFactory::getAppParams(const AmSipRequest& req, map<string, strin

     typ = DEFAULT_TYPE;

   }

   else {

-    string iptel_app_param = getHeader(req.hdrs, PARAM_HDR);

+    string iptel_app_param = getHeader(req.hdrs, PARAM_HDR, true);

     if (!iptel_app_param.length()) {

       throw AmSession::Exception(500, MOD_NAME ": parameters not found");

@@ -113,7 +113,7 @@ void AuthB2BDialog::onInvite(const AmSipRequest& req)

   setInOut(NULL,NULL); 

   if (AuthB2BFactory::user.empty()) {

-    string app_param = getHeader(req.hdrs, PARAM_HDR);

+    string app_param = getHeader(req.hdrs, PARAM_HDR, true);

     if (!app_param.length()) {

       AmSession::Exception(500, "auth_b2b: parameters not found");

@@ -321,7 +321,7 @@ void AuthB2BCalleeSession::onSipReply(const AmSipReply& reply, int old_dlg_statu

   }

   unsigned int cseq_before = dlg.cseq;

-  if (!auth->onSipReply(reply)) {

+  if (!auth->onSipReply(reply, old_dlg_status)) {

       AmB2BCalleeSession::onSipReply(reply,old_dlg_status);

   } else {

     if (cseq_before != dlg.cseq) {

@@ -88,7 +88,7 @@ AmSession* CallTimerFactory::onInvite(const AmSipRequest& req)

      throw AmSession::Exception(500,"could not get a user timer reference");

   }

-  string app_param = getHeader(req.hdrs, PARAM_HDR);

+  string app_param = getHeader(req.hdrs, PARAM_HDR, true);

   unsigned int call_time = CallTimerFactory::DefaultCallTimer;

@@ -379,22 +379,22 @@ void ConferenceDialog::onSessionStart(const AmSipRequest& req)

   int i, len;

   string lonely_user_file;

-  string app_param_hdr = getHeader(req.hdrs, PARAM_HDR);

+  string app_param_hdr = getHeader(req.hdrs, PARAM_HDR, true);

   if (app_param_hdr.length()) {

     from_header = get_header_keyvalue(app_param_hdr, "Dialout-From");

     extra_headers = get_header_keyvalue(app_param_hdr, "Dialout-Extra");

     dialout_suffix = get_header_keyvalue(app_param_hdr, "Dialout-Suffix");      

     language = get_header_keyvalue(app_param_hdr, "Language");      

   } else {

-    from_header = getHeader(req.hdrs, "P-Dialout-From");

-    extra_headers = getHeader(req.hdrs, "P-Dialout-Extra");

-    dialout_suffix = getHeader(req.hdrs, "P-Dialout-Suffix");

+    from_header = getHeader(req.hdrs, "P-Dialout-From", true);

+    extra_headers = getHeader(req.hdrs, "P-Dialout-Extra", true);

+    dialout_suffix = getHeader(req.hdrs, "P-Dialout-Suffix", true);

     if (from_header.length() || extra_headers.length() 

 	|| dialout_suffix.length()) {

       DBG("Warning: P-Dialout- style headers are deprecated."

 	  " Please use P-App-Param header instead.\n");

     }

-    language = getHeader(req.hdrs, "P-Language");

+    language = getHeader(req.hdrs, "P-Language", true);

     if (language.length()) {

       DBG("Warning: P-Language header is deprecated."

 	  " Please use P-App-Param header instead.\n");

@@ -837,14 +837,14 @@ void ConferenceDialog::onSipRequest(const AmSipRequest& req)

   dlg.remote_tag = "";

   // get route set and next hop

-  string iptel_app_param = getHeader(req.hdrs, PARAM_HDR);

+  string iptel_app_param = getHeader(req.hdrs, PARAM_HDR, true);

   if (iptel_app_param.length()) {

     dlg.route = get_header_keyvalue(iptel_app_param,"Transfer-RR");

   } else {

     INFO("Use of P-Transfer-RR/P-Transfer-NH is deprecated. "

 	 "Use '%s: Transfer-RR=<rr>;Transfer-NH=<nh>' instead.\n",PARAM_HDR);

-    dlg.route = getHeader(req.hdrs,"P-Transfer-RR");

+    dlg.route = getHeader(req.hdrs,"P-Transfer-RR", true);

   }

   DBG("ConferenceDialog::onSipRequest: local_party = %s\n",dlg.local_party.c_str());

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

 #include "DSMChartReader.h"

 #include "AmSipHeaders.h"

 #include "AmEventDispatcher.h"

+#include "SystemDSM.h"

 #include <string>

 #include <fstream>

@@ -63,6 +64,7 @@ DSMFactory* DSMFactory::instance()

 bool DSMFactory::DebugDSM;

 string DSMFactory::InboundStartDiag;

 string DSMFactory::OutboundStartDiag;

+bool DSMFactory::CheckDSM;

 #ifdef USE_MONITORING

 bool DSMFactory::MonitoringFullCallgraph;

@@ -70,8 +72,10 @@ bool DSMFactory::MonitoringFullTransitions;

 MonSelectType DSMFactory::MonSelectCaller;

 MonSelectType DSMFactory::MonSelectCallee;

+vector<string> DSMFactory::MonSelectFilters;

 string DSMFactory::MonSelectFallback;

+

 #endif // USE_MONITORING

 DSMFactory::DSMFactory(const string& _app_name)

@@ -122,6 +126,7 @@ int DSMFactory::onLoad()

   configureModule(cfg);

   DebugDSM = cfg.getParameter("debug_raw_dsm") == "yes";

+  CheckDSM = cfg.getParameter("dsm_consistency_check", "yes") == "yes";

   if (!loadPrompts(cfg))

     return -1;

@@ -161,6 +166,17 @@ int DSMFactory::onLoad()

   MainScriptConfig.SetParamVariables = cfg.getParameter("set_param_variables")=="yes";

+  vector<string> system_dsms = explode(cfg.getParameter("run_system_dsms"), ",");

+  for (vector<string>::iterator it=system_dsms.begin(); it != system_dsms.end(); it++) {

+    string status;

+    if (createSystemDSM("main", *it, false /* reload */, status)) {

+      DBG("created SystemDSM '%s'\n", it->c_str());

+    } else {

+      ERROR("creating system DSM '%s': '%s'\n", it->c_str(), status.c_str());

+      return -1;

+    }

+  }

+

 #ifdef USE_MONITORING

   string monitoring_full_callgraph = cfg.getParameter("monitoring_full_stategraph");

   MonitoringFullCallgraph = monitoring_full_callgraph == "yes";

@@ -196,6 +212,20 @@ int DSMFactory::onLoad()

 	  cfg_usecallee.c_str());

   }

+  MonSelectFilters  = explode(cfg.getParameter("monitor_select_filters"), ",");

+  string filters;

+  for (vector<string>::iterator it = 

+	 MonSelectFilters.begin(); it != MonSelectFilters.end(); it++) {

+    if (it != MonSelectFilters.begin()) 

+      filters += ", ";

+    filters+=*it;

+  }

+  if (MonSelectFilters.size()) {

+    DBG("using additional monitor app select filters: %s\n", 

+	filters.c_str());

+  } else {

+    DBG("not using additional monitor app select filters\n");

+  }

   MonSelectFallback = cfg.getParameter("monitor_select_fallback");

 #endif

@@ -327,7 +357,7 @@ bool DSMFactory::loadDiags(AmConfigReader& cfg, DSMStateDiagramCollection* m_dia

   vector<string> diags_names = explode(LoadDiags, ",");

   for (vector<string>::iterator it=

 	 diags_names.begin(); it != diags_names.end(); it++) {

-    if (!m_diags->loadFile(DiagPath+*it+".dsm", *it, ModPath, DebugDSM)) {

+    if (!m_diags->loadFile(DiagPath+*it+".dsm", *it, ModPath, DebugDSM, CheckDSM)) {

       ERROR("loading %s from %s\n", 

 	    it->c_str(), (DiagPath+*it+".dsm").c_str());

       return false;

@@ -417,6 +447,7 @@ bool DSMFactory::loadConfig(const string& conf_file_name, const string& conf_nam

   ScriptConfigs_mut.lock();

   try {

+    Name2ScriptConfig[script_name] = script_config;

     // set ScriptConfig to this for all registered apps' names

     for (vector<string>::iterator reg_app_it=

 	   registered_apps.begin(); reg_app_it != registered_apps.end(); reg_app_it++) {

@@ -439,7 +470,19 @@ bool DSMFactory::loadConfig(const string& conf_file_name, const string& conf_nam

   }

   ScriptConfigs_mut.unlock();

-  return true;

+  bool res = true;

+

+  vector<string> system_dsms = explode(cfg.getParameter("run_system_dsms"), ",");

+  for (vector<string>::iterator it=system_dsms.begin(); it != system_dsms.end(); it++) {

+    string status;

+    if (createSystemDSM(script_name, *it, live_reload, status)) {

+    } else {

+      ERROR("creating system DSM '%s': '%s'\n", it->c_str(), status.c_str());

+      res = false;

+    }

+  }

+

+  return res;

 }

@@ -457,7 +500,7 @@ void DSMFactory::addVariables(DSMCall* s, const string& prefix,

 void DSMFactory::addParams(DSMCall* s, const string& hdrs) {

   // TODO: use real parser with quoting and optimize

   map<string, string> params;

-  vector<string> items = explode(getHeader(hdrs, PARAM_HDR), ";");

+  vector<string> items = explode(getHeader(hdrs, PARAM_HDR, true), ";");

   for (vector<string>::iterator it=items.begin(); 

        it != items.end(); it++) {

     vector<string> kv = explode(*it, "=");

@@ -487,12 +530,13 @@ void AmArg2DSMStrMap(const AmArg& arg,

   }

 }

-void DSMFactory::runMonitorAppSelect(const AmSipRequest& req, string& start_diag, map<string, string>& vars) {

+void DSMFactory::runMonitorAppSelect(const AmSipRequest& req, string& start_diag, 

+				     map<string, string>& vars) {

 #define FALLBACK_OR_EXCEPTION(code, reason)				\

   if (MonSelectFallback.empty()) {					\

     throw AmSession::Exception(code, reason);				\

   } else {								\

-    INFO("falling back to '%s'\n", MonSelectFallback.c_str());		\

+    DBG("falling back to '%s'\n", MonSelectFallback.c_str());		\

     start_diag = MonSelectFallback;					\

     return;								\

   }

@@ -510,7 +554,7 @@ void DSMFactory::runMonitorAppSelect(const AmSipRequest& req, string& start_diag

 	  from_parser.uri = req.from_uri;

 	else {

 	  size_t end;

-	  string pai = getHeader(req.hdrs, SIP_HDR_P_ASSERTED_IDENTITY);

+	  string pai = getHeader(req.hdrs, SIP_HDR_P_ASSERTED_IDENTITY, true);

 	  if (!from_parser.parse_contact(pai, 0, end)) {

 	    WARN("Failed to parse " SIP_HDR_P_ASSERTED_IDENTITY " '%s'\n",

 		  pai.c_str());

@@ -551,13 +595,27 @@ void DSMFactory::runMonitorAppSelect(const AmSipRequest& req, string& start_diag

 	}

 	DBG(" && looking for callee=='%s'\n", req.user.c_str());

-	di_args.push(callee_filter);	

+	di_args.push(callee_filter);

+      }

+      // apply additional filters

+      if (MonSelectFilters.size()) {

+	string app_params = getHeader(req.hdrs, PARAM_HDR);

+	for (vector<string>::iterator it = 

+	       MonSelectFilters.begin(); it != MonSelectFilters.end(); it++) {

+	  AmArg filter;

+	  filter.push(*it); // avp name

+	  string app_param_val = get_header_keyvalue(app_params, *it);

+	  filter.push(app_param_val);

+	  di_args.push(filter);

+	  DBG(" && looking for %s=='%s'\n", it->c_str(), app_param_val.c_str());

+	}

       }

+

       MONITORING_GLOBAL_INTERFACE->invoke("listByFilter",di_args,ret);

       if ((ret.getType()!=AmArg::Array)||

 	  !ret.size()) {

-	INFO("call info not found. caller uri %s, r-uri %s\n", 

+	DBG("call info not found. caller uri %s, r-uri %s\n", 

 	     req.from_uri.c_str(), req.r_uri.c_str());

 	FALLBACK_OR_EXCEPTION(500, "Internal Server Error");

       }

@@ -666,7 +724,7 @@ AmSession* DSMFactory::onInvite(const AmSipRequest& req,

     if (cred_obj)

       cred = dynamic_cast<UACAuthCred*>(cred_obj);

   } else if (session_params.getType() == AmArg::Array) {

-    DBG("session params is array - size %d\n", session_params.size());

+    DBG("session params is array - size %zd\n", session_params.size());

     // Creds

     if (session_params.get(0).getType() == AmArg::AObject) {

       ArgObject* cred_obj = session_params.get(0).asObject();

@@ -705,7 +763,7 @@ AmSession* DSMFactory::onInvite(const AmSipRequest& req,

     addParams(s, req.hdrs); 

   if (NULL == cred) {

-    WARN("discarding unknown session parameters.\n");

+    DBG("outgoing DSM call will not be authenticated.\n");

   } else {

     AmSessionEventHandlerFactory* uac_auth_f = 

       AmPlugIn::instance()->getFactory4Seh("uac_auth");

@@ -723,6 +781,39 @@ AmSession* DSMFactory::onInvite(const AmSipRequest& req,

   return s;

 }

+bool DSMFactory::createSystemDSM(const string& config_name, const string& start_diag, bool reload, string& status) {

+  bool res = true;

+

+  DSMScriptConfig* script_config = NULL;

+  ScriptConfigs_mut.lock();

+  if (config_name == "main")

+    script_config = &MainScriptConfig;

+  else {

+    map<string, DSMScriptConfig>::iterator it = Name2ScriptConfig.find(config_name);

+    if (it != Name2ScriptConfig.end()) 

+      script_config = &it->second;

+  }

+  if (script_config==NULL) {

+    status = "Error: Script config '"+config_name+"' not found, in [";

+    for (map<string, DSMScriptConfig>::iterator it = 

+	   Name2ScriptConfig.begin(); it != Name2ScriptConfig.end(); it++) {

+      if (it != Name2ScriptConfig.begin()) 

+	status+=", ";

+      status += it->first; 

+    }

+    status += "]";

+    res = false;

+  } else {

+    SystemDSM* s = new SystemDSM(*script_config, start_diag, reload);

+    s->start();

+    // add to garbage collector

+    AmThreadWatcher::instance()->add(s);

+    status = "OK";

+  }

+  ScriptConfigs_mut.unlock();

+  return res;

+}

+

 void DSMFactory::reloadDSMs(const AmArg& args, AmArg& ret) {

   DSMStateDiagramCollection* new_diags = new DSMStateDiagramCollection();

@@ -743,7 +834,7 @@ void DSMFactory::reloadDSMs(const AmArg& args, AmArg& ret) {

   vector<string> diags_names = explode(LoadDiags, ",");

   for (vector<string>::iterator it=

 	 diags_names.begin(); it != diags_names.end(); it++) {

-    if (!new_diags->loadFile(DiagPath+*it+".dsm", *it, ModPath, DebugDSM)) {

+    if (!new_diags->loadFile(DiagPath+*it+".dsm", *it, ModPath, DebugDSM, CheckDSM)) {

       ERROR("loading %s from %s\n", 

 	    it->c_str(), (DiagPath+*it+".dsm").c_str());

       ret.push(500);

@@ -949,7 +1040,7 @@ void DSMFactory::loadDSM(const AmArg& args, AmArg& ret) {

       ret.push(400);

       ret.push("DSM named '" + dsm_name + "' already loaded (use reloadDSMs to reload all)");

     } else {

-      if (!MainScriptConfig.diags->loadFile(dsm_file_name, dsm_name, ModPath, DebugDSM)) {

+      if (!MainScriptConfig.diags->loadFile(dsm_file_name, dsm_name, ModPath, DebugDSM, CheckDSM)) {

 	ret.push(500);

 	ret.push("error loading "+dsm_name+" from "+ dsm_file_name);

       } else {

@@ -976,7 +1067,7 @@ void DSMFactory::loadDSMWithPaths(const AmArg& args, AmArg& ret) {

       ret.push(400);

       ret.push("DSM named '" + dsm_name + "' already loaded (use reloadDSMs to reload all)");

     } else {

-      if (!MainScriptConfig.diags->loadFile(diag_path+dsm_name+".dsm", dsm_name, mod_path, DebugDSM)) {

+      if (!MainScriptConfig.diags->loadFile(diag_path+dsm_name+".dsm", dsm_name, mod_path, DebugDSM, CheckDSM)) {

 	ret.push(500);

 	ret.push("error loading "+dsm_name+" from "+ diag_path+dsm_name+".dsm");

       } else {

@@ -1032,6 +1123,16 @@ void DSMFactory::invoke(const string& method, const AmArg& args,

   } else if (method == "loadConfig"){

     args.assertArrayFmt("ss");

     loadConfig(args,ret);

+  } else if (method == "createSystemDSM"){

+    args.assertArrayFmt("ss");

+    string status;

+    if (createSystemDSM(args.get(0).asCStr(), args.get(1).asCStr(), false, status)) {

+      ret.push(200);

+      ret.push(status);

+    } else {

+      ret.push(500);

+      ret.push(status);

+    }

   } else if(method == "_list"){ 

     ret.push(AmArg("postDSMEvent"));

     ret.push(AmArg("reloadDSMs"));

@@ -1043,6 +1144,8 @@ void DSMFactory::invoke(const string& method, const AmArg& args,

     ret.push(AmArg("hasDSM"));

     ret.push(AmArg("listDSMs"));

     ret.push(AmArg("registerApplication"));

+    ret.push(AmArg("createSystemDSM"));

   }  else

     throw AmDynInvoke::NotImplemented(method);

 }

+

@@ -67,18 +67,23 @@ class DSMFactory

   std::set<DSMStateDiagramCollection*> old_diags;

   static bool DebugDSM;

+  static bool CheckDSM;

   static string InboundStartDiag;

   static string OutboundStartDiag;

   DSMScriptConfig MainScriptConfig;

+  // script name -> config

   map<string, DSMScriptConfig> ScriptConfigs;

+  // config name -> config

+  map<string, DSMScriptConfig> Name2ScriptConfig;

   AmMutex ScriptConfigs_mut;

 #ifdef USE_MONITORING

   static MonSelectType MonSelectCaller;

   static MonSelectType MonSelectCallee;

   static string MonSelectFallback;

+  static vector<string> MonSelectFilters;

 #endif // USE_MONITORING

@@ -139,6 +144,8 @@ public:

   void postEvent(AmEvent* e);

+  bool createSystemDSM(const string& config_name, const string& start_diag, bool reload, string& status);

+

 };

 #endif

@@ -93,7 +93,7 @@ void DSMCall::onInvite(const AmSipRequest& req) {

   bool run_session_invite = engine.onInvite(req, this);

   if (run_invite_event) {

-    if (!engine.init(this, startDiagName, DSMCondition::Invite))

+    if (!engine.init(this, this, startDiagName, DSMCondition::Invite))

       run_session_invite =false;

     if (checkVar(DSM_CONNECT_SESSION, DSM_CONNECT_SESSION_FALSE)) {

@@ -120,7 +120,7 @@ void DSMCall::onOutgoingInvite(const string& headers) {

   bool run_session_invite = engine.onInvite(req, this);

   if (run_invite_event) {

-    if (!engine.init(this, startDiagName, DSMCondition::Invite))

+    if (!engine.init(this, this, startDiagName, DSMCondition::Invite))

       run_session_invite =false;

     if (checkVar(DSM_CONNECT_SESSION, DSM_CONNECT_SESSION_FALSE)) {

@@ -146,7 +146,7 @@ void DSMCall::onOutgoingInvite(const string& headers) {

   params["reason"] = reply.reason;

   params["has_body"] = reply.body.empty() ?

     "false" : "true";

-  engine.runEvent(this, DSMCondition::Ringing, &params);

+  engine.runEvent(this, this, DSMCondition::Ringing, &params);

   // todo: local ringbacktone

 }

@@ -156,7 +156,7 @@ void DSMCall::onEarlySessionStart(const AmSipReply& reply) {

   params["reason"] = reply.reason;

   params["has_body"] = reply.body.empty() ?

     "false" : "true";

-  engine.runEvent(this, DSMCondition::EarlySession, &params);

+  engine.runEvent(this, this, DSMCondition::EarlySession, &params);

   if (checkVar(DSM_CONNECT_EARLY_SESSION, DSM_CONNECT_EARLY_SESSION_FALSE)) {

     DBG("call does not connect early session\n");

@@ -192,7 +192,7 @@ void DSMCall::onSessionStart(const AmSipReply& rep)

 }

 void DSMCall::startSession(){

-  engine.init(this, startDiagName, DSMCondition::SessionStart);

+  engine.init(this, this, startDiagName, DSMCondition::SessionStart);

   setReceiving(true);

@@ -232,7 +232,7 @@ void DSMCall::onDtmf(int event, int duration_msec) {

   map<string, string> params;

   params["key"] = int2str(event);

   params["duration"] = int2str(duration_msec);

-  engine.runEvent(this, DSMCondition::Key, &params);

+  engine.runEvent(this, this, DSMCondition::Key, &params);

 }

 void DSMCall::onBye(const AmSipRequest& req)

@@ -241,13 +241,13 @@ void DSMCall::onBye(const AmSipRequest& req)

   map<string, string> params;

   params["headers"] = req.hdrs;

-  engine.runEvent(this, DSMCondition::Hangup, &params);

+  engine.runEvent(this, this, DSMCondition::Hangup, &params);

 }

 void DSMCall::onCancel() {

   DBG("onCancel\n");

   if (dlg.getStatus() < AmSipDialog::Connected) 

-    engine.runEvent(this, DSMCondition::Hangup, NULL);

+    engine.runEvent(this, this, DSMCondition::Hangup, NULL);

   else {

     DBG("ignoring onCancel event in established dialog\n");

   }

@@ -272,7 +272,7 @@ void DSMCall::onSipRequest(const AmSipRequest& req) {

     DSMSipRequest* sip_req = new DSMSipRequest(&req);

     avar[DSM_AVAR_REQUEST] = AmArg(sip_req);

-    engine.runEvent(this, DSMCondition::SipRequest, &params);

+    engine.runEvent(this, this, DSMCondition::SipRequest, &params);

     delete sip_req;

     avar.erase(DSM_AVAR_REQUEST);

@@ -306,7 +306,7 @@ void DSMCall::onSipReply(const AmSipReply& reply, int old_dlg_status) {

     DSMSipReply* dsm_reply = new DSMSipReply(&reply);

     avar[DSM_AVAR_REPLY] = AmArg(dsm_reply);

-    engine.runEvent(this, DSMCondition::SipReply, &params);

+    engine.runEvent(this, this, DSMCondition::SipReply, &params);

     delete dsm_reply;

     avar.erase(DSM_AVAR_REPLY);

@@ -327,7 +327,7 @@ void DSMCall::onSipReply(const AmSipReply& reply, int old_dlg_status) {

     map<string, string> params;

     params["code"] = int2str(reply.code);

     params["reason"] = reply.reason;

-    engine.runEvent(this, DSMCondition::FailedCall, &params);    

+    engine.runEvent(this, this, DSMCondition::FailedCall, &params);

     setStopped();

   }

 }

@@ -338,10 +338,9 @@ void DSMCall::process(AmEvent* event)

   if (event->event_id == DSM_EVENT_ID) {

     DSMEvent* dsm_event = dynamic_cast<DSMEvent*>(event);

     if (dsm_event) {      

-      engine.runEvent(this, DSMCondition::DSMEvent, &dsm_event->params);

+      engine.runEvent(this, this, DSMCondition::DSMEvent, &dsm_event->params);

       return;

-    }

-  

+    }  

   }

   AmAudioEvent* audio_event = dynamic_cast<AmAudioEvent*>(event);

@@ -350,7 +349,7 @@ void DSMCall::process(AmEvent* event)

       (audio_event->event_id == AmAudioEvent::noAudio))){

     map<string, string> params;

     params["type"] = audio_event->event_id == AmAudioEvent::cleared?"cleared":"noAudio";

-    engine.runEvent(this, DSMCondition::NoAudio, &params);

+    engine.runEvent(this, this, DSMCondition::NoAudio, &params);

     return;

   }

@@ -359,14 +358,14 @@ void DSMCall::process(AmEvent* event)

     int timer_id = plugin_event->data.get(0).asInt();

     map<string, string> params;

     params["id"] = int2str(timer_id);

-    engine.runEvent(this, DSMCondition::Timer, &params);

+    engine.runEvent(this, this, DSMCondition::Timer, &params);

   }

   AmPlaylistSeparatorEvent* sep_ev = dynamic_cast<AmPlaylistSeparatorEvent*>(event);

   if (sep_ev) {

     map<string, string> params;

     params["id"] = int2str(sep_ev->event_id);

-    engine.runEvent(this, DSMCondition::PlaylistSeparator, &params);

+    engine.runEvent(this, this, DSMCondition::PlaylistSeparator, &params);

   }

   // todo: give modules the possibility to define/process events

@@ -386,12 +385,17 @@ void DSMCall::process(AmEvent* event)

       // decode result for easy use from script

       varPrintArg(resp_ev->response.data, params, resp_ev->response.is_error ? "error": "result");

-      // save reference to full parameters

-      avar[DSM_AVAR_JSONRPCRESPONEDATA] = AmArg(&resp_ev->response.data);

+      // decode udata for easy use from script

+      varPrintArg(resp_ev->udata, params, "udata");

+

+      // save reference to full parameters as avar

+      avar[DSM_AVAR_JSONRPCRESPONSEDATA] = AmArg(&resp_ev->response.data);

+      avar[DSM_AVAR_JSONRPCRESPONSEUDATA] = AmArg(&resp_ev->udata);

-      engine.runEvent(this, DSMCondition::JsonRpcResponse, &params);

+      engine.runEvent(this, this, DSMCondition::JsonRpcResponse, &params);

-      avar.erase(DSM_AVAR_JSONRPCRESPONEDATA);

+      avar.erase(DSM_AVAR_JSONRPCRESPONSEUDATA);

+      avar.erase(DSM_AVAR_JSONRPCRESPONSEDATA);

       return;

     }

@@ -412,7 +416,7 @@ void DSMCall::process(AmEvent* event)

       // save reference to full parameters

       avar[DSM_AVAR_JSONRPCREQUESTDATA] = AmArg(&req_ev->params);

-      engine.runEvent(this, DSMCondition::JsonRpcRequest, &params);

+      engine.runEvent(this, this, DSMCondition::JsonRpcRequest, &params);

       avar.erase(DSM_AVAR_JSONRPCREQUESTDATA);

       return;

@@ -613,7 +617,7 @@ void DSMCall::onOtherBye(const AmSipRequest& req) {

   map<string, string> params;

   params["hdrs"] = req.hdrs; // todo: optimization - make this configurable

-  engine.runEvent(this, DSMCondition::B2BOtherBye, &params);

+  engine.runEvent(this, this, DSMCondition::B2BOtherBye, &params);

 }

 bool DSMCall::onOtherReply(const AmSipReply& reply) {

@@ -625,7 +629,7 @@ bool DSMCall::onOtherReply(const AmSipReply& reply) {

   params["reason"] = reply.reason;

   params["hdrs"] = reply.hdrs; // todo: optimization - make this configurable

-  engine.runEvent(this, DSMCondition::B2BOtherReply, &params);

+  engine.runEvent(this, this, DSMCondition::B2BOtherReply, &params);

   return false;

 }

@@ -31,6 +31,8 @@

 #include "AmSession.h"

 #include "AmSessionContainer.h"

 #include "AmUtils.h"

+#include "AmEventDispatcher.h"

+#include "DSM.h"

 #include "jsonArg.h"

@@ -69,6 +71,8 @@ DSMAction* DSMCoreModule::getAction(const string& from_str) {

   DEF_CMD("unmute", SCUnmuteAction);

   DEF_CMD("enableDTMFDetection", SCEnableDTMFDetection);

   DEF_CMD("disableDTMFDetection", SCDisableDTMFDetection);

+  DEF_CMD("sendDTMF", SCSendDTMFAction);

+  DEF_CMD("sendDTMFSequence", SCSendDTMFSequenceAction);

   DEF_CMD("set", SCSetAction);

   DEF_CMD("sets", SCSetSAction);

@@ -80,6 +84,7 @@ DSMAction* DSMCoreModule::getAction(const string& from_str) {

   DEF_CMD("inc", SCIncAction);

   DEF_CMD("log", SCLogAction);

   DEF_CMD("clear", SCClearAction);

+  DEF_CMD("clearArray", SCClearArrayAction);

   DEF_CMD("logVars", SCLogVarsAction);

   DEF_CMD("logParams", SCLogParamsAction);

   DEF_CMD("logSelects", SCLogSelectsAction);

@@ -93,6 +98,10 @@ DSMAction* DSMCoreModule::getAction(const string& from_str) {

   DEF_CMD("postEvent", SCPostEventAction);

+  DEF_CMD("registerEventQueue", SCRegisterEventQueueAction);

+  DEF_CMD("unregisterEventQueue", SCUnregisterEventQueueAction);

+  DEF_CMD("createSystemDSM", SCCreateSystemDSMAction);

+

   if (cmd == "DI") {

     SCDIAction * a = new SCDIAction(params, false);

     a->name = from_str;

@@ -131,22 +140,22 @@ DSMCondition* DSMCoreModule::getCondition(const string& from_str) {

   if (cmd == "test")

     return new TestDSMCondition(params, DSMCondition::Any);

-  if (cmd == "keyTest") 

+  if ((cmd == "keyTest") || (cmd == "key"))

     return new TestDSMCondition(params, DSMCondition::Key);

-  if (cmd == "timerTest") 

+  if ((cmd == "timerTest") || (cmd == "timer"))

     return new TestDSMCondition(params, DSMCondition::Timer);

-  if (cmd == "noAudioTest") 

+  if ((cmd == "noAudioTest") || (cmd == "noAudio"))

     return new TestDSMCondition(params, DSMCondition::NoAudio);

-  if (cmd == "separatorTest") 

+  if ((cmd == "separatorTest") || (cmd == "separator"))

     return new TestDSMCondition(params, DSMCondition::PlaylistSeparator);

   if (cmd == "hangup") 

     return new TestDSMCondition(params, DSMCondition::Hangup);  

-  if (cmd == "eventTest") 

+  if ((cmd == "eventTest") || (cmd == "event"))

     return new TestDSMCondition(params, DSMCondition::DSMEvent);  

   if (cmd == "invite") 

@@ -182,6 +191,15 @@ DSMCondition* DSMCoreModule::getCondition(const string& from_str) {

   if (cmd == "jsonRpcResponse") 

     return new TestDSMCondition(params, DSMCondition::JsonRpcResponse);  

+  if (cmd == "startup")

+    return new TestDSMCondition(params, DSMCondition::Startup);

+

+  if (cmd == "reload")

+    return new TestDSMCondition(params, DSMCondition::Reload);

+

+  if (cmd == "system")

+    return new TestDSMCondition(params, DSMCondition::System);

+

   return NULL;

 }

@@ -211,8 +229,12 @@ EXEC_ACTION_START(SCPostEventAction){

   if (!var.empty()) {

     if (var == "var")

       ev->params = sc_sess->var;

-    else 

-      ev->params[var] = sc_sess->var[var];

+    else {

+      vector<string> vars = explode(var, ";");

+      for (vector<string>::iterator it =

+	     vars.begin(); it != vars.end(); it++)

+	ev->params[*it] = sc_sess->var[*it];

+    }

   }

   DBG("posting event to session '%s'\n", sess_id.c_str());

@@ -347,7 +369,7 @@ EXEC_ACTION_START(SCStopAction) {

 #define DEF_SCModActionExec(clsname)				\

 								\

-  bool clsname::execute(AmSession* sess,			\

+  bool clsname::execute(AmSession* sess, DSMSession* sc_sess,	\

 			DSMCondition::EventType event,		\

 			map<string,string>* event_params) {	\

     return true;						\

@@ -613,6 +635,25 @@ EXEC_ACTION_START(SCClearAction) {

   sc_sess->var.erase(var_name);

 } EXEC_ACTION_END;

+EXEC_ACTION_START(SCClearArrayAction) {

+  string varprefix = (arg.length() && arg[0] == '$')?

+    arg.substr(1) : arg;

+  DBG("clear variable array '%s.*'\n", varprefix.c_str());

+

+  varprefix+=".";

+

+  map<string, string>::iterator lb = sc_sess->var.lower_bound(varprefix);

+  while (lb != sc_sess->var.end()) {

+    if ((lb->first.length() < varprefix.length()) ||

+	strncmp(lb->first.c_str(), varprefix.c_str(),varprefix.length()))

+      break;

+    map<string, string>::iterator lb_d = lb;

+    lb++;

+    sc_sess->var.erase(lb_d);    

+  }

+

+} EXEC_ACTION_END;

+

 CONST_ACTION_2P(SCAppendAction,',', false);

 EXEC_ACTION_START(SCAppendAction) {

@@ -838,7 +879,7 @@ TestDSMCondition::TestDSMCondition(const string& expr, DSMCondition::EventType e

   name = expr;

 }

-bool TestDSMCondition::match(AmSession* sess, DSMCondition::EventType event,

+bool TestDSMCondition::match(AmSession* sess, DSMSession* sc_sess, DSMCondition::EventType event,

 			  map<string,string>* event_params) {

   if (ttype == None || (type != DSMCondition::Any && type != event))

     return false;

@@ -846,7 +887,6 @@ bool TestDSMCondition::match(AmSession* sess, DSMCondition::EventType event,

   if (ttype == Always)

     return true;

-  DSMSession* sc_sess = dynamic_cast<DSMSession*>(sess);

   if (!sc_sess) {

     ERROR("wrong session type\n");

     return false;

@@ -1160,3 +1200,100 @@ EXEC_ACTION_START(SCB2BClearHeadersAction) {

   DBG("clearing B2B headers\n");

   sc_sess->B2BclearHeaders();

 } EXEC_ACTION_END;

+

+CONST_ACTION_2P(SCSendDTMFAction,',', true);

+EXEC_ACTION_START(SCSendDTMFAction) {

+  string event = resolveVars(par1, sess, sc_sess, event_params);

+  string duration = resolveVars(par2, sess, sc_sess, event_params);  

+  

+  unsigned int event_i;

+  if (str2i(event, event_i)) {

+    ERROR("event '%s' not a valid DTMF event\n", event.c_str());

+    throw DSMException("core", "cause", "invalid DTMF:"+ event);

+  }

+

+  unsigned int duration_i;

+  if (duration.empty()) {

+    duration_i = 500; // default

+  } else {

+    if (str2i(duration, duration_i)) {

+      ERROR("event duration '%s' not a valid DTMF duration\n", duration.c_str());

+      throw DSMException("core", "cause", "invalid DTMF duration:"+ duration);

+    }

+  }

+

+  sess->sendDtmf(event_i, duration_i);

+} EXEC_ACTION_END;

+

+CONST_ACTION_2P(SCSendDTMFSequenceAction,',', true);

+EXEC_ACTION_START(SCSendDTMFSequenceAction) {

+  string events = resolveVars(par1, sess, sc_sess, event_params);

+  string duration = resolveVars(par2, sess, sc_sess, event_params);

+

+  unsigned int duration_i;

+  if (duration.empty()) {

+    duration_i = 500; // default

+  } else {

+    if (str2i(duration, duration_i)) {

+      ERROR("event duration '%s' not a valid DTMF duration\n", duration.c_str());

+      throw DSMException("core", "cause", "invalid DTMF duration:"+ duration);

+    }

+  }

+

+  for (size_t i=0;i<events.length();i++) {

+    if ((events[i]<'0' || events[i]>'9')

+	&& (events[i] != '#') && (events[i] != '*')

+	&& (events[i] <'A' || events[i] >'F')) {

+	DBG("skipping non-DTMF event char '%c'\n", events[i]);

+	continue;

+    }

+    int event = events[i] - '0';

+    if (events[i] == '*')

+      event = 10;

+    else if (events[i] == '#')

+      event = 11;

+    else if (events[i] >= 'A' && events[i] <= 'F' )

+      event = 12 + (events[i] - 'A');

+    DBG("sending event %d duration %u\n", event, duration_i);

+    sess->sendDtmf(event, duration_i);

+  }

+} EXEC_ACTION_END;

+

+EXEC_ACTION_START(SCRegisterEventQueueAction) {

+  string q_name = resolveVars(arg, sess, sc_sess, event_params);

+  DBG("Registering event queue '%s'\n", q_name.c_str());

+  if (q_name.empty()) {

+    WARN("Registering empty event queue name!\n");

+  }

+  AmEventDispatcher::instance()->addEventQueue(q_name, sess);

+} EXEC_ACTION_END;