diff options
author | qctecmdr <qctecmdr@localhost> | 2019-06-19 11:55:14 -0700 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-06-19 11:55:14 -0700 |
commit | a029b65f78c644c9c0bb0145c28d823e13663712 (patch) | |
tree | 30bf99d9259e528b7cada9608ccb38c176112bf9 /utils | |
parent | 16c0367c5b3e17d76d9a68c8057d24c50252bf84 (diff) | |
parent | 61fd929fb6f9466b02706f9af0c4b36f3e16a2d6 (diff) | |
download | gps-a029b65f78c644c9c0bb0145c28d823e13663712.tar.gz |
Merge "Redesign Inet sender and receiver"
Diffstat (limited to 'utils')
-rw-r--r-- | utils/LocIpc.cpp | 101 | ||||
-rw-r--r-- | utils/LocIpc.h | 5 |
2 files changed, 80 insertions, 26 deletions
diff --git a/utils/LocIpc.cpp b/utils/LocIpc.cpp index 646d2d4..e857817 100644 --- a/utils/LocIpc.cpp +++ b/utils/LocIpc.cpp @@ -164,7 +164,8 @@ public: umask(0157); if (mSock->isValid() && ::bind(mSock->mSid, (struct sockaddr*)&mAddr, sizeof(mAddr)) < 0) { - LOC_LOGe("bind socket error. sock fd: %d, reason: %s", mSock->mSid, strerror(errno)); + LOC_LOGe("bind socket error. sock fd: %d: %s, reason: %s", mSock->mSid, + mAddr.sun_path, strerror(errno)); mSock->close(); } } @@ -177,26 +178,22 @@ public: } }; -class LocIpcInetTcpSender : public LocIpcSender { +class LocIpcInetSender : public LocIpcSender { protected: + int mSockType; shared_ptr<Sock> mSock; const string mName; sockaddr_in mAddr; - mutable bool mFirstTime; inline virtual bool isOperable() const override { return mSock != nullptr && mSock->isValid(); } - inline virtual ssize_t send(const uint8_t data[], uint32_t length, int32_t /* msgId */) const { - if (mFirstTime) { - mFirstTime = false; - ::connect(mSock->mSid, (const struct sockaddr*)&mAddr, sizeof(mAddr)); - } + virtual ssize_t send(const uint8_t data[], uint32_t length, int32_t /* msgId */) const { return mSock->send(data, length, 0, (struct sockaddr*)&mAddr, sizeof(mAddr)); } public: - inline LocIpcInetTcpSender(const char* name, int32_t port) : LocIpcSender(), - mSock(make_shared<Sock>((nullptr == name) ? -1 : (::socket(AF_INET, SOCK_STREAM, 0)))), + inline LocIpcInetSender(const char* name, int32_t port, int sockType) : LocIpcSender(), + mSockType(sockType), + mSock(make_shared<Sock>((nullptr == name) ? -1 : (::socket(AF_INET, mSockType, 0)))), mName((nullptr == name) ? "" : name), - mAddr({.sin_family=AF_INET, .sin_port=htons(port), .sin_addr={htonl(INADDR_ANY)}}), - mFirstTime(true) { + mAddr({.sin_family=AF_INET, .sin_port=htons(port), .sin_addr={htonl(INADDR_ANY)}}) { if (mSock != nullptr && mSock->isValid() && nullptr != name) { struct hostent* hp = gethostbyname(name); if (nullptr != hp) { @@ -206,7 +203,47 @@ public: } }; -class LocIpcInetTcpRecver : public LocIpcInetTcpSender, public LocIpcRecver { +class LocIpcInetTcpSender : public LocIpcInetSender { +protected: + mutable bool mFirstTime; + + virtual ssize_t send(const uint8_t data[], uint32_t length, int32_t /* msgId */) const { + if (mFirstTime) { + mFirstTime = false; + ::connect(mSock->mSid, (const struct sockaddr*)&mAddr, sizeof(mAddr)); + } + return mSock->send(data, length, 0, (struct sockaddr*)&mAddr, sizeof(mAddr)); + } + +public: + inline LocIpcInetTcpSender(const char* name, int32_t port) : + LocIpcInetSender(name, port, SOCK_STREAM), + mFirstTime(true) {} +}; + +class LocIpcInetRecver : public LocIpcInetSender, public LocIpcRecver { +protected: + virtual ssize_t recv() const = 0; +public: + inline LocIpcInetRecver(const shared_ptr<ILocIpcListener>& listener, const char* name, + int32_t port, int sockType) : + LocIpcInetSender(name, port, sockType), LocIpcRecver(listener, *this) { + if (mSock->isValid() && ::bind(mSock->mSid, (struct sockaddr*)&mAddr, sizeof(mAddr)) < 0) { + LOC_LOGe("bind socket error. sock fd: %d, reason: %s", mSock->mSid, strerror(errno)); + mSock->close(); + } + } + inline virtual ~LocIpcInetRecver() {} + inline virtual const char* getName() const override { return mName.data(); }; + inline virtual void abort() const override { + if (isSendable()) { + mSock->sendAbort(0, (struct sockaddr*)&mAddr, sizeof(mAddr)); + } + } + +}; + +class LocIpcInetTcpRecver : public LocIpcInetRecver { mutable int32_t mConnFd; protected: inline virtual ssize_t recv() const override { @@ -223,21 +260,26 @@ protected: public: inline LocIpcInetTcpRecver(const shared_ptr<ILocIpcListener>& listener, const char* name, int32_t port) : - LocIpcInetTcpSender(name, port), LocIpcRecver(listener, *this), mConnFd(-1) { - if (mSock->isValid() && ::bind(mSock->mSid, (struct sockaddr*)&mAddr, sizeof(mAddr)) < 0) { - LOC_LOGe("bind socket error. sock fd: %d, reason: %s", mSock->mSid, strerror(errno)); - mSock->close(); - } - } - inline virtual ~LocIpcInetTcpRecver() { if (-1 != mConnFd) ::close(mConnFd); } - inline virtual const char* getName() const override { return mName.data(); }; - inline virtual void abort() const override { - if (isSendable()) { - mSock->sendAbort(0, (struct sockaddr*)&mAddr, sizeof(mAddr)); - } + LocIpcInetRecver(listener, name, port, SOCK_STREAM), mConnFd(-1) {} + inline virtual ~LocIpcInetTcpRecver() { if (-1 != mConnFd) ::close(mConnFd);} +}; + +class LocIpcInetUdpRecver : public LocIpcInetRecver { +protected: + inline virtual ssize_t recv() const override { + socklen_t size = sizeof(mAddr); + return mSock->recv(mDataCb, 0, (struct sockaddr*)&mAddr, &size); } +public: + inline LocIpcInetUdpRecver(const shared_ptr<ILocIpcListener>& listener, const char* name, + int32_t port) : + LocIpcInetRecver(listener, name, port, SOCK_DGRAM) {} + + inline virtual ~LocIpcInetUdpRecver() {} }; + + #ifdef NOT_DEFINED class LocIpcQcsiSender : public LocIpcSender { protected: @@ -365,9 +407,16 @@ shared_ptr<LocIpcSender> LocIpc::getLocIpcInetTcpSender(const char* serverName, return make_shared<LocIpcInetTcpSender>(serverName, port); } unique_ptr<LocIpcRecver> LocIpc::getLocIpcInetTcpRecver(const shared_ptr<ILocIpcListener>& listener, - const char* serverName, int32_t port) { + const char* serverName, int32_t port) { return make_unique<LocIpcInetTcpRecver>(listener, serverName, port); } +shared_ptr<LocIpcSender> LocIpc::getLocIpcInetUdpSender(const char* serverName, int32_t port) { + return make_shared<LocIpcInetSender>(serverName, port, SOCK_DGRAM); +} +unique_ptr<LocIpcRecver> LocIpc::getLocIpcInetUdpRecver(const shared_ptr<ILocIpcListener>& listener, + const char* serverName, int32_t port) { + return make_unique<LocIpcInetUdpRecver>(listener, serverName, port); +} pair<shared_ptr<LocIpcSender>, unique_ptr<LocIpcRecver>> LocIpc::getLocIpcQmiLocServiceSenderRecverPair(const shared_ptr<ILocIpcListener>& listener, int instance) { typedef pair<shared_ptr<LocIpcSender>, unique_ptr<LocIpcRecver>> (*creator_t)(const shared_ptr<ILocIpcListener>&, int); diff --git a/utils/LocIpc.h b/utils/LocIpc.h index b91966c..42fbff3 100644 --- a/utils/LocIpc.h +++ b/utils/LocIpc.h @@ -67,6 +67,8 @@ public: static shared_ptr<LocIpcSender> getLocIpcLocalSender(const char* localSockName); static shared_ptr<LocIpcSender> + getLocIpcInetUdpSender(const char* serverName, int32_t port); + static shared_ptr<LocIpcSender> getLocIpcInetTcpSender(const char* serverName, int32_t port); static shared_ptr<LocIpcSender> getLocIpcQrtrSender(int service, int instance); @@ -75,6 +77,9 @@ public: getLocIpcLocalRecver(const shared_ptr<ILocIpcListener>& listener, const char* localSockName); static unique_ptr<LocIpcRecver> + getLocIpcInetUdpRecver(const shared_ptr<ILocIpcListener>& listener, + const char* serverName, int32_t port); + static unique_ptr<LocIpcRecver> getLocIpcInetTcpRecver(const shared_ptr<ILocIpcListener>& listener, const char* serverName, int32_t port); static unique_ptr<LocIpcRecver> |