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

 #include "AmConfig.h"

 #include "AmUtils.h"

 #include "AmPlugIn.h"

+#include "AmUACAuth.h"

 #include "sems.h"

 #include "log.h"

@@ -101,29 +102,13 @@ AmSession* AnnouncementFactory::onInvite(const AmSipRequest& req, const string&

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

 					 AmArg& session_params)

 {

-  UACAuthCred* cred = NULL;

-  if (session_params.getType() == AmArg::AObject) {

-    AmObject* cred_obj = session_params.asObject();

-    if (cred_obj)

-      cred = dynamic_cast<UACAuthCred*>(cred_obj);

-  }

-

-  AmSession* s = new AnnouncementDialog(getAnnounceFile(req), cred); 

+  UACAuthCred* cred = AmUACAuth::unpackCredentials(session_params);

+  AmSession* s = new AnnouncementDialog(getAnnounceFile(req), cred);

   if (NULL == cred) {

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

   } else {

-    AmSessionEventHandlerFactory* uac_auth_f = 

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

-    if (uac_auth_f != NULL) {

-      DBG("UAC Auth enabled for new announcement session.\n");

-      AmSessionEventHandler* h = uac_auth_f->getHandler(s);

-      if (h != NULL )

-	s->addHandler(h);

-    } else {

-      ERROR("uac_auth interface not accessible. "

-	    "Load uac_auth for authenticated dialout.\n");

-    }		

+    AmUACAuth::enable(s);

   }

   return s;

@@ -30,7 +30,7 @@

 #include "AmAudioFile.h"

 #include "AmConfigReader.h"

-#include "ampi/UACAuthAPI.h"

+#include "AmUACAuth.h"

 #include <string>

 using std::string;

@@ -209,12 +209,7 @@ AmSession* AnnRecorderFactory::onInvite(const AmSipRequest& req, const string& a

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

 					 AmArg& session_params)

 {

-  UACAuthCred* cred = NULL;

-  if (session_params.getType() == AmArg::AObject) {

-    AmObject* cred_obj = session_params.asObject();

-    if (cred_obj)

-      cred = dynamic_cast<UACAuthCred*>(cred_obj);

-  }

+  UACAuthCred* cred = AmUACAuth::unpackCredentials(session_params);

   map<string, string> params;

   getAppParams(req, params);

@@ -223,17 +218,7 @@ AmSession* AnnRecorderFactory::onInvite(const AmSipRequest& req, const string& a

   if (NULL == cred) {

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

   } else {

-    AmSessionEventHandlerFactory* uac_auth_f = 

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

-    if (uac_auth_f != NULL) {

-      DBG("UAC Auth enabled for new announcement session.\n");

-      AmSessionEventHandler* h = uac_auth_f->getHandler(s);

-      if (h != NULL )

-	s->addHandler(h);

-    } else {

-      ERROR("uac_auth interface not accessible. "

-	    "Load uac_auth for authenticated dialout.\n");

-    }		

+    AmUACAuth::enable(s);

   }

   return s;

@@ -30,7 +30,7 @@

 #include "AmAudioFile.h"

 #include "AmConfigReader.h"

-#include "ampi/UACAuthAPI.h"

+#include "AmUACAuth.h"

 #include "AmPromptCollection.h"

@@ -167,8 +167,9 @@ AmSession* CallBackFactory::onInvite(const AmSipRequest& req, const string& app_

       cred = dynamic_cast<UACAuthCred*>(cred_obj);

   }

-  AmSession* s = new CallBackDialog(prompts, cred); 

-  addAuthHandler(s);

+  AmSession* s = new CallBackDialog(prompts, cred);

+  AmUACAuth::enable(s);

+  

   return s;

 }

@@ -315,7 +316,7 @@ void CallBackDialog::process(AmEvent* ev)

 // need this to pass credentials...

 AmB2ABCalleeSession* CallBackDialog::createCalleeSession() {

   CallBackCalleeDialog* sess = new CallBackCalleeDialog(getLocalTag(), connector, cred);

-  addAuthHandler(sess);

+  AmUACAuth::enable(sess);

   return sess;

 }

@@ -332,17 +333,3 @@ CallBackCalleeDialog::CallBackCalleeDialog(const string& other_tag,

 CallBackCalleeDialog::~CallBackCalleeDialog() {

 }

-

-void addAuthHandler(AmSession* s) {

-  AmSessionEventHandlerFactory* uac_auth_f = 

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

-  if (uac_auth_f != NULL) {

-    DBG("UAC Auth enabled for new session.\n");

-    AmSessionEventHandler* h = uac_auth_f->getHandler(s);

-    if (h != NULL )

-      s->addHandler(h);

-  } else {

-    ERROR("uac_auth interface not accessible. "

-	  "Load uac_auth for authenticated calls.\n");

-  }		

-}

@@ -30,7 +30,7 @@

 #include "AmAudio.h"

 #include "AmPlaylist.h"

 #include "AmPromptCollection.h"

-#include "ampi/UACAuthAPI.h"

+#include "AmUACAuth.h"

 #include <map>

 #include <string>

@@ -132,7 +132,6 @@ public:

   UACAuthCred* getCredentials() { return cred; }

 };

-void addAuthHandler(AmSession* s);

 #endif

 // Local Variables:

 // mode:C++

@@ -155,24 +155,9 @@ AmSession* Click2DialFactory::onInvite(const AmSipRequest& req, const string& ap

     return NULL;

   }

-  AmSessionEventHandlerFactory* uac_auth_f =

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

-  if(uac_auth_f != NULL) {

-    DBG("UAC Auth enabled for new announcement session.\n");

-    AmSessionEventHandler *h = uac_auth_f->getHandler(s);

-    if (h != NULL) {

-      s->addHandler(h);

-    }

-    else {

-      ERROR("Failed to get authentication event handler");

-      delete s;

-      return NULL;

-    }

-  }

-  else {

-    ERROR("uac_auth interface not accessible. "

-      "Load uac_auth for authenticated dialout.\n");

-

+  if (!AmUACAuth::enable(s)) {

+    ERROR("Failed to get authentication event handler");

+    delete s;

     return NULL;

   }

@@ -32,7 +32,7 @@

 #include "AmAudioFile.h"

 #include "AmB2BSession.h"

-#include "ampi/UACAuthAPI.h"

+#include "AmUACAuth.h"

 #include <string>

 using std::string;

@@ -756,11 +756,7 @@ AmSession* DSMFactory::onInvite(const AmSipRequest& req, const string& app_name,

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

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

     // Creds

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

-      AmObject* cred_obj = session_params.get(0).asObject();

-      if (cred_obj)

-	cred = dynamic_cast<UACAuthCred*>(cred_obj);

-    }

+    cred = AmUACAuth::unpackCredentials(session_params.get(0));

     // Creds + vars

     if (session_params.size()>1 && 

 	session_params.get(1).getType() == AmArg::Struct) {

@@ -795,17 +791,7 @@ AmSession* DSMFactory::onInvite(const AmSipRequest& req, const string& app_name,

   if (NULL == cred) {

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

   } else {

-    AmSessionEventHandlerFactory* uac_auth_f = 

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

-    if (uac_auth_f != NULL) {

-      DBG("UAC Auth enabled for new DSM session.\n");

-      AmSessionEventHandler* h = uac_auth_f->getHandler(s);

-      if (h != NULL )

-	s->addHandler(h);

-    } else {

-      ERROR("uac_auth interface not accessible. "

-	    "Load uac_auth for authenticated dialout.\n");

-    }		

+    AmUACAuth::enable(s);

   }

   return s;

@@ -28,8 +28,7 @@

 #define _DSM_CALL_H

 #include "AmB2BSession.h"

 #include "AmPromptCollection.h"

-

-#include "ampi/UACAuthAPI.h"

+#include "AmUACAuth.h"

 #include "DSMSession.h"

 #include "DSMStateEngine.h"

@@ -49,91 +49,79 @@ AnnounceAuthFactory::AnnounceAuthFactory(const string& _app_name)

 int AnnounceAuthFactory::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 ann_b2b module does not exist ('%s').\n",

-	      announce_file.c_str());

-	return -1;

-    }

+  string announce_file = AnnouncePath + AnnounceFile;

+  if(!file_exists(announce_file)){

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

+	  announce_file.c_str());

+    return -1;

+  }

-	auth_realm = cfg.getParameter("auth_realm", "");

-	auth_user  = cfg.getParameter("auth_user",  "");

-	auth_pwd   = cfg.getParameter("auth_pwd", "");

+  auth_realm = cfg.getParameter("auth_realm", "");

+  auth_user  = cfg.getParameter("auth_user",  "");

+  auth_pwd   = cfg.getParameter("auth_pwd", "");

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

-    DBG("uac_auth_f == 0x%.16lX\n",(unsigned long)uac_auth_f);

+  dialer.set_dial(cfg.getParameter("dial_ruri","default ruri"),

+		  cfg.getParameter("dial_from","default from"),

+		  cfg.getParameter("dial_fromuri","default fromuri"),

+		  cfg.getParameter("dial_to","default to"));

-	dialer.set_dial(cfg.getParameter("dial_ruri","default ruri"),

-					cfg.getParameter("dial_from","default from"),

-					cfg.getParameter("dial_fromuri","default fromuri"),

-					cfg.getParameter("dial_to","default to"));

+  dialer.start();

-	dialer.start();

-

-    return 0;

+  return 0;

 }

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

 					 const map<string,string>& app_params)

 {

-    string announce_path = AnnouncePath;

-    string announce_file = announce_path + req.domain 

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

+  string announce_path = AnnouncePath;

+  string announce_file = announce_path + req.domain 

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

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

-    if(file_exists(announce_file))

-	goto end;

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

+  if(file_exists(announce_file))

+    goto end;

-    announce_file = announce_path + req.user + ".wav";

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

-    if(file_exists(announce_file))

-	goto end;

+  announce_file = announce_path + req.user + ".wav";

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

+  if(file_exists(announce_file))

+    goto end;

-    announce_file = AnnouncePath + AnnounceFile;

+  announce_file = AnnouncePath + AnnounceFile;

-end:

-	AnnounceAuthDialog* dlg = new AnnounceAuthDialog(announce_file,

-													 auth_realm, 

-													 auth_user,

-													 auth_pwd);

-

-    if (uac_auth_f != NULL) {

-		DBG("UAC Auth enabled for new announcement session.\n");

-		AmSessionEventHandler* h = uac_auth_f->getHandler(dlg);

-		if (h != NULL )

-			dlg->addHandler(h);

-	}

-

-    return dlg;

+ end:

+  AnnounceAuthDialog* dlg =

+    new AnnounceAuthDialog(announce_file,auth_realm, auth_user, auth_pwd);

+

+  AmUACAuth::enable(dlg);

+

+  return dlg;

 }

 AnnounceAuthDialog::AnnounceAuthDialog(const string& filename,

-									   const string& auth_realm, 

-									   const string& auth_user,

-									   const string& auth_pwd)

