Revert "[Feature][T8TSK-189] chang urc report address to 127.0.0.1"
This reverts commit 2f5cd7b89a77d1bf4c69ddb49788efedaaec4fff.
Reason for revert: <INSERT REASONING HERE>
Change-Id: Ic90904e6501cb706c709fd3501ae13f96b1b048a
diff --git a/src/lynq/lib/liblynq-network/lynq_module_socket.cpp b/src/lynq/lib/liblynq-network/lynq_module_socket.cpp
index 48353dc..c3f7334 100755
--- a/src/lynq/lib/liblynq-network/lynq_module_socket.cpp
+++ b/src/lynq/lib/liblynq-network/lynq_module_socket.cpp
@@ -16,12 +16,11 @@
#include "lynq_module_socket.h"
#include "liblog/lynq_deflog.h"
#include "lynq_shm.h"
-#include "lynq_urc_socket.h"
#define LYNQ_SERVICE_PORT 8088
#define LYNQ_ADDRESS "127.0.0.1"
-//#define LYNQ_URC_SERVICE_PORT 8086
-//#define LYNQ_URC_ADDRESS "0.0.0.0"
+#define LYNQ_URC_SERVICE_PORT 8086
+#define LYNQ_URC_ADDRESS "0.0.0.0"
#define LYNQ_REQUEST_PARAM_BUF 8192
#define LYNQ_REC_BUF 8192
@@ -51,11 +50,11 @@
lynq_resp_t response;
int module_len_rc_addr_serv;
-//int module_len_urc_addr_serv;
+int module_len_urc_addr_serv;
struct sockaddr_in module_rc_addr_serv;
-//struct sockaddr_in module_urc_addr_serv;
+struct sockaddr_in module_urc_addr_serv;
static int module_rc_sock_fd = -1;
-//static int module_urc_sock_fd = -1;
+static int module_urc_sock_fd = -1;
int module_urc_status = 1;
int module_rc_status = 1;
pthread_t module_urc_tid = -1;
@@ -130,11 +129,11 @@
* other:failure
*/
const int waitResponse(Parcel*& p, int token,int time_out)
-{
+{
int waitToken = token;
int wakeup_token=-1;
int resp_type;
- struct timeval now;
+ struct timeval now;
struct timespec timeout;
int ret;
std::list<Parcel*>::iterator iter;
@@ -142,8 +141,8 @@
gettimeofday(&now,NULL);
timeout.tv_sec = now.tv_sec+time_out; //timeout is 1min
- timeout.tv_nsec = now.tv_usec*1000;
-
+ timeout.tv_nsec = now.tv_usec*1000;
+
LYINFLOG("%s wait token is %d, wait time is %d",__func__,waitToken,time_out);
BLOCK_RECV_MSG_LOCK();
@@ -327,8 +326,7 @@
while(module_urc_status)
{
bzero(urc_data,LYNQ_REC_BUF);
- //res = recvfrom(module_urc_sock_fd,urc_data,sizeof(urc_data),0,(struct sockaddr *)&module_urc_addr_serv,(socklen_t*)&module_len_urc_addr_serv);
- res = lynq_recv_urc_msg(urc_data,sizeof(urc_data));
+ res = recvfrom(module_urc_sock_fd,urc_data,sizeof(urc_data),0,(struct sockaddr *)&module_urc_addr_serv,(socklen_t*)&module_len_urc_addr_serv);
if(res<sizeof(int32_t)*2)
{
LYERRLOG("thread_urc_recv step2 fail: res is %d",res);
@@ -462,45 +460,44 @@
int lynq_setup_urc_socket()
{
-// int on = 1;
-// int ret = 0;
-// module_len_urc_addr_serv = sizeof(sockaddr_in);
-// module_urc_sock_fd = socket(AF_INET, SOCK_DGRAM, 0);
-// if (module_urc_sock_fd <0){
-// LYERRLOG("urc socket error");
-// return RESULT_ERROR;
-// }
-// module_urc_addr_serv.sin_family = AF_INET;
-// module_urc_addr_serv.sin_port = htons(LYNQ_URC_SERVICE_PORT);
-// module_urc_addr_serv.sin_addr.s_addr = inet_addr(LYNQ_URC_ADDRESS);
-// /* Set socket to allow reuse of address and port, SO_REUSEADDR value is 2*/
-// ret = setsockopt(module_urc_sock_fd,SOL_SOCKET,SO_REUSEADDR,&on,sizeof on);
-// if(ret <0)
-// {
-// LYERRLOG("urc socket set error");
-// close(module_urc_sock_fd);
-// module_urc_sock_fd =-1;
-// return RESULT_ERROR;
-// }
-// ret = bind(module_urc_sock_fd ,(struct sockaddr*)&module_urc_addr_serv, sizeof(module_urc_addr_serv));
-// if(ret <0)
-// {
-// LYERRLOG("urc socket bind error");
-// close(module_urc_sock_fd);
-// module_urc_sock_fd =-1;
-// return RESULT_ERROR;
-// }
-// return RESULT_OK;
- return lynq_register_urc_socket() > 0 ? RESULT_OK : RESULT_ERROR;
+ int on = 1;
+ int ret = 0;
+ module_len_urc_addr_serv = sizeof(sockaddr_in);
+ module_urc_sock_fd = socket(AF_INET, SOCK_DGRAM, 0);
+ if (module_urc_sock_fd <0){
+ LYERRLOG("urc socket error");
+ return RESULT_ERROR;
+ }
+ module_urc_addr_serv.sin_family = AF_INET;
+ module_urc_addr_serv.sin_port = htons(LYNQ_URC_SERVICE_PORT);
+ module_urc_addr_serv.sin_addr.s_addr = inet_addr(LYNQ_URC_ADDRESS);
+ /* Set socket to allow reuse of address and port, SO_REUSEADDR value is 2*/
+ ret = setsockopt(module_urc_sock_fd,SOL_SOCKET,SO_REUSEADDR,&on,sizeof on);
+ if(ret <0)
+ {
+ LYERRLOG("urc socket set error");
+ close(module_urc_sock_fd);
+ module_urc_sock_fd =-1;
+ return RESULT_ERROR;
+ }
+ ret = bind(module_urc_sock_fd ,(struct sockaddr*)&module_urc_addr_serv, sizeof(module_urc_addr_serv));
+ if(ret <0)
+ {
+ LYERRLOG("urc socket bind error");
+ close(module_urc_sock_fd);
+ module_urc_sock_fd =-1;
+ return RESULT_ERROR;
+ }
+ return RESULT_OK;
}
void lynq_close_urc_socket()
{
-// if (module_urc_sock_fd >= 0)
-// {
-// close(module_urc_sock_fd);
-// module_urc_sock_fd =-1;
-// }
+ if (module_urc_sock_fd >= 0)
+ {
+ close(module_urc_sock_fd);
+ module_urc_sock_fd =-1;
+ }
}
int lynq_start_all_urc_socket_thread()