Clean something in h323chan.
git-svn-id: http://voip.null.ro/svn/yate@125 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
diana
parent
5250cf4235
commit
3fd0fa7a3c
|
|
@ -420,7 +420,6 @@ BOOL YateGatekeeperServer::Init ()
|
|||
if (!AddListener(new H323GatekeeperListener(endpoint, *this,s_cfg.getValue("gk","name","YateGatekeeper"),new H323TransportUDP(endpoint,PIPSocket::Address(addr),s_cfg.getIntValue("gk","port",1719),0))))
|
||||
Debug(DebugGoOn,"I can't start the listener for address: %s",addr);
|
||||
}
|
||||
Debug(DebugInfo,"i = %d",i);
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -28,16 +28,19 @@
|
|||
|
||||
using namespace TelEngine;
|
||||
|
||||
Mutex lmutex;
|
||||
|
||||
static Configuration s_cfg(Engine::configFile("regfile"));
|
||||
|
||||
ObjList registered;
|
||||
|
||||
class AuthHandler : public MessageHandler
|
||||
{
|
||||
public:
|
||||
AuthHandler(const char *name)
|
||||
: MessageHandler(name) { }
|
||||
AuthHandler(const char *name,int prio)
|
||||
: MessageHandler(name,prio) { }
|
||||
virtual bool received(Message &msg);
|
||||
};
|
||||
/*
|
||||
class RegistHandler : public MessageHandler
|
||||
{
|
||||
public:
|
||||
|
|
@ -58,8 +61,8 @@ public:
|
|||
class RouteHandler : public MessageHandler
|
||||
{
|
||||
public:
|
||||
RouteHandler(const char *name)
|
||||
: MessageHandler(name) { }
|
||||
RouteHandler(const char *name, int prio)
|
||||
: MessageHandler(name,prio) { }
|
||||
virtual bool received(Message &msg);
|
||||
};
|
||||
|
||||
|
|
@ -70,7 +73,6 @@ public:
|
|||
: MessageHandler(name,prio) { }
|
||||
virtual bool received(Message &msg);
|
||||
};
|
||||
*/
|
||||
|
||||
class RegfilePlugin : public Plugin
|
||||
{
|
||||
|
|
@ -80,20 +82,20 @@ public:
|
|||
virtual void initialize();
|
||||
private:
|
||||
AuthHandler *m_authhandler;
|
||||
/*RegistHandler *m_registhandler;
|
||||
RegistHandler *m_registhandler;
|
||||
UnRegistHandler *m_unregisthandler;
|
||||
RouteHandler *m_routehandler;
|
||||
StatusHandler *m_statushandler;*/
|
||||
StatusHandler *m_statushandler;
|
||||
};
|
||||
|
||||
bool AuthHandler::received(Message &msg)
|
||||
{
|
||||
String username(msg.getValue("username"));
|
||||
msg.retValue() = s_cfg.getValue(username,"password");
|
||||
Debug(DebugInfo,"i'm in %i",!msg.retValue().null());
|
||||
return (!msg.retValue().null());
|
||||
};
|
||||
|
||||
#if 0
|
||||
|
||||
bool RegistHandler::received(Message &msg)
|
||||
{
|
||||
|
|
@ -102,111 +104,52 @@ bool RegistHandler::received(Message &msg)
|
|||
const char *data = c_safe(msg.getValue("data"));
|
||||
|
||||
|
||||
Lock lock(dbmutex);
|
||||
if (!conn)
|
||||
return false;
|
||||
|
||||
char buffer[2048];
|
||||
snprintf(buffer,sizeof(buffer),"SELECT credit,price,e164,context FROM register WHERE username='%s'",username);
|
||||
PGresult *respgsql = PQexec(conn,buffer);
|
||||
if (!respgsql || PQresultStatus(respgsql) != PGRES_TUPLES_OK)
|
||||
{
|
||||
Debug(DebugFail,"Failed to query from database: %s",
|
||||
PQerrorMessage(conn));
|
||||
return false;
|
||||
}
|
||||
if (PQntuples(respgsql) == 0) {
|
||||
Debug(DebugFail,"No credit.");
|
||||
return false;
|
||||
}
|
||||
|
||||
const char *credit = PQgetvalue(respgsql,0,0);
|
||||
const char *price = PQgetvalue(respgsql,0,1);
|
||||
const char *prefix = PQgetvalue(respgsql,0,2);
|
||||
const char *context = PQgetvalue(respgsql,0,3);
|
||||
|
||||
snprintf(buffer,sizeof(buffer),"INSERT INTO routepaid (context,prefix,tehno,data,price) VALUES ('%s','%s','%s','%s',%s);",context,prefix,techno,data,price);
|
||||
|
||||
PGresult *respgsql1 = PQexec(conn,buffer);
|
||||
if (!respgsql1 || PQresultStatus(respgsql1) != PGRES_COMMAND_OK)
|
||||
Debug(DebugFail,"Failed to insert in database: %s",
|
||||
PQerrorMessage(conn));
|
||||
msg.retValue() = prefix;
|
||||
Debug(DebugInfo,"prefix in register este %s",prefix);
|
||||
Lock lock(lmutex);
|
||||
if (s_cfg.getSection(username)){
|
||||
s_cfg.setValue(username,"register",true);
|
||||
s_cfg.setValue(username,"techno",techno);
|
||||
s_cfg.setValue(username,"data",data);
|
||||
} else
|
||||
return false;
|
||||
return true;
|
||||
|
||||
};
|
||||
|
||||
bool UnRegistHandler::received(Message &msg)
|
||||
{
|
||||
const char *prefix = c_safe(msg.getValue("prefix"));
|
||||
Debug(DebugInfo,"prefix=%s",prefix);
|
||||
const char *username = c_safe(msg.getValue("username"));
|
||||
|
||||
Lock lock(dbmutex);
|
||||
if (!conn)
|
||||
return false;
|
||||
|
||||
char buffer[2048];
|
||||
snprintf(buffer,sizeof(buffer),"DELETE from routepaid WHERE prefix='%s'",prefix);
|
||||
PGresult *respgsql = PQexec(conn,buffer);
|
||||
if (!respgsql || PQresultStatus(respgsql) != PGRES_TUPLES_OK)
|
||||
{
|
||||
Debug(DebugFail,"Failed to query from database: %s",
|
||||
PQerrorMessage(conn));
|
||||
return false;
|
||||
}
|
||||
if (PQntuples(respgsql) == 0) {
|
||||
Debug(DebugFail,"No user.");
|
||||
return false;
|
||||
}
|
||||
Lock lock(lmutex);
|
||||
if (s_cfg.getSection(username))
|
||||
s_cfg.setValue(username,"register",false);
|
||||
else
|
||||
return false;
|
||||
return true;
|
||||
|
||||
};
|
||||
|
||||
bool RouteHandler::received(Message &msg)
|
||||
{
|
||||
char buffer[2048];
|
||||
unsigned long long tmr = Time::now();
|
||||
String called(msg.getValue("called"));
|
||||
if (called.null())
|
||||
const char *username = c_safe(msg.getValue("username"));
|
||||
|
||||
Lock lock(lmutex);
|
||||
if (s_cfg.getSection(username))
|
||||
msg.retValue() = s_cfg.getValue(username,"data");
|
||||
else
|
||||
return false;
|
||||
Lock lock(dbmutex);
|
||||
if (!conn)
|
||||
return false;
|
||||
s_route_rq++;
|
||||
const char *context = c_safe(msg.getValue("context","default"));
|
||||
snprintf(buffer,sizeof(buffer),"SELECT tehno,data,length (prefix) as lll,price"
|
||||
" from routepaid where prefix= substring('%s',1,length(prefix))"
|
||||
" and context='%s' order by lll desc LIMIT 1",called.c_str(),context);
|
||||
PGresult *respgsql = PQexec(conn,buffer);
|
||||
if (!respgsql || PQresultStatus(respgsql) != PGRES_TUPLES_OK)
|
||||
{
|
||||
Debug(DebugFail,"Failed to query from database: %s",
|
||||
PQerrorMessage(conn));
|
||||
s_route_err++;
|
||||
return false;
|
||||
}
|
||||
if (PQntuples(respgsql) == 0) {
|
||||
Debug(DebugFail,"No route.");
|
||||
s_route_no++;
|
||||
return false;
|
||||
}
|
||||
msg.retValue() = String(PQgetvalue(respgsql,0,0))+"/" + String(PQgetvalue(respgsql,0,1));
|
||||
Debug(DebugInfo,"Routing call to '%s' in context '%s' using '%s' tehnology and data in %llu usec",
|
||||
called.c_str(),context,msg.retValue().c_str(),Time::now()-tmr);
|
||||
s_route_yes++;
|
||||
return true;
|
||||
};
|
||||
|
||||
bool StatusHandler::received(Message &msg)
|
||||
{
|
||||
msg.retValue() << "Regfile,conn=" << (conn != 0) <<"\n";
|
||||
msg.retValue() << "Regfile,users=";
|
||||
for (int i=0;i<s_cfg.count(),i++)
|
||||
msg.retValue() << s_cfg.getSection();
|
||||
msg.retValue() <<"\n";
|
||||
return false;
|
||||
}
|
||||
|
||||
#endif
|
||||
RegfilePlugin::RegfilePlugin()
|
||||
: m_authhandler(0)//,m_registhandler(0),m_routehandler(0),m_statushandler(0)
|
||||
: m_authhandler(0),m_registhandler(0),m_routehandler(0),m_statushandler(0)
|
||||
{
|
||||
Output("Loaded module Registration from file");
|
||||
}
|
||||
|
|
@ -214,12 +157,11 @@ RegfilePlugin::RegfilePlugin()
|
|||
void RegfilePlugin::initialize()
|
||||
{
|
||||
Output("Initializing module Register for file");
|
||||
s_cfg.load();
|
||||
if (!m_authhandler) {
|
||||
s_cfg.load();
|
||||
Output("Installing Authentification handler");
|
||||
Engine::install(m_authhandler = new AuthHandler("auth"));
|
||||
Engine::install(m_authhandler = new AuthHandler("auth",s_cfg.getIntValue("general","auth",10)));
|
||||
}
|
||||
/*
|
||||
if (!m_registhandler) {
|
||||
Output("Installing Registering handler");
|
||||
Engine::install(new RegistHandler("regist"));
|
||||
|
|
@ -230,12 +172,12 @@ void RegfilePlugin::initialize()
|
|||
}
|
||||
if (!m_routehandler) {
|
||||
Output("Installing Route handler");
|
||||
Engine::install(new RouteHandler("route"));
|
||||
Engine::install(new RouteHandler("route",s_cfg.getIntValue("general","route",100)));
|
||||
}
|
||||
if (!m_statushandler) {
|
||||
Output("Installing Status handler");
|
||||
Engine::install(new StatusHandler("status"));
|
||||
}*/
|
||||
}
|
||||
}
|
||||
|
||||
INIT_PLUGIN(RegfilePlugin);
|
||||
|
|
|
|||
Loading…
Reference in New Issue