-    : filename(filename), 

-	  credentials(auth_realm, auth_user, auth_pwd)

+				       const string& auth_realm,

+				       const string& auth_user,

+				       const string& auth_pwd)

+  : filename(filename), credentials(auth_realm, auth_user, auth_pwd)

 {

-

 }

 UACAuthCred* AnnounceAuthDialog::getCredentials() {

-	return &credentials;

+  return &credentials;

 }

 AnnounceAuthDialog::~AnnounceAuthDialog()

@@ -142,63 +130,63 @@ AnnounceAuthDialog::~AnnounceAuthDialog()

 void AnnounceAuthDialog::onSessionStart()

 {

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

-    startSession();

+  DBG("AnnounceAuthDialog::onSessionStart\n");

+  startSession();

-    AmSession::onSessionStart();

+  AmSession::onSessionStart();

 }

 void AnnounceAuthDialog::startSession()

 {

-    // disable DTMF detection - don't use DTMF here

-    setDtmfDetectionEnabled(false);

+  // disable DTMF detection - don't use DTMF here

+  setDtmfDetectionEnabled(false);

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

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

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

+    throw string("AnnounceAuthDialog::onSessionStart: Cannot open file\n");

-    setOutput(&wav_file);

+  setOutput(&wav_file);

 }

 void AnnounceAuthDialog::onBye(const AmSipRequest& req)

 {

-    DBG("onBye: stopSession\n");

-    setStopped();

+  DBG("onBye: stopSession\n");

+  setStopped();

 }

 void AnnounceAuthDialog::process(AmEvent* event)

 {

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

-    if(audio_event && (audio_event->event_id == AmAudioEvent::cleared)){

-	dlg.bye();

-	setStopped();

-	return;

-    }

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

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

+    dlg.bye();

+    setStopped();

+    return;

+  }

