@@ -271,7 +271,7 @@ void EarlyAnnounceDialog::onInvite(const AmSipRequest& req)

   AmMimeBody sdp_body;

   sdp_body.addPart(SIP_APPLICATION_SDP);

-  if(dlg.reply(req,183,"Session Progress",

+  if(dlg->reply(req,183,"Session Progress",

 	       &sdp_body) != 0){

     throw AmSession::Exception(500,"could not reply");

   } else {

@@ -358,7 +358,7 @@ void EarlyAnnounceDialog::onBye(const AmSipRequest& req)

 void EarlyAnnounceDialog::onCancel(const AmSipRequest& req)

 {

-  dlg.reply(invite_req,487,"Call terminated");

+  dlg->reply(invite_req,487,"Call terminated");

   setStopped();

 }

@@ -413,7 +413,7 @@ void EarlyAnnounceDialog::process(AmEvent* event)

 	}

 	DBG("Replying with code %d %s\n", code_i, reason.c_str());

-	dlg.reply(invite_req, code_i, reason);

+	dlg->reply(invite_req, code_i, reason);

 	setStopped();

       } else {

@@ -268,8 +268,11 @@ int EarlyAnnounceFactory::onLoad()

 void EarlyAnnounceDialog::onInvite(const AmSipRequest& req) 

 {

+  AmMimeBody sdp_body;

+  sdp_body.addPart(SIP_APPLICATION_SDP);

+

   if(dlg.reply(req,183,"Session Progress",

-	       "application/sdp") != 0){

+	       &sdp_body) != 0){

     throw AmSession::Exception(500,"could not reply");

   } else {

     invite_req = req;

@@ -343,6 +343,8 @@ void EarlyAnnounceDialog::onEarlySessionStart()

     throw string("EarlyAnnounceDialog::onEarlySessionStart: Cannot open file");

   setOutput(&wav_file);

+

+  AmB2BCallerSession::onEarlySessionStart();

 }

 void EarlyAnnounceDialog::onBye(const AmSipRequest& req)

@@ -277,7 +277,8 @@ void EarlyAnnounceDialog::onInvite(const AmSipRequest& req)

 }

-AmSession* EarlyAnnounceFactory::onInvite(const AmSipRequest& req, const string& app_name)

+AmSession* EarlyAnnounceFactory::onInvite(const AmSipRequest& req, const string& app_name,

+					  const map<string,string>& app_params)

 {

 #ifdef USE_MYSQL

@@ -277,7 +277,7 @@ void EarlyAnnounceDialog::onInvite(const AmSipRequest& req)

 }

-AmSession* EarlyAnnounceFactory::onInvite(const AmSipRequest& req)

+AmSession* EarlyAnnounceFactory::onInvite(const AmSipRequest& req, const string& app_name)

 {

 #ifdef USE_MYSQL

@@ -350,7 +350,7 @@ void EarlyAnnounceDialog::onBye(const AmSipRequest& req)

   setStopped();

 }

-void EarlyAnnounceDialog::onCancel()

+void EarlyAnnounceDialog::onCancel(const AmSipRequest& req)

 {

   dlg.reply(invite_req,487,"Call terminated");

   setStopped();

@@ -268,21 +268,11 @@ int EarlyAnnounceFactory::onLoad()

 void EarlyAnnounceDialog::onInvite(const AmSipRequest& req) 

 {

-  try {

-    if(dlg.reply(req,183,"Session Progress",

-		 "application/sdp") != 0){

-

-      throw AmSession::Exception(500,"could not reply");

-    }

-    else {	    

-      invite_req = req;

-    }

-

-  } catch(const AmSession::Exception& e) {

-

-    ERROR("%i %s\n",e.code,e.reason.c_str());

-    setStopped();

-    AmSipDialog::reply_error(req,e.code,e.reason);

+  if(dlg.reply(req,183,"Session Progress",

+	       "application/sdp") != 0){

+    throw AmSession::Exception(500,"could not reply");

+  } else {

+    invite_req = req;

   }

 }

@@ -346,9 +336,10 @@ void EarlyAnnounceDialog::onEarlySessionStart()

   // this disables DTMF detection as well

   setReceiving(false);

-  DBG("EarlyAnnounceDialog::onSessionStart\n");

+  DBG("EarlyAnnounceDialog::onEarlySessionStart\n");

+

   if(wav_file.open(filename,AmAudioFile::Read))

-    throw string("EarlyAnnounceDialog::onSessionStart: Cannot open file\n");

+    throw string("EarlyAnnounceDialog::onEarlySessionStart: Cannot open file");

   setOutput(&wav_file);

 }

@@ -340,7 +340,7 @@ EarlyAnnounceDialog::~EarlyAnnounceDialog()

 {

 }

-void EarlyAnnounceDialog::onSessionStart(const AmSipRequest& req)

+void EarlyAnnounceDialog::onEarlySessionStart()

 {

   // we can drop all received packets

   // this disables DTMF detection as well

@@ -271,12 +271,8 @@ int EarlyAnnounceFactory::onLoad()

 void EarlyAnnounceDialog::onInvite(const AmSipRequest& req) 

 {

   try {

-

-    string sdp_reply;

-    acceptAudio(req.body,req.hdrs,&sdp_reply);

-

     if(dlg.reply(req,183,"Session Progress",

-		 "application/sdp",sdp_reply) != 0){

+		 "application/sdp") != 0){

       throw AmSession::Exception(500,"could not reply");

     }

@@ -1,12 +1,10 @@

 /*

- * $Id$

- *

  * Copyright (C) 2002-2003 Fhg Fokus

  * Copyright (C) 2008 Juha Heinanen (USE_MYSQL parts)

  *

- * This file is part of sems, a free SIP media server.

+ * This file is part of SEMS, a free SIP media server.

  *

- * sems is free software; you can redistribute it and/or modify

+ * SEMS is free software; you can redistribute it and/or modify

  * it under the terms of the GNU General Public License as published by

  * the Free Software Foundation; either version 2 of the License, or

  * (at your option) any later version.

@@ -16,7 +14,7 @@

  * software, please contact iptel.org by e-mail at the following addresses:

  *    info@iptel.org

  *

- * sems is distributed in the hope that it will be useful,

+ * SEMS is distributed in the hope that it will be useful,

  * but WITHOUT ANY WARRANTY; without even the implied warranty of

  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

  * GNU General Public License for more details.

@@ -298,7 +298,7 @@ AmSession* EarlyAnnounceFactory::onInvite(const AmSipRequest& req)

 #ifdef USE_MYSQL

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

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

     string language = get_header_keyvalue(iptel_app_param,"Language");

     string announce_file = "";

@@ -385,11 +385,11 @@ void EarlyAnnounceDialog::process(AmEvent* event)

 	continue_b2b = true;

       } else if (EarlyAnnounceFactory::ContinueB2B == 

 		 EarlyAnnounceFactory::AppParam) {

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

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

 	if (iptel_app_param.length()) {

 	  continue_b2b = get_header_keyvalue(iptel_app_param,"B2B")=="yes";

 	} else {

-	  continue_b2b = getHeader(invite_req.hdrs,"P-B2B")=="yes";

+	  continue_b2b = getHeader(invite_req.hdrs,"P-B2B", true)=="yes";

 	}

       }

       DBG("determined: continue_b2b = %s\n", continue_b2b?"true":"false");

@@ -398,7 +398,7 @@ void EarlyAnnounceDialog::process(AmEvent* event)

 	unsigned int code_i = 404;

 	string reason = "Not Found";

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

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

 	if (iptel_app_param.length()) {

 	  string code = get_header_keyvalue(iptel_app_param,"Final-Reply-Code");

 	  if (code.length() && str2i(code, code_i)) {

@@ -408,11 +408,11 @@ void EarlyAnnounceDialog::process(AmEvent* event)

 	  if (!reason.length())

 	    reason = "Not Found";

 	} else {

-	  string code = getHeader(invite_req.hdrs,"P-Final-Reply-Code");

+	  string code = getHeader(invite_req.hdrs,"P-Final-Reply-Code", true);

 	  if (code.length() && str2i(code, code_i)) {

 	    ERROR("while parsing P-Final-Reply-Code\n");

 	  }

-	  string h_reason =  getHeader(invite_req.hdrs,"P-Final-Reply-Reason");

+	  string h_reason =  getHeader(invite_req.hdrs,"P-Final-Reply-Reason", true);

 	  if (h_reason.length()) {

 	    INFO("Use of P-Final-Reply-Code/P-Final-Reply-Reason is deprecated. ");

 	    INFO("Use '%s: Final-Reply-Code=<code>;"

@@ -178,13 +178,13 @@ int EarlyAnnounceFactory::onLoad()

   mysql_user = cfg.getParameter("mysql_user");

   if (mysql_user.empty()) {

-    ERROR("conference.conf parameter 'mysql_user' is missing.\n");

+    ERROR("early_announce.conf parameter 'mysql_user' is missing.\n");

     return -1;

   }

   mysql_passwd = cfg.getParameter("mysql_passwd");

   if (mysql_passwd.empty()) {

-    ERROR("conference.conf parameter 'mysql_passwd' is missing.\n");

+    ERROR("early_announce.conf parameter 'mysql_passwd' is missing.\n");

     return -1;

   }

@@ -178,13 +178,13 @@ int EarlyAnnounceFactory::onLoad()

   mysql_user = cfg.getParameter("mysql_user");

   if (mysql_user.empty()) {

-    ERROR("conference.conf paramater 'mysql_user' is missing.\n");

+    ERROR("conference.conf parameter 'mysql_user' is missing.\n");

     return -1;

   }

   mysql_passwd = cfg.getParameter("mysql_passwd");

   if (mysql_passwd.empty()) {

-    ERROR("conference.conf paramater 'mysql_passwd' is missing.\n");

+    ERROR("conference.conf parameter 'mysql_passwd' is missing.\n");

     return -1;

   }

@@ -99,16 +99,26 @@ int get_announce_msg(string application, string message, string user,

 	DBG("Query string <%s>\n", query_string.c_str());

 	query << query_string;

+

+#ifdef VERSION2

 	mysqlpp::Result res = query.store();

+#else

+    	mysqlpp::StoreQueryResult res = query.store();

+#endif

 	mysqlpp::Row row;

 	if (res) {

 	    if ((res.num_rows() > 0) && (row = res.at(0))) {

 		FILE *file;

-		unsigned long length = row.raw_string(0).size();

 		file = fopen((*audio_file).c_str(), "wb");

+#ifdef VERSION2

+		unsigned long length = row.raw_string(0).size();

 		fwrite(row.at(0).data(), 1, length, file);

+#else

+		mysqlpp::String s = row[0];

+		fwrite(s.data(), 1, s.length(), file);

+#endif

 		fclose(file);

 		return 1;

 	    } else {

@@ -200,7 +210,11 @@ int EarlyAnnounceFactory::onLoad()

   try {

+#ifdef VERSION2

     Connection.set_option(Connection.opt_reconnect, true);

+#else

+    Connection.set_option(new mysqlpp::ReconnectOption(true));

+#endif

     Connection.connect(mysql_db.c_str(), mysql_server.c_str(),

 		       mysql_user.c_str(), mysql_passwd.c_str());

     if (!Connection) {

@@ -266,9 +266,8 @@ void EarlyAnnounceDialog::onInvite(const AmSipRequest& req)

       throw AmSession::Exception(500,"could not reply");

     }

-    else {

-	    

-      localreq = req;

+    else {	    

+      invite_req = req;

     }

   } catch(const AmSession::Exception& e) {

@@ -354,7 +353,7 @@ void EarlyAnnounceDialog::onBye(const AmSipRequest& req)

 void EarlyAnnounceDialog::onCancel()

 {

-  dlg.reply(localreq,487,"Call terminated");

+  dlg.reply(invite_req,487,"Call terminated");

   setStopped();

 }

@@ -372,11 +371,11 @@ void EarlyAnnounceDialog::process(AmEvent* event)

 	continue_b2b = true;

       } else if (EarlyAnnounceFactory::ContinueB2B == 

 		 EarlyAnnounceFactory::AppParam) {

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

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

 	if (iptel_app_param.length()) {

 	  continue_b2b = get_header_keyvalue(iptel_app_param,"B2B")=="yes";

 	} else {

-	  continue_b2b = getHeader(localreq.hdrs,"P-B2B")=="yes";

+	  continue_b2b = getHeader(invite_req.hdrs,"P-B2B")=="yes";

 	}

       }

       DBG("determined: continue_b2b = %s\n", continue_b2b?"true":"false");

@@ -385,7 +384,7 @@ void EarlyAnnounceDialog::process(AmEvent* event)

 	unsigned int code_i = 404;

 	string reason = "Not Found";

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

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

 	if (iptel_app_param.length()) {

 	  string code = get_header_keyvalue(iptel_app_param,"Final-Reply-Code");

 	  if (code.length() && str2i(code, code_i)) {

@@ -395,11 +394,11 @@ void EarlyAnnounceDialog::process(AmEvent* event)

 	  if (!reason.length())

 	    reason = "Not Found";

 	} else {

-	  string code = getHeader(localreq.hdrs,"P-Final-Reply-Code");

+	  string code = getHeader(invite_req.hdrs,"P-Final-Reply-Code");

 	  if (code.length() && str2i(code, code_i)) {

 	    ERROR("while parsing P-Final-Reply-Code\n");

 	  }

-	  string h_reason =  getHeader(localreq.hdrs,"P-Final-Reply-Reason");

+	  string h_reason =  getHeader(invite_req.hdrs,"P-Final-Reply-Reason");

 	  if (h_reason.length()) {

 	    INFO("Use of P-Final-Reply-Code/P-Final-Reply-Reason is deprecated. ");

 	    INFO("Use '%s: Final-Reply-Code=<code>;"

@@ -409,14 +408,14 @@ void EarlyAnnounceDialog::process(AmEvent* event)

 	}

 	DBG("Replying with code %d %s\n", code_i, reason.c_str());

-	dlg.reply(localreq, code_i, reason);

+	dlg.reply(invite_req, code_i, reason);

 	setStopped();

       } else {

 	set_sip_relay_only(true);

-	recvd_req.insert(std::make_pair(localreq.cseq,localreq));

+	recvd_req.insert(std::make_pair(invite_req.cseq,invite_req));

-	relayEvent(new B2BSipRequestEvent(localreq,true));

+	relayEvent(new B2BSipRequestEvent(invite_req,true));

       }

       return;

@@ -54,7 +54,8 @@ string EarlyAnnounceFactory::AnnouncePath;

 string EarlyAnnounceFactory::AnnounceFile;

 #endif

-bool EarlyAnnounceFactory::ContinueB2B = false;

+EarlyAnnounceFactory::ContB2B EarlyAnnounceFactory::ContinueB2B = 

+  EarlyAnnounceFactory::Never;

 EarlyAnnounceFactory::EarlyAnnounceFactory(const string& _app_name)

   : AmSessionFactory(_app_name)

@@ -140,10 +141,18 @@ int EarlyAnnounceFactory::onLoad()

   // get application specific global parameters

   configureModule(cfg);

-  if (cfg.hasParameter("continue_b2b") &&

-      cfg.getParameter("continue_b2b") == "yes") {

-    ContinueB2B = true;

-    DBG("early_announce in b2bua mode.\n");

+  if (cfg.hasParameter("continue_b2b")) { 

+    if (cfg.getParameter("continue_b2b") == "yes") {

+      ContinueB2B = Always;

+      DBG("early_announce in b2bua mode.\n");

+    }

+    else if (cfg.getParameter("continue_b2b") == "app-param") {

+      ContinueB2B = AppParam;

+      DBG("early_announce in b2bua/final reply mode "

+	  "(depends on app-param).\n");

+    } else {

+      DBG("early_announce sends final reply.\n");

+    }

   }

 #ifdef USE_MYSQL

@@ -354,11 +363,25 @@ void EarlyAnnounceDialog::process(AmEvent* event)

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

   if(audio_event && 

-     (audio_event->event_id == AmAudioEvent::cleared))

-    {

+     (audio_event->event_id == AmAudioEvent::cleared)) {

       DBG("AmAudioEvent::cleared\n");

-      if (!EarlyAnnounceFactory::ContinueB2B) {

+      bool continue_b2b = false;

+      if (EarlyAnnounceFactory::ContinueB2B == 

+	  EarlyAnnounceFactory::Always) {

+	continue_b2b = true;

+      } else if (EarlyAnnounceFactory::ContinueB2B == 

+		 EarlyAnnounceFactory::AppParam) {

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

+	if (iptel_app_param.length()) {

+	  continue_b2b = get_header_keyvalue(iptel_app_param,"B2B")=="yes";

+	} else {

+	  continue_b2b = getHeader(localreq.hdrs,"P-B2B")=="yes";

+	}

+      }

+      DBG("determined: continue_b2b = %s\n", continue_b2b?"true":"false");

+

+      if (!continue_b2b) {

 	unsigned int code_i = 404;

 	string reason = "Not Found";

@@ -369,6 +392,8 @@ void EarlyAnnounceDialog::process(AmEvent* event)

 	    ERROR("while parsing Final-Reply-Code parameter\n");

 	  }

 	  reason = get_header_keyvalue(iptel_app_param,"Final-Reply-Reason");

+	  if (!reason.length())

+	    reason = "Not Found";

 	} else {

 	  string code = getHeader(localreq.hdrs,"P-Final-Reply-Code");

 	  if (code.length() && str2i(code, code_i)) {

@@ -191,6 +191,7 @@ int EarlyAnnounceFactory::onLoad()

   try {

+    Connection.set_option(Connection.opt_reconnect, true);

     Connection.connect(mysql_db.c_str(), mysql_server.c_str(),

 		       mysql_user.c_str(), mysql_passwd.c_str());

     if (!Connection) {

@@ -198,7 +199,12 @@ int EarlyAnnounceFactory::onLoad()

       return -1;

     }

   }

-	

+

+  catch (const mysqlpp::BadOption& er) {

+    ERROR("MySQL++ set_option error: %s\n", er.what());

+    return -1;

+  }

+ 	

   catch (const mysqlpp::Exception& er) {

     // Catch-all for any MySQL++ exceptions

     ERROR("MySQL++ error: %s\n", er.what());

@@ -54,6 +54,8 @@ string EarlyAnnounceFactory::AnnouncePath;

 string EarlyAnnounceFactory::AnnounceFile;

 #endif

+bool EarlyAnnounceFactory::ContinueB2B = false;

+

 EarlyAnnounceFactory::EarlyAnnounceFactory(const string& _app_name)

   : AmSessionFactory(_app_name)

 {

@@ -138,6 +140,12 @@ int EarlyAnnounceFactory::onLoad()

   // get application specific global parameters

   configureModule(cfg);

+  if (cfg.hasParameter("continue_b2b") &&

+      cfg.getParameter("continue_b2b") == "yes") {

+    ContinueB2B = true;

+    DBG("early_announce in b2bua mode.\n");

+  }

+

 #ifdef USE_MYSQL

   /* Get default audio from MySQL */

@@ -303,6 +311,7 @@ AmSession* EarlyAnnounceFactory::onInvite(const AmSipRequest& req)

 EarlyAnnounceDialog::EarlyAnnounceDialog(const string& filename)

   : filename(filename)

 {

+  set_sip_relay_only(false);

 }

 EarlyAnnounceDialog::~EarlyAnnounceDialog()

@@ -342,37 +351,45 @@ void EarlyAnnounceDialog::process(AmEvent* event)

      (audio_event->event_id == AmAudioEvent::cleared))

     {

       DBG("AmAudioEvent::cleared\n");

-      unsigned int code_i = 404;

-      string reason = "Not Found";

-

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

-      if (iptel_app_param.length()) {

-	string code = get_header_keyvalue(iptel_app_param,"Final-Reply-Code");

-	if (code.length() && str2i(code, code_i)) {

-	  ERROR("while parsing Final-Reply-Code parameter\n");

-	}

-	reason = get_header_keyvalue(iptel_app_param,"Final-Reply-Reason");

-      } else {

-	string code = getHeader(localreq.hdrs,"P-Final-Reply-Code");

-	if (code.length() && str2i(code, code_i)) {

-	  ERROR("while parsing P-Final-Reply-Code\n");

-	}

-	string h_reason =  getHeader(localreq.hdrs,"P-Final-Reply-Reason");

-	if (h_reason.length()) {

-	  INFO("Use of P-Final-Reply-Code/P-Final-Reply-Reason is deprecated. ");

-	  INFO("Use '%s: Final-Reply-Code=<code>;"

-	       "Final-Reply-Reason=<rs>' instead.\n",PARAM_HDR);

-	  reason = h_reason;

+

+      if (!EarlyAnnounceFactory::ContinueB2B) {

+	unsigned int code_i = 404;

+	string reason = "Not Found";

+	

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

+	if (iptel_app_param.length()) {

+	  string code = get_header_keyvalue(iptel_app_param,"Final-Reply-Code");

+	  if (code.length() && str2i(code, code_i)) {

+	    ERROR("while parsing Final-Reply-Code parameter\n");

+	  }

+	  reason = get_header_keyvalue(iptel_app_param,"Final-Reply-Reason");

+	} else {

+	  string code = getHeader(localreq.hdrs,"P-Final-Reply-Code");

+	  if (code.length() && str2i(code, code_i)) {

+	    ERROR("while parsing P-Final-Reply-Code\n");

+	  }

+	  string h_reason =  getHeader(localreq.hdrs,"P-Final-Reply-Reason");

+	  if (h_reason.length()) {

+	    INFO("Use of P-Final-Reply-Code/P-Final-Reply-Reason is deprecated. ");

+	    INFO("Use '%s: Final-Reply-Code=<code>;"

+		 "Final-Reply-Reason=<rs>' instead.\n",PARAM_HDR);

+	    reason = h_reason;

+	  }

 	}

-      }

-      DBG("Replying with code %d %s\n", code_i, reason.c_str());

-      dlg.reply(localreq, code_i, reason);

+	DBG("Replying with code %d %s\n", code_i, reason.c_str());

+	dlg.reply(localreq, code_i, reason);

-      setStopped();

+	setStopped();

+      } else {

+	set_sip_relay_only(true);

+	recvd_req.insert(std::make_pair(localreq.cseq,localreq));

+	

+	relayEvent(new B2BSipRequestEvent(localreq,true));

+      }

       return;

     }

-  AmSession::process(event);

+  AmB2BCallerSession::process(event);

 }

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

  * $Id$

  *

  * Copyright (C) 2002-2003 Fhg Fokus

+ * Copyright (C) 2008 Juha Heinanen (USE_MYSQL parts)

  *

  * This file is part of sems, a free SIP media server.

  *

@@ -34,16 +35,100 @@

 #define MOD_NAME "early_announce"

+#ifdef USE_MYSQL

+#include <mysql++/mysql++.h>

+#include <stdio.h>

+#define DEFAULT_AUDIO_TABLE "default_audio"

+#define DOMAIN_AUDIO_TABLE "domain_audio"

+#define USER_AUDIO_TABLE "user_audio"

+#endif

+

 EXPORT_SESSION_FACTORY(EarlyAnnounceFactory,MOD_NAME);

+#ifdef USE_MYSQL

+string EarlyAnnounceFactory::AnnounceApplication;

+string EarlyAnnounceFactory::AnnounceMessage;

+string EarlyAnnounceFactory::DefaultLanguage;

+#else

 string EarlyAnnounceFactory::AnnouncePath;

 string EarlyAnnounceFactory::AnnounceFile;

+#endif

 EarlyAnnounceFactory::EarlyAnnounceFactory(const string& _app_name)

   : AmSessionFactory(_app_name)

 {

 }

+#ifdef USE_MYSQL

+mysqlpp::Connection EarlyAnnounceFactory::Connection(mysqlpp::use_exceptions);

+

+int get_announce_msg(string application, string message, string user,

+		     string domain, string language, string *audio_file)

+{

+    string query_string;

+

+    if (!user.empty()) {

+	*audio_file = string("/tmp/") +  application + "_" + 

+	    message + "_" + domain + "_" + user + ".wav";

+	query_string = "select audio from " + string(USER_AUDIO_TABLE) +

+	    " where application='" + application + "' and message='" +

+	    message + "' and userid='" + user + "' and domain='" +

+	    domain + "'";

+    } else if (!domain.empty()) {

+	*audio_file = string("/tmp/") +  application + "_" +

+	    message + "_" + domain + "_" + language + ".wav";

+	query_string = "select audio from " + string(DOMAIN_AUDIO_TABLE) +

+	    " where application='" + application + "' and message='" +

+	    message + "' and domain='" + domain + "' and language='" +

+	    language + "'";

+    } else {

+	*audio_file = string("/tmp/") +  application  + "_" +

+	    message + "_" + language + ".wav";

+	query_string = "select audio from " + string(DEFAULT_AUDIO_TABLE) +

+	    " where application='" + application + "' and message='" +

+	    message + "' and language='" + language + "'";

+    }

+

+    try {

+

+	mysqlpp::Query query = EarlyAnnounceFactory::Connection.query();

+	    

+	DBG("Query string <%s>\n", query_string.c_str());

+

+	query << query_string;

+	mysqlpp::Result res = query.store();

+

+	mysqlpp::Row row;

+

+	if (res) {

+	    if ((res.num_rows() > 0) && (row = res.at(0))) {

+		FILE *file;

+		unsigned long length = row.raw_string(0).size();

+		file = fopen((*audio_file).c_str(), "wb");

+		fwrite(row.at(0).data(), 1, length, file);

+		fclose(file);

+		return 1;

+	    } else {

+		*audio_file = "";

+		return 1;

+	    }

+	} else {

+	    ERROR("Database query error\n");

+	    *audio_file = "";

+	    return 0;

+	}

+    }

+

+    catch (const mysqlpp::Exception& er) {

+	// Catch-all for any MySQL++ exceptions

+	ERROR("MySQL++ error: %s\n", er.what());

+	*audio_file = "";

+	return 0;

+    }

+}

+

+#endif

+

 int EarlyAnnounceFactory::onLoad()

 {

   AmConfigReader cfg;

@@ -53,6 +138,79 @@ int EarlyAnnounceFactory::onLoad()

   // get application specific global parameters

   configureModule(cfg);

+#ifdef USE_MYSQL

+

+  /* Get default audio from MySQL */

+

+  string mysql_server, mysql_user, mysql_passwd, mysql_db;

+

+  mysql_server = cfg.getParameter("mysql_server");

+  if (mysql_server.empty()) {

+    mysql_server = "localhost";

+  }

+

+  mysql_user = cfg.getParameter("mysql_user");

+  if (mysql_user.empty()) {

+    ERROR("conference.conf paramater 'mysql_user' is missing.\n");

+    return -1;

+  }

+

+  mysql_passwd = cfg.getParameter("mysql_passwd");

+  if (mysql_passwd.empty()) {

+    ERROR("conference.conf paramater 'mysql_passwd' is missing.\n");

+    return -1;

+  }

+

+  mysql_db = cfg.getParameter("mysql_db");

+  if (mysql_db.empty()) {

+    mysql_db = "sems";

+  }

+

+  AnnounceApplication = cfg.getParameter("application");

+  if (AnnounceApplication.empty()) {

+    AnnounceApplication = MOD_NAME;

+  }

+

+  AnnounceMessage = cfg.getParameter("message");

+  if (AnnounceMessage.empty()) {

+    AnnounceMessage = "greeting_msg";

+  }

+

+  DefaultLanguage = cfg.getParameter("default_language");

+  if (DefaultLanguage.empty()) {

+    DefaultLanguage = "en";

+  }

+

+  try {

+

+    Connection.connect(mysql_db.c_str(), mysql_server.c_str(),

+		       mysql_user.c_str(), mysql_passwd.c_str());

+    if (!Connection) {

+      ERROR("Database connection failed: %s\n", Connection.error());

+      return -1;

+    }

+  }

+	

+  catch (const mysqlpp::Exception& er) {

+    // Catch-all for any MySQL++ exceptions

+    ERROR("MySQL++ error: %s\n", er.what());

+    return -1;

+  }

+

+  string announce_file;

+  if (!get_announce_msg(AnnounceApplication, AnnounceMessage, "", "",

+			DefaultLanguage, &announce_file)) {

+    return -1;

+  }

+  if (announce_file.empty()) {

+    ERROR("default announce for " MOD_NAME " module does not exist.\n");

+    return -1;

+  }

+

+#else 

+

+  /* Get default audio from file system */

+

   AnnouncePath = cfg.getParameter("announce_path",ANNOUNCE_PATH);

   if( !AnnouncePath.empty() 

       && AnnouncePath[AnnouncePath.length()-1] != '/' )

@@ -67,6 +225,8 @@ int EarlyAnnounceFactory::onLoad()

     return -1;

   }

+#endif

+

   return 0;

 }

@@ -99,6 +259,26 @@ void EarlyAnnounceDialog::onInvite(const AmSipRequest& req)

 AmSession* EarlyAnnounceFactory::onInvite(const AmSipRequest& req)

 {

+

+#ifdef USE_MYSQL

+

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

+    string language = get_header_keyvalue(iptel_app_param,"Language");

+    string announce_file = "";

+

+    if (language.empty()) language = DefaultLanguage;

+

+    get_announce_msg(AnnounceApplication, AnnounceMessage, req.user,

+		     req.domain, "", &announce_file);

+    if (!announce_file.empty()) goto end;

+    get_announce_msg(AnnounceApplication, AnnounceMessage, "", req.domain,

+		     language, &announce_file);

+    if (!announce_file.empty()) goto end;

+    get_announce_msg(AnnounceApplication, AnnounceMessage, "", "", language,

+		     &announce_file);

+

+#else

+

   string announce_path = AnnouncePath;

   string announce_file = announce_path + req.domain 

     + "/" + req.user + ".wav";

@@ -113,7 +293,9 @@ AmSession* EarlyAnnounceFactory::onInvite(const AmSipRequest& req)

     goto end;

   announce_file = AnnouncePath + AnnounceFile;

-    

+

+#endif

+

  end:

   return new EarlyAnnounceDialog(announce_file);

 }

@@ -175,7 +357,6 @@ void EarlyAnnounceDialog::process(AmEvent* event)

 	if (code.length() && str2i(code, code_i)) {

 	  ERROR("while parsing P-Final-Reply-Code\n");

 	}

-

 	string h_reason =  getHeader(localreq.hdrs,"P-Final-Reply-Reason");

 	if (h_reason.length()) {

 	  INFO("Use of P-Final-Reply-Code/P-Final-Reply-Reason is deprecated. ");

@@ -195,4 +376,3 @@ void EarlyAnnounceDialog::process(AmEvent* event)

   AmSession::process(event);

 }

-

@@ -101,7 +101,7 @@ AmSession* EarlyAnnounceFactory::onInvite(const AmSipRequest& req)

 {

   string announce_path = AnnouncePath;

   string announce_file = announce_path + req.domain 

-    + "/" + get_header_param(req.r_uri, "play") + ".wav";

+    + "/" + req.user + ".wav";

   DBG("trying '%s'\n",announce_file.c_str());

   if(file_exists(announce_file))

@@ -46,80 +46,80 @@ EarlyAnnounceFactory::EarlyAnnounceFactory(const string& _app_name)

 int EarlyAnnounceFactory::onLoad()

 {

-    AmConfigReader cfg;

-    if(cfg.loadFile(AmConfig::ModConfigPath + string(MOD_NAME ".conf")))

-	return -1;

+  AmConfigReader cfg;

+  if(cfg.loadFile(AmConfig::ModConfigPath + string(MOD_NAME ".conf")))

+    return -1;

-    // get application specific global parameters

-    configureModule(cfg);

+  // get application specific global parameters

+  configureModule(cfg);

-    AnnouncePath = cfg.getParameter("announce_path",ANNOUNCE_PATH);

-    if( !AnnouncePath.empty() 

-	&& AnnouncePath[AnnouncePath.length()-1] != '/' )

-	AnnouncePath += "/";

+  AnnouncePath = cfg.getParameter("announce_path",ANNOUNCE_PATH);

+  if( !AnnouncePath.empty() 

+      && AnnouncePath[AnnouncePath.length()-1] != '/' )

+    AnnouncePath += "/";

-    AnnounceFile = cfg.getParameter("default_announce",ANNOUNCE_FILE);

+  AnnounceFile = cfg.getParameter("default_announce",ANNOUNCE_FILE);

-    string announce_file = AnnouncePath + AnnounceFile;

-    if(!file_exists(announce_file)){

-	ERROR("default file for " MOD_NAME " module does not exist ('%s').\n",

-	      announce_file.c_str());