zhangsheng/WLG
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refine utility func.

Browse Source
This commit is contained in:
pandx 2024-10-24 21:07:06 +08:00
parent 6044171563
commit 376ad5f60d
2 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
utility/serial.c
View File

@ -282,7 +282,6 @@ int serial_close(int file_descriptor) {
return close(file_descriptor); return close(file_descriptor);
} }
/** /**
* The function waits until all queued output to the terminal filedes has been transmitted. * The function waits until all queued output to the terminal filedes has been transmitted.
* *
@ -293,8 +292,7 @@ int serial_close(int file_descriptor) {
* @return 0 if success. * @return 0 if success.
* return -1 if fail, and errno is set. * return -1 if fail, and errno is set.
*/ */
int serial_flush(int file_descriptor) int serial_flush(int file_descriptor) {
{
return tcdrain(file_descriptor); return tcdrain(file_descriptor);
} }
@ -307,8 +305,7 @@ int serial_flush(int file_descriptor)
* @return 1 if data is available * @return 1 if data is available
* return 0 if data is not available * return 0 if data is not available
*/ */
int serial_data_available(int file_descriptor, unsigned int timeout_millisec) int serial_data_available(int file_descriptor, unsigned int timeout_millisec) {
{
int fd = file_descriptor; int fd = file_descriptor;
struct timeval timeout; struct timeval timeout;
fd_set readfds; fd_set readfds;
@ -347,8 +344,7 @@ int serial_data_available(int file_descriptor, unsigned int timeout_millisec)
* @return positive integer of bytes sent if success. * @return positive integer of bytes sent if success.
* return -1 if failed. * return -1 if failed.
*/ */
int serial_send(int file_descriptor, char *buffer, size_t data_len) int serial_send(int file_descriptor, char *buffer, size_t data_len) {
{
ssize_t len = 0; ssize_t len = 0;
len = write(file_descriptor, buffer, data_len); len = write(file_descriptor, buffer, data_len);
if ( len == data_len ) { if ( len == data_len ) {
@ -370,8 +366,7 @@ int serial_send(int file_descriptor, char *buffer, size_t data_len)
* @return positive integer of bytes received if success. * @return positive integer of bytes received if success.
* return -1 if failed. * return -1 if failed.
*/ */
int serial_receive(int file_descriptor, char *buffer,size_t data_len) int serial_receive(int file_descriptor, char *buffer,size_t data_len) {
{
int len,fs_sel; int len,fs_sel;
fd_set fs_read; fd_set fs_read;
struct timeval time; struct timeval time;

8
utility/udp_scan.cpp
View File

@ -52,13 +52,11 @@ void UdpSys::recvUdpData() { udpSock.async_receive_from(boost::asio::buffer(m_bu
void UdpSys::HandleRead(const boost::system::error_code& pEc, std::size_t pBytesTransferred) { void UdpSys::HandleRead(const boost::system::error_code& pEc, std::size_t pBytesTransferred) {
std::string ip = senderEndPoint.address().to_string(); std::string ip = senderEndPoint.address().to_string();
if (pEc) { if (pEc) {
std::cerr << pEc.value() << std::endl; zlog_error(zct, "pEc value:%d, category name:%s, message:%s", pEc.value(), pEc.category().name(), pEc.message());
std::cerr << pEc.category().name() << std::endl;
std::cerr << pEc.message() << std::endl;
} else if (pBytesTransferred == 0) { } else if (pBytesTransferred == 0) {
std::cout << "rev has rec!" << std::endl; zlog_info(zct, "rev has rec!");
if (pBytesTransferred == 0) { if (pBytesTransferred == 0) {
std::cerr << "[ Read 0 Bytes ][ " << ip << " Quit ! ]" << std::endl; zlog_error(zct,"[ Read 0 Bytes ][ %s Quit ! ]", ip.c_str());
} }
} else { } else {
std::string read_cmd(m_buffer.data(), pBytesTransferred); std::string read_cmd(m_buffer.data(), pBytesTransferred);