-    AmSession::process(event);

+  AmSession::process(event);

 }

 void DialerThread::set_dial(const string& r, const string& f, 

-							const string& fu, const string& t) {

-	r_uri = r;

-	from = f;

-	from_uri = fu;

-	to = t;

+			    const string& fu, const string& t) {

+  r_uri = r;

+  from = f;

+  from_uri = fu;

+  to = t;

 }

 void DialerThread::run() {

-	sleep(15); // wait for sems to completely start up

-	while (!is_stopped()) {		

-		DBG("dialing...");

-		AmUAC::dialout("blibla", "announce_auth", 

-					   r_uri, from, from_uri, to);

-		// every 10 minutes

-		sleep(100);

-

-	} 

+  sleep(15); // wait for sems to completely start up

+  while (!is_stopped()) {		

+    DBG("dialing...");

+    AmUAC::dialout("blibla", "announce_auth", 

+		   r_uri, from, from_uri, to);

+    // every 10 minutes

+    sleep(100);

+

+  } 

 }

 void DialerThread::on_stop() {

-	DBG("stopping...\n");

+  DBG("stopping...\n");

 }

@@ -30,68 +30,66 @@

 #include "AmSession.h"

 #include "AmAudioFile.h"

 #include "AmConfigReader.h"

-

-#include "ampi/UACAuthAPI.h"

