Skip to content

O
OpenXG-UDR
Commit e29e19ce authored by yangjian's avatar yangjian
Browse files
Options

clean up udr code

parent c438f8e9
Hide whitespace changes
Inline Side-by-side
Showing with 138 additions and 80 deletions
src/impl/AuthenticationStatusDocumentApiImpl.cpp
View file @ e29e19ce
......@@ -29,24 +29,42 @@ using namespace org::openapitools::server::model;
AuthenticationStatusDocumentApiImpl::AuthenticationStatusDocumentApiImpl(
std::shared_ptr<Pistache::Rest::Router> rtr, MYSQL *mysql)
: AuthenticationStatusDocumentApi(rtr) {
mysql_WitcommUDRDB = mysql;
// mysql_WitcommUDRDB = mysql;
mysql_WitcommUDRDB = new MYSQL();
mysql_init(mysql_WitcommUDRDB);
if (!mysql_real_connect(mysql_WitcommUDRDB, udr_cfg.mysql.mysql_server.c_str(),udr_cfg.mysql.mysql_user.c_str(),udr_cfg.mysql.mysql_pass.c_str(),udr_cfg.mysql.mysql_db.c_str(), udr_cfg.mysql.mysql_port, 0, 0))
{
Logger::udr_server().error("An error occurred while connecting to db: %s", mysql_error(mysql_WitcommUDRDB));
return ;
}
}
AuthenticationStatusDocumentApiImpl::~AuthenticationStatusDocumentApiImpl()
{
if(mysql_WitcommUDRDB)
mysql_close(mysql_WitcommUDRDB);
}
void AuthenticationStatusDocumentApiImpl::create_authentication_status(
const std::string &ueId, const AuthEvent &authEvent,
Pistache::Http::ResponseWriter &response) {
// response.send(Pistache::Http::Code::Ok, "create_authentication_status\n");
Logger::udr_server().debug("****** CreateAuthenticationStatus start：imsi-%s ******",ueId.c_str());
Logger::udr_server().info("AuthenticationStatus PUT - response->UDM");
response.send(Pistache::Http::Code::No_Content, "");
MYSQL mysqldb;
mysql_init(&mysqldb);
if (!mysql_real_connect(&mysqldb, udr_cfg.mysql.mysql_server.c_str(),udr_cfg.mysql.mysql_user.c_str(),udr_cfg.mysql.mysql_pass.c_str(),udr_cfg.mysql.mysql_db.c_str(), udr_cfg.mysql.mysql_port, 0, 0))
{
Logger::udr_server().error("An error occurred while connecting to db: %s", mysql_error(&mysqldb));
return ;
}
// MYSQL mysqldb;
// Logger::udr_server().debug("****** create_authentication_status mysql_init start ******");
// mysql_init(&mysqldb);
// Logger::udr_server().debug("****** create_authentication_status mysql_init end ******");
// Logger::udr_server().debug("****** create_authentication_status mysql_real_connect start ******");
// if (!mysql_real_connect(&mysqldb, udr_cfg.mysql.mysql_server.c_str(),udr_cfg.mysql.mysql_user.c_str(),udr_cfg.mysql.mysql_pass.c_str(),udr_cfg.mysql.mysql_db.c_str(), udr_cfg.mysql.mysql_port, 0, 0))
// {
// Logger::udr_server().error("An error occurred while connecting to db: %s", mysql_error(&mysqldb));
// return ;
// }
// Logger::udr_server().debug("****** create_authentication_status mysql_real_connect end ******");
MYSQL_RES *res = NULL;
MYSQL_ROW row;
......@@ -56,19 +74,19 @@ void AuthenticationStatusDocumentApiImpl::create_authentication_status(
std::string query;
nlohmann::json j;
if (mysql_real_query(&mysqldb, select_AuthenticationStatus.c_str(),
if (mysql_real_query(mysql_WitcommUDRDB, select_AuthenticationStatus.c_str(),
(unsigned long)select_AuthenticationStatus.size())) {
Logger::udr_server().error("mysql_real_query failure！SQL(%s)",
select_AuthenticationStatus.c_str());
mysql_close(&mysqldb);
// mysql_close(&mysqldb);
return;
}
res = mysql_store_result(&mysqldb);
res = mysql_store_result(mysql_WitcommUDRDB);
if (res == NULL) {
Logger::udr_server().error("mysql_store_result failure！SQL(%s)",
select_AuthenticationStatus.c_str());
mysql_close(&mysqldb);
// mysql_close(&mysqldb);
return;
}
if (mysql_num_rows(res)) {
......@@ -101,43 +119,44 @@ void AuthenticationStatusDocumentApiImpl::create_authentication_status(
}
mysql_free_result(res);
if (mysql_real_query(&mysqldb, query.c_str(),
if (mysql_real_query(mysql_WitcommUDRDB, query.c_str(),
(unsigned long)query.size())) {
Logger::udr_server().error("mysql create failure！SQL(%s)", query.c_str());
mysql_close(&mysqldb);
// mysql_close(&mysqldb);
return;
}
mysql_close(&mysqldb);
// mysql_close(&mysqldb);
to_json(j, authEvent);
Logger::udr_server().debug("AuthenticationStatus PUT - json:\n\"%s\"",
j.dump().c_str());
Logger::udr_server().debug("****** CreateAuthenticationStatus end：imsi-%s ******",ueId.c_str());
// to_json(j, authEvent);
// Logger::udr_server().debug("AuthenticationStatus PUT - json:\n\"%s\"",
// j.dump().c_str());
}
void AuthenticationStatusDocumentApiImpl::delete_authentication_status(
const std::string &ueId, Pistache::Http::ResponseWriter &response) {
MYSQL mysqldb;
mysql_init(&mysqldb);
if (!mysql_real_connect(&mysqldb, udr_cfg.mysql.mysql_server.c_str(),udr_cfg.mysql.mysql_user.c_str(),udr_cfg.mysql.mysql_pass.c_str(),udr_cfg.mysql.mysql_db.c_str(), udr_cfg.mysql.mysql_port, 0, 0))
{
Logger::udr_server().error("An error occurred while connecting to db: %s", mysql_error(&mysqldb));
return ;
}
// MYSQL mysqldb;
// mysql_init(&mysqldb);
// if (!mysql_real_connect(&mysqldb, udr_cfg.mysql.mysql_server.c_str(),udr_cfg.mysql.mysql_user.c_str(),udr_cfg.mysql.mysql_pass.c_str(),udr_cfg.mysql.mysql_db.c_str(), udr_cfg.mysql.mysql_port, 0, 0))
// {
// Logger::udr_server().error("An error occurred while connecting to db: %s", mysql_error(&mysqldb));
// return ;
// }
const std::string query =
"DELETE from AuthenticationStatus WHERE ueid='" + ueId + "'";
if (mysql_real_query(&mysqldb, query.c_str(),
if (mysql_real_query(mysql_WitcommUDRDB, query.c_str(),
(unsigned long)query.size())) {
Logger::udr_server().error("mysql_real_query failure！SQL(%s)",
query.c_str());
mysql_close(&mysqldb);
// mysql_close(&mysqldb);
return;
}
mysql_close(&mysqldb);
// mysql_close(&mysqldb);
response.send(Pistache::Http::Code::No_Content, "");
Logger::udr_server().debug("AuthenticationStatus DELETE - successful");
......@@ -147,6 +166,9 @@ void AuthenticationStatusDocumentApiImpl::query_authentication_status(
const Pistache::Optional<std::vector<std::string>> &fields,
const Pistache::Optional<std::string> &supportedFeatures,
Pistache::Http::ResponseWriter &response) {
Logger::udr_server().debug("****** QueryAuthenticationStatus start：imsi-%s ******",ueId.c_str());
MYSQL_RES *res = NULL;
MYSQL_ROW row;
MYSQL_FIELD *field = nullptr;
......@@ -157,28 +179,32 @@ void AuthenticationStatusDocumentApiImpl::query_authentication_status(
const std::string query =
"select * from AuthenticationStatus WHERE ueid='" + ueId + "'";
MYSQL mysqldb;
mysql_init(&mysqldb);
if (!mysql_real_connect(&mysqldb, udr_cfg.mysql.mysql_server.c_str(),udr_cfg.mysql.mysql_user.c_str(),udr_cfg.mysql.mysql_pass.c_str(),udr_cfg.mysql.mysql_db.c_str(), udr_cfg.mysql.mysql_port, 0, 0))
{
Logger::udr_server().error("An error occurred while connecting to db: %s", mysql_error(&mysqldb));
mysql_close(&mysqldb);
return ;
}
if (mysql_real_query(&mysqldb, query.c_str(),
// MYSQL mysqldb;
// Logger::udr_server().debug("****** query_authentication_status mysql_init start ******");
// mysql_init(&mysqldb);
// Logger::udr_server().debug("****** query_authentication_status mysql_init end ******");
// Logger::udr_server().debug("****** query_authentication_status mysql_real_connect start ******");
// if (!mysql_real_connect(&mysqldb, udr_cfg.mysql.mysql_server.c_str(),udr_cfg.mysql.mysql_user.c_str(),udr_cfg.mysql.mysql_pass.c_str(),udr_cfg.mysql.mysql_db.c_str(), udr_cfg.mysql.mysql_port, 0, 0))
// {
// Logger::udr_server().error("An error occurred while connecting to db: %s", mysql_error(&mysqldb));
// mysql_close(&mysqldb);
// return ;
// }
// Logger::udr_server().debug("****** query_authentication_status mysql_real_connect end ******");
if (mysql_real_query(mysql_WitcommUDRDB, query.c_str(),
(unsigned long)query.size())) {
Logger::udr_server().error("mysql_real_query failure！SQL(%s)",
query.c_str());
mysql_close(&mysqldb);
// mysql_close(&mysqldb);
return;
}
res = mysql_store_result(&mysqldb);
res = mysql_store_result(mysql_WitcommUDRDB);
if (res == NULL) {
Logger::udr_server().error("mysql_store_result failure！");
mysql_close(&mysqldb);
// mysql_close(&mysqldb);
return;
}
......@@ -211,15 +237,16 @@ void AuthenticationStatusDocumentApiImpl::query_authentication_status(
to_json(j, authenticationstatus);
response.send(Pistache::Http::Code::Ok, j.dump());
Logger::udr_server().debug("AuthenticationStatus GET - json:\n\"%s\"",
j.dump().c_str());
// Logger::udr_server().debug("AuthenticationStatus GET - json:\n\"%s\"",
// j.dump().c_str());
} else {
Logger::udr_server().error("AuthenticationStatus no data！SQL(%s)",
query.c_str());
}
mysql_free_result(res);
mysql_close(&mysqldb);
// mysql_close(&mysqldb);
Logger::udr_server().debug("****** QueryAuthenticationStatus end：imsi-%s ******",ueId.c_str());
}
} // namespace api
......
src/impl/AuthenticationStatusDocumentApiImpl.h
View file @ e29e19ce
......@@ -44,7 +44,7 @@ using namespace org::openapitools::server::model;
class AuthenticationStatusDocumentApiImpl : public org::openapitools::server::api::AuthenticationStatusDocumentApi {
public:
AuthenticationStatusDocumentApiImpl(std::shared_ptr<Pistache::Rest::Router>,MYSQL *mysql);
~AuthenticationStatusDocumentApiImpl() {}
virtual ~AuthenticationStatusDocumentApiImpl();
void create_authentication_status(const std::string &ueId, const AuthEvent &authEvent, Pistache::Http::ResponseWriter &response);
......
src/impl/AuthenticationSubscriptionDocumentApiImpl.cpp
View file @ e29e19ce
......@@ -34,7 +34,24 @@ AuthenticationSubscriptionDocumentApiImpl::
AuthenticationSubscriptionDocumentApiImpl(
std::shared_ptr<Pistache::Rest::Router> rtr, MYSQL *mysql)
: AuthenticationSubscriptionDocumentApi(rtr) {
mysql_WitcommUDRDB = mysql;
// mysql_WitcommUDRDB = mysql;
mysql_WitcommUDRDB = new MYSQL();
// MYSQL mysqldb;
mysql_init(mysql_WitcommUDRDB);
if (!mysql_real_connect(mysql_WitcommUDRDB, udr_cfg.mysql.mysql_server.c_str(),udr_cfg.mysql.mysql_user.c_str(),udr_cfg.mysql.mysql_pass.c_str(),udr_cfg.mysql.mysql_db.c_str(), udr_cfg.mysql.mysql_port, 0, 0))
{
Logger::udr_server().error("An error occurred while connecting to db: %s", mysql_error(mysql_WitcommUDRDB));
return ;
}
// mysql_WitcommUDRDB = &mysqldb;
}
AuthenticationSubscriptionDocumentApiImpl::
~AuthenticationSubscriptionDocumentApiImpl(){
if(mysql_WitcommUDRDB)
mysql_close(mysql_WitcommUDRDB);
delete mysql_WitcommUDRDB;
}
void AuthenticationSubscriptionDocumentApiImpl::
......@@ -42,17 +59,22 @@ void AuthenticationSubscriptionDocumentApiImpl::
const std::string &ueId, const std::vector<PatchItem> &patchItem,
const Pistache::Optional<std::string> &supportedFeatures,
Pistache::Http::ResponseWriter &response) {
Logger::udr_server().debug("****** ModifyAuthenticationSubscription start：imsi-%s ******",ueId.c_str());
Logger::udr_server().info("AuthenticationSubscription PATCH - response->UDM");
response.send(Pistache::Http::Code::No_Content, "");
MYSQL mysqldb;
mysql_init(&mysqldb);
if (!mysql_real_connect(&mysqldb, udr_cfg.mysql.mysql_server.c_str(),udr_cfg.mysql.mysql_user.c_str(),udr_cfg.mysql.mysql_pass.c_str(),udr_cfg.mysql.mysql_db.c_str(), udr_cfg.mysql.mysql_port, 0, 0))
{
Logger::udr_server().error("An error occurred while connecting to db: %s", mysql_error(&mysqldb));
return ;
}
// MYSQL mysqldb;
// Logger::udr_server().debug("****** modify_authentication_subscription mysql_init start ******");
// mysql_init(&mysqldb);
// Logger::udr_server().debug("****** modify_authentication_subscription mysql_init end ******");
// Logger::udr_server().debug("****** modify_authentication_subscription mysql_real_connect start ******");
// if (!mysql_real_connect(&mysqldb, udr_cfg.mysql.mysql_server.c_str(),udr_cfg.mysql.mysql_user.c_str(),udr_cfg.mysql.mysql_pass.c_str(),udr_cfg.mysql.mysql_db.c_str(), udr_cfg.mysql.mysql_port, 0, 0))
// {
// Logger::udr_server().error("An error occurred while connecting to db: %s", mysql_error(&mysqldb));
// return ;
// }
// Logger::udr_server().debug("****** modify_authentication_subscription mysql_real_connect end ******");
MYSQL_RES *res = NULL;
MYSQL_ROW row;
......@@ -71,19 +93,19 @@ void AuthenticationSubscriptionDocumentApiImpl::
.get_to(sequencenumber);
if (mysql_real_query(
&mysqldb, select_Authenticationsubscription.c_str(),
mysql_WitcommUDRDB, select_Authenticationsubscription.c_str(),
(unsigned long)select_Authenticationsubscription.size())) {
Logger::udr_server().error("mysql_real_query failure！SQL(%s)",
select_Authenticationsubscription.c_str());
mysql_close(&mysqldb);
// mysql_close(&mysqldb);
return;
}
res = mysql_store_result(&mysqldb);
res = mysql_store_result(mysql_WitcommUDRDB);
if (res == NULL) {
Logger::udr_server().error("mysql_store_result failure！SQL(%s)",
select_Authenticationsubscription.c_str());
mysql_close(&mysqldb);
// mysql_close(&mysqldb);
return;
}
if (mysql_num_rows(res)) {
......@@ -103,11 +125,11 @@ void AuthenticationSubscriptionDocumentApiImpl::
// Logger::udr_server().debug("modify content:
// %s",query.c_str());
if (mysql_real_query(&mysqldb, query.c_str(),
if (mysql_real_query(mysql_WitcommUDRDB, query.c_str(),
(unsigned long)query.size())) {
Logger::udr_server().error("update mysql failure！SQL(%s)",
query.c_str());
mysql_close(&mysqldb);
// mysql_close(&mysqldb);
return;
}
}
......@@ -116,12 +138,13 @@ void AuthenticationSubscriptionDocumentApiImpl::
j += tmp_j;
}
mysql_close(&mysqldb);
// mysql_close(&mysqldb);
// response.send(Pistache::Http::Code::No_Content, "");
std::string out = j.dump();
Logger::udr_server().debug("AuthenticationSubscription PATCH - json:\n\"%s\"",
out.c_str());
// Logger::udr_server().debug("AuthenticationSubscription PATCH - json:\n\"%s\"",
// j.dump().c_str());
Logger::udr_server().debug("****** ModifyAuthenticationSubscription end：imsi-%s ******",ueId.c_str());
}
void AuthenticationSubscriptionDocumentApiImpl::
......@@ -129,37 +152,43 @@ void AuthenticationSubscriptionDocumentApiImpl::
const std::string &ueId,
const Pistache::Optional<std::string> &supportedFeatures,
Pistache::Http::ResponseWriter &response) {
Logger::udr_server().debug("****** ReadAuthenticationSubscription start：imsi-%s ******",ueId.c_str());
MYSQL_RES *res = NULL;
MYSQL_ROW row;
MYSQL_FIELD *field = nullptr;
nlohmann::json j;
MYSQL mysqldb;
mysql_init(&mysqldb);
if (!mysql_real_connect(&mysqldb, udr_cfg.mysql.mysql_server.c_str(),udr_cfg.mysql.mysql_user.c_str(),udr_cfg.mysql.mysql_pass.c_str(),udr_cfg.mysql.mysql_db.c_str(), udr_cfg.mysql.mysql_port, 0, 0))
{
Logger::udr_server().error("An error occurred while connecting to db: %s", mysql_error(&mysqldb));
return ;
}
// MYSQL mysqldb;
// Logger::udr_server().debug("****** read_authentication_subscription mysql_init start ******");
// mysql_init(&mysqldb);
// Logger::udr_server().debug("****** read_authentication_subscription mysql_init end ******");
// Logger::udr_server().debug("****** read_authentication_subscription mysql_real_connect start ******");
// if (!mysql_real_connect(&mysqldb, udr_cfg.mysql.mysql_server.c_str(),udr_cfg.mysql.mysql_user.c_str(),udr_cfg.mysql.mysql_pass.c_str(),udr_cfg.mysql.mysql_db.c_str(), udr_cfg.mysql.mysql_port, 0, 0))
// {
// Logger::udr_server().error("An error occurred while connecting to db: %s", mysql_error(&mysqldb));
// return ;
// }
// Logger::udr_server().debug("****** read_authentication_subscription mysql_real_connect end ******");
AuthenticationSubscription authenticationsubscription;
const std::string query =
"select * from AuthenticationSubscription WHERE ueid='" + ueId + "'";
if (mysql_real_query(&mysqldb, query.c_str(),
if (mysql_real_query(mysql_WitcommUDRDB, query.c_str(),
(unsigned long)query.size())) {
Logger::udr_server().error("mysql_real_query failure！SQL(%s)",
query.c_str());
mysql_close(&mysqldb);
// mysql_close(&mysqldb);
return;
}
res = mysql_store_result(&mysqldb);
res = mysql_store_result(mysql_WitcommUDRDB);
if (res == NULL) {
Logger::udr_server().error("mysql_store_result failure！SQL(%s)",
query.c_str());
mysql_close(&mysqldb);
// mysql_close(&mysqldb);
return;
}
......@@ -215,16 +244,18 @@ void AuthenticationSubscriptionDocumentApiImpl::
to_json(j, authenticationsubscription);
response.send(Pistache::Http::Code::Ok, j.dump());
std::string out = j.dump();
Logger::udr_server().debug("AuthenticationSubscription GET - json:\n\"%s\"",
out.c_str());
// std::string out = j.dump();
// Logger::udr_server().debug("AuthenticationSubscription GET - json:\n\"%s\"",
// out.c_str());
} else {
response.send(Pistache::Http::Code::Not_Implemented, "");
Logger::udr_server().error("AuthenticationSubscription no data！SQL(%s)",
query.c_str());
}
mysql_free_result(res);
mysql_close(&mysqldb);
// mysql_close(&mysqldb);
Logger::udr_server().debug("****** ReadAuthenticationSubscription end：imsi-%s ******",ueId.c_str());
}
} // namespace api
......
src/impl/AuthenticationSubscriptionDocumentApiImpl.h
View file @ e29e19ce
......@@ -47,7 +47,7 @@ using namespace org::openapitools::server::model;
class AuthenticationSubscriptionDocumentApiImpl : public org::openapitools::server::api::AuthenticationSubscriptionDocumentApi {
public:
AuthenticationSubscriptionDocumentApiImpl(std::shared_ptr<Pistache::Rest::Router>,MYSQL *mysql);
~AuthenticationSubscriptionDocumentApiImpl() {}
virtual ~AuthenticationSubscriptionDocumentApiImpl();
void modify_authentication_subscription(const std::string &ueId, const std::vector<PatchItem> &patchItem, const Pistache::Optional<std::string> &supportedFeatures, Pistache::Http::ResponseWriter &response);
void read_authentication_subscription(const std::string &ueId, const Pistache::Optional<std::string> &supportedFeatures, Pistache::Http::ResponseWriter &response);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment