Revert "[Feature][T8TSK-188][Secure/Data]ril service request:0.0.0.0:8088 -> 127.0.0.1:8088/ data 0.0.0.0->127.0.0.1"
This reverts commit 956c74b4a3f4411a537c542b3712a3e2b6d5d204.
Change-Id: If451ce60292a732c9c4b80d525646293055ddf18
(cherry picked from commit e7de6ba67d301dce4ff8570313eaf9228c3e5346)
diff --git a/src/lynq/framework/lynq-ril-service/src/ril.cpp b/src/lynq/framework/lynq-ril-service/src/ril.cpp
index ffcd658..ccd0e01 100755
--- a/src/lynq/framework/lynq-ril-service/src/ril.cpp
+++ b/src/lynq/framework/lynq-ril-service/src/ril.cpp
@@ -169,7 +169,6 @@
#define LYNQ_BRODCAST_PORT 8086
#define LYNQ_SOCKET_BUFFER (1024*8+sizeof(int)*3+10)
/*lei add*/
-#define DSET_IP_ADDRESS "127.0.0.1"
#define LYNQ_AT_SOCKET_BUFFER 1024
#define MAX_AT_CMD 50
/*lei add*/
@@ -5928,7 +5927,7 @@
struct sockaddr_in lynqClient_addr;
bzero(&server_addr, sizeof(server_addr));
server_addr.sin_family = AF_INET;
- server_addr.sin_addr.s_addr = inet_addr(DSET_IP_ADDRESS);
+ server_addr.sin_addr.s_addr = htonl(INADDR_ANY);
server_addr.sin_port = htons(LYNQ_SERVICE_PORT);
/* create socket */
//int server_socket_fd = socket(AF_INET, SOCK_DGRAM, 0);
diff --git a/src/lynq/framework/lynq-sdk-ready/src/timer/lynq_timer.cpp b/src/lynq/framework/lynq-sdk-ready/src/timer/lynq_timer.cpp
index c6e65e9..bbe70a0 100755
--- a/src/lynq/framework/lynq-sdk-ready/src/timer/lynq_timer.cpp
+++ b/src/lynq/framework/lynq-sdk-ready/src/timer/lynq_timer.cpp
@@ -18,7 +18,7 @@
#define DSET_IP_ADDRESS "127.0.0.1"
#define RIL_REQUEST_DEVICE_IDENTITY 98
#define MAX_LEN 1024
-#define TIMER 60
+#define TIMER 30
using ::android::Parcel;
@@ -90,7 +90,7 @@
}
/**
- * @brief 60s request imei
+ * @brief 30s request imei
*
* @param arg
* @return void*
@@ -119,21 +119,12 @@
/*set uci*/
return NULL;
}
- struct sockaddr_in addr_serv,svr_addr;
- memset(&addr_serv, 0, sizeof(addr_serv));
- int addr_len = sizeof(struct sockaddr_in);
- addr_serv.sin_family = AF_INET;
- addr_serv.sin_addr.s_addr = inet_addr(DSET_IP_ADDRESS);
- addr_serv.sin_port = htons(7777);
- int rt = bind(sock_fd ,(struct sockaddr*)&addr_serv, addr_len);
- if (rt == -1)
- {
- RLOGD("bind failed");
- return NULL;
- }
- svr_addr.sin_family = AF_INET;
- svr_addr.sin_port = htons(8088);
- svr_addr.sin_addr.s_addr = inet_addr(DSET_IP_ADDRESS);
+ struct sockaddr_in addr_serv;
+ memset(&addr_serv, 0, sizeof(addr_serv));
+ addr_serv.sin_family = AF_INET;
+ addr_serv.sin_addr.s_addr = inet_addr(DSET_IP_ADDRESS);
+ addr_serv.sin_port = htons(DEST_PORT);
+ int len_addr_serv = sizeof(addr_serv);
int send_num = -1;
int recv_num = -1;
int resp_type = -1;
@@ -151,7 +142,7 @@
{
bzero(res_data, MAX_LEN);
pthread_mutex_lock(&g_lynq_sim_sendto_mutex);
- send_num = sendto(sock_fd, &client_t, sizeof(client_t), 0, (struct sockaddr *)&svr_addr, addr_len);
+ send_num = sendto(sock_fd, &client_t, sizeof(client_t), 0, (struct sockaddr *)&addr_serv, len_addr_serv);
RLOGD("send_num %d\n", send_num);
if(send_num == 0)
{
@@ -170,7 +161,7 @@
continue;
}
//get data msg
- recv_num = recvfrom(sock_fd,res_data,sizeof(char)*MAX_LEN,0,(struct sockaddr *)&svr_addr,(socklen_t*)&addr_len);
+ recv_num = recvfrom(sock_fd,res_data,sizeof(char)*MAX_LEN,0,(struct sockaddr *)&addr_serv,(socklen_t*)&len_addr_serv);
RLOGD("recv_num %d\n", recv_num);
if(recv_num == 0)
{
diff --git a/src/lynq/lib/liblynq-data/lynq_data.cpp b/src/lynq/lib/liblynq-data/lynq_data.cpp
index 6677dc2..2441051 100755
--- a/src/lynq/lib/liblynq-data/lynq_data.cpp
+++ b/src/lynq/lib/liblynq-data/lynq_data.cpp
@@ -26,8 +26,6 @@
#define LYNQ_DATA_UCI_BUF 258
-#define LYNQ_ADDRESS "127.0.0.1"
-
using ::android::Parcel;
typedef struct{
int uToken;