+#include "AmUACAuth.h"

 #include <string>

 using std::string;

 class DialerThread : public AmThread {

-	string r_uri;

-	string from;

-	string from_uri;

-	string to;

+  string r_uri;

+  string from;

+  string from_uri;

+  string to;

 protected:

-	void run();

-	void on_stop();

+  void run();

+  void on_stop();

 public:

-	void set_dial(const string& r, const string& f, 

-				  const string& fu, const string& t);

+  void set_dial(const string& r, const string& f, 

+		const string& fu, const string& t);

 };

 class AnnounceAuthFactory: public AmSessionFactory

 {

-	DialerThread dialer;    

-	AmSessionEventHandlerFactory* uac_auth_f;

+  DialerThread dialer;    

-	string auth_realm;

-	string auth_user;

-	string auth_pwd;

+  string auth_realm;

+  string auth_user;

+  string auth_pwd;

 public:

-    static string AnnouncePath;

-    static string AnnounceFile;

+  static string AnnouncePath;

+  static string AnnounceFile;

-    AnnounceAuthFactory(const string& _app_name);

+  AnnounceAuthFactory(const string& _app_name);

-    int onLoad();

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

-			const map<string,string>& app_params);

+  int onLoad();

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

+		      const map<string,string>& app_params);

 };

 class AnnounceAuthDialog : public AmSession,

-						   public CredentialHolder

+			   public CredentialHolder

 {

-    AmAudioFile wav_file;

-    string filename;

-    UACAuthCred credentials;

-

- public:

-	AnnounceAuthDialog(const string& filename,

-					   const string& auth_realm, 

-					   const string& auth_user,

-					   const string& auth_pwd);

-    ~AnnounceAuthDialog();

-

-    void onSessionStart();

-    void startSession();

-    void onBye(const AmSipRequest& req);

-    void onDtmf(int event, int duration_msec) {}

-

-    void process(AmEvent* event);

-    inline UACAuthCred* getCredentials();

+  AmAudioFile wav_file;

+  string filename;

+  UACAuthCred credentials;

+

+public:

+  AnnounceAuthDialog(const string& filename,

+		     const string& auth_realm, 

+		     const string& auth_user,

+		     const string& auth_pwd);

+  ~AnnounceAuthDialog();

+

+  void onSessionStart();

+  void startSession();

+  void onBye(const AmSipRequest& req);

+  void onDtmf(int event, int duration_msec) {}

+

+  void process(AmEvent* event);

+  inline UACAuthCred* getCredentials();

 };

@@ -225,25 +225,10 @@ void b2b_connectDialog::onCancel(const AmSipRequest& req)

 AmB2ABCalleeSession* b2b_connectDialog::createCalleeSession()

 {

-  b2b_connectCalleeSession* sess = new b2b_connectCalleeSession(getLocalTag(),

-								connector, 

-								user, password);

+  b2b_connectCalleeSession* sess =

+    new b2b_connectCalleeSession(getLocalTag(), connector, user, password);

-  AmSessionEventHandlerFactory* uac_auth_f = 

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

-  

-  if (NULL != uac_auth_f) {

-    DBG("UAC Auth enabled for new b2b_connect session.\n");

-    AmSessionEventHandler* h = uac_auth_f->getHandler(sess);

-    if (h != NULL )

-      sess->addHandler(h);

-    else {

-      ERROR("unable to set SIP UAC auth for new session.");

-    } 

-  } else {

-    ERROR("unable to get SIP UAC auth."

-          "(uac_auth module loaded?)\n");

-  }

+  AmUACAuth::enable(sess);

   return sess;

 }

