projects
/
platform
/
core
/
ml
/
aitt.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
92a85ff
)
fix typo from clear_session to clean_session
author
Youngjae Shin
<yj99.shin@samsung.com>
Fri, 16 Dec 2022 07:49:01 +0000
(16:49 +0900)
committer
Youngjae Shin
<yj99.shin@samsung.com>
Thu, 9 Mar 2023 02:15:19 +0000
(11:15 +0900)
common/AittOption.cc
patch
|
blob
|
history
include/AittOption.h
patch
|
blob
|
history
src/AITTImpl.cc
patch
|
blob
|
history
src/MosquittoMQ.cc
patch
|
blob
|
history
src/MosquittoMQ.h
patch
|
blob
|
history
src/aitt_c.cc
patch
|
blob
|
history
diff --git
a/common/AittOption.cc
b/common/AittOption.cc
index
87a8896
..
ab23677
100644
(file)
--- a/
common/AittOption.cc
+++ b/
common/AittOption.cc
@@
-17,23
+17,23
@@
#include "aitt_internal.h"
#include "aitt_internal.h"
-AittOption::AittOption() : clea
r
_session_(false), use_custom_broker(false)
+AittOption::AittOption() : clea
n
_session_(false), use_custom_broker(false)
{
}
{
}
-AittOption::AittOption(bool clea
r
_session, bool use_custom_mqtt_broker)
- : clea
r_session_(clear
_session), use_custom_broker(use_custom_mqtt_broker)
+AittOption::AittOption(bool clea
n
_session, bool use_custom_mqtt_broker)
+ : clea
n_session_(clean
_session), use_custom_broker(use_custom_mqtt_broker)
{
}
{
}
-void AittOption::SetClea
r
Session(bool val)
+void AittOption::SetClea
n
Session(bool val)
{
{
- clea
r
_session_ = val;
+ clea
n
_session_ = val;
}
}
-bool AittOption::GetClea
r
Session() const
+bool AittOption::GetClea
n
Session() const
{
{
- return clea
r
_session_;
+ return clea
n
_session_;
}
void AittOption::SetUseCustomMqttBroker(bool val)
}
void AittOption::SetUseCustomMqttBroker(bool val)
diff --git
a/include/AittOption.h
b/include/AittOption.h
index
1669511
..
a273d65
100644
(file)
--- a/
include/AittOption.h
+++ b/
include/AittOption.h
@@
-22,11
+22,11
@@
class API AittOption {
public:
AittOption();
class API AittOption {
public:
AittOption();
- explicit AittOption(bool clea
r
_session, bool use_custom_broker);
+ explicit AittOption(bool clea
n
_session, bool use_custom_broker);
~AittOption() = default;
~AittOption() = default;
- void SetClea
r
Session(bool val);
- bool GetClea
r
Session() const;
+ void SetClea
n
Session(bool val);
+ bool GetClea
n
Session() const;
void SetUseCustomMqttBroker(bool val);
bool GetUseCustomMqttBroker() const;
void SetServiceID(const std::string &id);
void SetUseCustomMqttBroker(bool val);
bool GetUseCustomMqttBroker() const;
void SetServiceID(const std::string &id);
@@
-39,7
+39,7
@@
class API AittOption {
const char *GetCustomRWFile() const;
private:
const char *GetCustomRWFile() const;
private:
- bool clea
r
_session_;
+ bool clea
n
_session_;
bool use_custom_broker;
std::string service_id;
std::string location_id;
bool use_custom_broker;
std::string service_id;
std::string location_id;
diff --git
a/src/AITTImpl.cc
b/src/AITTImpl.cc
index
e2bb3f2
..
4822e10
100644
(file)
--- a/
src/AITTImpl.cc
+++ b/
src/AITTImpl.cc
@@
-39,10
+39,10
@@
AITT::Impl::Impl(AITT &parent, const std::string &id, const std::string &my_ip,
if (option.GetUseCustomMqttBroker()) {
mq = modules.NewCustomMQ(id, option);
AittOption discovery_option = option;
if (option.GetUseCustomMqttBroker()) {
mq = modules.NewCustomMQ(id, option);
AittOption discovery_option = option;
- discovery_option.SetClea
r
Session(false);
+ discovery_option.SetClea
n
Session(false);
discovery.SetMQ(modules.NewCustomMQ(id + 'd', option));
} else {
discovery.SetMQ(modules.NewCustomMQ(id + 'd', option));
} else {
- mq = std::unique_ptr<MQ>(new MosquittoMQ(id, option.GetClea
r
Session()));
+ mq = std::unique_ptr<MQ>(new MosquittoMQ(id, option.GetClea
n
Session()));
discovery.SetMQ(std::unique_ptr<MQ>(new MosquittoMQ(id + 'd', false)));
}
aittThread = std::thread(&AITT::Impl::ThreadMain, this);
discovery.SetMQ(std::unique_ptr<MQ>(new MosquittoMQ(id + 'd', false)));
}
aittThread = std::thread(&AITT::Impl::ThreadMain, this);
diff --git
a/src/MosquittoMQ.cc
b/src/MosquittoMQ.cc
index
57c6daa
..
431774e
100644
(file)
--- a/
src/MosquittoMQ.cc
+++ b/
src/MosquittoMQ.cc
@@
-33,7
+33,7
@@
namespace aitt {
const std::string MosquittoMQ::REPLY_SEQUENCE_NUM_KEY = "sequenceNum";
const std::string MosquittoMQ::REPLY_IS_END_SEQUENCE_KEY = "isEndSequence";
const std::string MosquittoMQ::REPLY_SEQUENCE_NUM_KEY = "sequenceNum";
const std::string MosquittoMQ::REPLY_IS_END_SEQUENCE_KEY = "isEndSequence";
-MosquittoMQ::MosquittoMQ(const std::string &id, bool clea
r
_session)
+MosquittoMQ::MosquittoMQ(const std::string &id, bool clea
n
_session)
: handle(nullptr),
keep_alive(60),
subscribers_iterating(false),
: handle(nullptr),
keep_alive(60),
subscribers_iterating(false),
@@
-47,9
+47,9
@@
MosquittoMQ::MosquittoMQ(const std::string &id, bool clear_session)
break;
}
break;
}
- handle = mosquitto_new(id.c_str(), clea
r
_session, this);
+ handle = mosquitto_new(id.c_str(), clea
n
_session, this);
if (handle == nullptr) {
if (handle == nullptr) {
- ERR("mosquitto_new(%s, %d) Fail", id.c_str(), clea
r
_session);
+ ERR("mosquitto_new(%s, %d) Fail", id.c_str(), clea
n
_session);
break;
}
break;
}
diff --git
a/src/MosquittoMQ.h
b/src/MosquittoMQ.h
index
38c6e48
..
33fd1bf
100644
(file)
--- a/
src/MosquittoMQ.h
+++ b/
src/MosquittoMQ.h
@@
-32,7
+32,7
@@
namespace aitt {
class MosquittoMQ : public MQ {
public:
class MosquittoMQ : public MQ {
public:
- explicit MosquittoMQ(const std::string &id, bool clea
r
_session = false);
+ explicit MosquittoMQ(const std::string &id, bool clea
n
_session = false);
virtual ~MosquittoMQ(void);
void SetConnectionCallback(const MQConnectionCallback &cb);
virtual ~MosquittoMQ(void);
void SetConnectionCallback(const MQConnectionCallback &cb);
diff --git
a/src/aitt_c.cc
b/src/aitt_c.cc
index
e290693
..
3bdcfc8
100644
(file)
--- a/
src/aitt_c.cc
+++ b/
src/aitt_c.cc
@@
-126,7
+126,7
@@
API int aitt_option_set(aitt_option_h handle, aitt_option_e option, const char *
case AITT_OPT_CLEAN_SESSION:
ret = _to_boolean(value, bool_val);
if (ret == AITT_ERROR_NONE)
case AITT_OPT_CLEAN_SESSION:
ret = _to_boolean(value, bool_val);
if (ret == AITT_ERROR_NONE)
- handle->option.SetClea
r
Session(bool_val);
+ handle->option.SetClea
n
Session(bool_val);
return ret;
case AITT_OPT_CUSTOM_BROKER:
ret = _to_boolean(value, bool_val);
return ret;
case AITT_OPT_CUSTOM_BROKER:
ret = _to_boolean(value, bool_val);
@@
-149,7
+149,7
@@
API const char *aitt_option_get(aitt_option_h handle, aitt_option_e option)
case AITT_OPT_MY_IP:
return handle->my_ip;
case AITT_OPT_CLEAN_SESSION:
case AITT_OPT_MY_IP:
return handle->my_ip;
case AITT_OPT_CLEAN_SESSION:
- return (handle->option.GetClea
r
Session()) ? "true" : "false";
+ return (handle->option.GetClea
n
Session()) ? "true" : "false";
case AITT_OPT_CUSTOM_BROKER:
return (handle->option.GetUseCustomMqttBroker()) ? "true" : "false";
default:
case AITT_OPT_CUSTOM_BROKER:
return (handle->option.GetUseCustomMqttBroker()) ? "true" : "false";
default: