[Feature]Merge MR0.5 RIL and gnss related content
Change-Id: Ida412e15319debce294feb6bc9991877d848c1c3
diff --git a/lib/liblynq-call/lynq_call.cpp b/lib/liblynq-call/lynq_call.cpp
index b517092..1f71165 100755
--- a/lib/liblynq-call/lynq_call.cpp
+++ b/lib/liblynq-call/lynq_call.cpp
@@ -15,6 +15,7 @@
#include <sys/time.h>
#include <string.h>
#define LYNQ_SERVICE_PORT 8088
+#define DSET_IP_ADDRESS "127.0.0.1"
#define LYNQ_URC_SERVICE_PORT 8086
#define LYNQ_REC_BUF 8192
#define LYNQ_REQUEST_PARAM_BUF 8192
@@ -66,7 +67,13 @@
pthread_t lynq_call_urc_tid;
pthread_t lynq_call_list_loop_tid;
-
+/*lei add*/
+/* socket文件描述符 */
+int len_addr_serv;
+struct sockaddr_in addr_serv;
+lynq_client_t client_t;
+int client_size = 0;
+/*lei add*/
int s_call_urc_event_complete = 1;
@@ -122,7 +129,7 @@
int send_request(int sockfd,lynq_client_t *client_tmp)
{
int ret=0;
- ret = write(sockfd, client_tmp, LYQN_SEDN_BUF);
+ ret = sendto(sockfd, client_tmp, client_size, 0, (struct sockaddr *)&addr_serv, len_addr_serv);
if(ret==-1)
{
LYERRLOG("write error:%s",strerror(errno));
@@ -137,7 +144,7 @@
char recvline[LYNQ_REC_BUF];
bzero(recvline,LYNQ_REC_BUF);
/* receive data from server */
- len = read(sockfd, recvline, LYNQ_REC_BUF);
+ len = recvfrom(sockfd,recvline,LYNQ_REC_BUF, 0, (struct sockaddr *)&addr_serv,(socklen_t*)&len_addr_serv);
if(len == -1)
{
LYERRLOG("read error:%s",strerror(errno));
@@ -407,13 +414,15 @@
/*Warren add for T800 platform 2021/11/19 start*/
int lynq_socket_client_start()
-{
+{
+ #if 0
struct sockaddr_in lynq_socket_server_addr;
/* init lynq_socket_server_addr */
bzero(&lynq_socket_server_addr, sizeof(lynq_socket_server_addr));
lynq_socket_server_addr.sin_family = AF_INET;
lynq_socket_server_addr.sin_port = htons(LYNQ_SERVICE_PORT);
lynq_socket_server_addr.sin_addr.s_addr = htons(INADDR_ANY);
+
/*
if(inet_pton(AF_INET,"127.0.0.1", &lynq_socket_server_addr.sin_addr) <= 0)
{
@@ -427,6 +436,18 @@
LYERRLOG("connect error:%s",strerror(errno));
return -1;
}
+ #endif
+ lynq_call_client_sockfd = socket(AF_INET, SOCK_DGRAM, 0);
+ if (-1 == lynq_call_client_sockfd)
+ {
+ return lynq_call_client_sockfd;
+ }
+ /* 设置address */
+ 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(LYNQ_SERVICE_PORT);
+ len_addr_serv = sizeof(addr_serv);
return 0;
}
int lynq_update_call_list_loop()
@@ -582,6 +603,7 @@
int result = 0;
Global_uToken_call = uToken;
urc_call_recive_status = 1;
+ client_size = sizeof(client_t);
LYLOGSET(LOG_INFO);
LYLOGEINIT(USER_LOG_TAG);
result = lynq_socket_client_start();