@@ -29,7 +29,7 @@

 #define _B2B_CONNECT_H

 #include "AmB2ABSession.h"

-#include "ampi/UACAuthAPI.h"

+#include "AmUACAuth.h"

 using std::string;

@@ -98,29 +98,14 @@ AmSession* DtmfTesterFactory::onInvite(const AmSipRequest& req, const string& ap

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

 				       AmArg& session_params)

 {

-  UACAuthCred* cred = NULL;

-  if (session_params.getType() == AmArg::AObject) {

-    AmObject* cred_obj = session_params.asObject();

-    if (cred_obj)

-      cred = dynamic_cast<UACAuthCred*>(cred_obj);

-  }

+  UACAuthCred* cred = AmUACAuth::unpackCredentials(session_params);

   AmSession* s = new DtmfTesterDialog(getAnnounceFile(req), cred); 

   if (NULL == cred) {

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

   } else {

-    AmSessionEventHandlerFactory* uac_auth_f = 

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

-    if (uac_auth_f != NULL) {

-      DBG("UAC Auth enabled for new announcement session.\n");

-      AmSessionEventHandler* h = uac_auth_f->getHandler(s);

-      if (h != NULL )

-	s->addHandler(h);

-    } else {

-      ERROR("uac_auth interface not accessible. "

-	    "Load uac_auth for authenticated dialout.\n");

-    }		

+    AmUACAuth::enable(s);

   }

   return s;

@@ -31,7 +31,7 @@

 #include "AmConfigReader.h"

 #include "AmPlaylist.h"

-#include "ampi/UACAuthAPI.h"

+#include "AmUACAuth.h"

 #include <string>

 using std::string;

@@ -32,29 +32,14 @@ AmSession* EarlyRecordFactory::onInvite(const AmSipRequest& req, const string& a

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

 					AmArg& session_params)

 {

-  UACAuthCred* cred = NULL;

-  if (session_params.getType() == AmArg::AObject) {

-    AmObject* cred_obj = session_params.asObject();

-    if (cred_obj)

-      cred = dynamic_cast<UACAuthCred*>(cred_obj);

-  }

+  UACAuthCred* cred = AmUACAuth::unpackCredentials(session_params);

   AmSession* s = new EarlyRecordDialog(cred); 

   if (NULL == cred) {

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

   } else {

-    AmSessionEventHandlerFactory* uac_auth_f = 

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

-    if (uac_auth_f != NULL) {

-      DBG("UAC Auth enabled for new announcement session.\n");

-      AmSessionEventHandler* h = uac_auth_f->getHandler(s);

-      if (h != NULL )

-	s->addHandler(h);

-    } else {

-      ERROR("uac_auth interface not accessible. "

-	    "Load uac_auth for authenticated dialout.\n");

-    }		

+    AmUACAuth::enable(s);

   }

   return s;

@@ -3,7 +3,7 @@

 #include "AmSession.h"

 #include "AmAudioFile.h"

-#include "ampi/UACAuthAPI.h"

+#include "AmUACAuth.h"

 #include <string>

 using std::string;

@@ -176,21 +176,8 @@ AmB2ABCalleeSession* ServiceLineCallerDialog::createCalleeSession() {

   ServiceLineCalleeDialog* sess = 

     new ServiceLineCalleeDialog(getLocalTag(), connector);

-  AmSessionEventHandlerFactory* uac_auth_f = 

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

-  

-  if (NULL != uac_auth_f) {

-    DBG("UAC Auth enabled for new serviceline session.\n");

-    AmSessionEventHandler* h = uac_auth_f->getHandler(sess);

-    if (h != NULL )

-      sess->addHandler(h);

-    else {

-      ERROR("unable to set SIP UAC auth for new session.");

-    } 

-  } else {

-    ERROR("unable to get SIP UAC auth."

-	  "(uac_auth module loaded?)\n");

-  }

+  AmUACAuth::enable(sess);

+

   return sess;

 }

@@ -30,7 +30,7 @@

 #include "AmConfigReader.h"

 #include "AmAudioFile.h"

 #include "AmB2ABSession.h"

-#include "ampi/UACAuthAPI.h"

+#include "AmUACAuth.h"

 #include <string>

 using std::string;

@@ -125,8 +125,8 @@ void RegThread::create_registration(RegInfo& ri) {

   if (di_f == NULL) {

     ERROR("unable to get a registrar_client\n");

   } else {

-    AmDynInvoke* uac_auth_i = di_f->getInstance();

-    if (uac_auth_i!=NULL) {

+    AmDynInvoke* registrar_client_i = di_f->getInstance();

+    if (registrar_client_i!=NULL) {

       DBG("calling createRegistration\n");

       AmArg di_args, reg_handle;

@@ -139,7 +139,7 @@ void RegThread::create_registration(RegInfo& ri) {

       di_args.push(ri.proxy.c_str());

       di_args.push(ri.contact.c_str());

-      uac_auth_i->invoke("createRegistration", di_args, reg_handle);

+      registrar_client_i->invoke("createRegistration", di_args, reg_handle);

       if (reg_handle.size()) 

 	ri.handle = reg_handle.get(0).asCStr();

     }

@@ -153,12 +153,12 @@ bool RegThread::check_registration(const RegInfo& ri) {

   if (di_f == NULL) {

     ERROR("unable to get a registrar_client\n");

   } else {

-    AmDynInvoke* uac_auth_i = di_f->getInstance();

-    if (uac_auth_i!=NULL) {

+    AmDynInvoke* registrar_client_i = di_f->getInstance();

+    if (registrar_client_i!=NULL) {

       AmArg di_args, res;

       di_args.push(ri.handle.c_str());

-      uac_auth_i->invoke("getRegistrationState", di_args, res);

+      registrar_client_i->invoke("getRegistrationState", di_args, res);

       if (res.size()) {

 	if (!res.get(0).asInt())

 	  return false; // does not exist

@@ -383,25 +383,14 @@ AmSession* WebConferenceFactory::onInvite(const AmSipRequest& req, const string&

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

 					  AmArg& session_params)

 {

-  UACAuthCred* cred = NULL;

-  if (session_params.getType() == AmArg::AObject) {

-    AmObject* cred_obj = session_params.asObject();

-    if (cred_obj)

-      cred = dynamic_cast<UACAuthCred*>(cred_obj);

-  }

-

+  UACAuthCred* cred = AmUACAuth::unpackCredentials(session_params);

   AmSession* s = new WebConferenceDialog(prompts, getInstance(), cred); 

-  AmSessionEventHandlerFactory* uac_auth_f = 

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

-  if (uac_auth_f != NULL) {

-    DBG("UAC Auth enabled for new announcement session.\n");

-    AmSessionEventHandler* h = uac_auth_f->getHandler(s);

-    if (h != NULL )

-      s->addHandler(h);

+  if (NULL == cred) {

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

   } else {

-    ERROR("uac_auth interface not accessible. Load uac_auth for authenticated dialout.\n");

-  }		

+    AmUACAuth::enable(s);

+  }

   s->setUri(getAccessUri(req.user));

@@ -32,7 +32,7 @@

 #include "AmConferenceChannel.h"

 #include "AmPlaylist.h"

 #include "AmPromptCollection.h"

-#include "ampi/UACAuthAPI.h"

+#include "AmUACAuth.h"

 #include "AmRingTone.h"

 class WebConferenceFactory;

new file mode 100644

@@ -0,0 +1,48 @@

+

+#include "AmUACAuth.h"

+

+UACAuthCred::UACAuthCred() { }

+UACAuthCred::UACAuthCred(const string& realm,

+			 const string& user,

+			 const string& pwd)

+  : realm(realm), user(user), pwd(pwd) { }

+

+

+

+AmUACAuth::AmUACAuth() { }

+

+AmUACAuth::~AmUACAuth() { }

+

+

+UACAuthCred* AmUACAuth::unpackCredentials(const AmArg& arg) {

+  UACAuthCred* cred = NULL;

+  if (arg.getType() == AmArg::AObject) {

+    AmObject* cred_obj = arg.asObject();

+    if (cred_obj)

+      cred = dynamic_cast<UACAuthCred*>(cred_obj);

+  }

+  return cred;

+}

+

+

+bool AmUACAuth::enable(AmSession* s) {

+  bool res = false;

+

+  AmSessionEventHandlerFactory* uac_auth_f = 

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

+  if (uac_auth_f != NULL) {

+    AmSessionEventHandler* h = uac_auth_f->getHandler(s);

+    if (h != NULL ) {

+      DBG("enabling SIP UAC auth for new session.\n");

+      s->addHandler(h);

+      res = true;

+    } else {

+      WARN("trying to get auth handler for invalid session "

+	   "(derived from CredentialHolder?)\n");

+    }

+  } else {

+    WARN("uac_auth interface not accessible. "

+	  "Load uac_auth for authenticated calls.\n");

+  }

+  return res;