commit 2f5cd7b89a77d1bf4c69ddb49788efedaaec4fff
author you.chen <you.chen@mobiletek.cn> Mon Mar 20 19:06:08 2023 +0800
committer you.chen <you.chen@mobiletek.cn> Mon Mar 20 19:06:08 2023 +0800
tree c418ee72dd779747da8e777e0cdecd69a0debd39
parent 4a438d7fbe985e0c8fa0f629d9cd352c04f7a746

[Feature][T8TSK-189] chang urc report address to 127.0.0.1

Change-Id: Ibfd79b8ed38fe6f4835cf596f167e5636fa3c379

src/lynq/lib/liblynq-data/lynq_data_urc.cpp

diff --git a/src/lynq/lib/liblynq-data/lynq_data_urc.cpp b/src/lynq/lib/liblynq-data/lynq_data_urc.cpp
index 9f211eb..d527ed2 100755
--- a/src/lynq/lib/liblynq-data/lynq_data_urc.cpp
+++ b/src/lynq/lib/liblynq-data/lynq_data_urc.cpp
@@ -13,6 +13,7 @@
 #include "lynq_data_urc.h"
 #include "liblog/lynq_deflog.h"
 #include "lynq_shm.h"
+#include "lynq_urc_socket.h"
 
 #define LYNQ_REC_BUF 8192
 
@@ -76,7 +77,8 @@
     while(data_urc_recive_status)
     {
         bzero(urc_data,LYNQ_REC_BUF);
-        res = recvfrom(lynq_urc_sockfd,urc_data,sizeof(urc_data),0,(struct sockaddr *)&urc_local_addr,(socklen_t*)&lynq_len_urc_addr_serv);
+//        res = recvfrom(lynq_urc_sockfd,urc_data,sizeof(urc_data),0,(struct sockaddr *)&urc_local_addr,(socklen_t*)&lynq_len_urc_addr_serv);
+        res = lynq_recv_urc_msg(urc_data,sizeof(urc_data));
         
         if(res<sizeof(int32_t)*2)
         {
@@ -165,37 +167,38 @@
 
 int lynq_socket_recv_start()
 {
-    int rt=0;
-    int on=1;
-    struct sockaddr_in urc_local_addr;
-    pthread_attr_t attr;
-    lynq_urc_sockfd = socket(AF_INET,SOCK_DGRAM,0);
-    if(lynq_urc_sockfd < 0)
-    {
-        LYERRLOG("create socket for udp fail");
-        return -1;
-    }
-    urc_local_addr.sin_family = AF_INET;
-    urc_local_addr.sin_port = htons(LYNQ_URC_SERVICE_PORT);
-    urc_local_addr.sin_addr.s_addr = htons(INADDR_ANY);
-    /* Set socket to allow reuse of address and port, SO_REUSEADDR value is 2*/
-    rt = setsockopt(lynq_urc_sockfd,SOL_SOCKET,SO_REUSEADDR,&on,sizeof on);
-    if(rt<0)
-    {
-        LYERRLOG("SO_REUSEADDR fail");
-        close(lynq_urc_sockfd);
-        lynq_urc_sockfd = -1;
-        return -1;
-    }
-    rt = bind(lynq_urc_sockfd ,(struct sockaddr*)&urc_local_addr, sizeof(urc_local_addr));
-    if (rt == -1)
-    {
-        LYERRLOG("bind failed");
-        close(lynq_urc_sockfd);
-        lynq_urc_sockfd = -1;
-        return -1;
-    }
-    return 0;
+//    int rt=0;
+//    int on=1;
+//    struct sockaddr_in urc_local_addr;
+//    pthread_attr_t attr;
+//    lynq_urc_sockfd = socket(AF_INET,SOCK_DGRAM,0);
+//    if(lynq_urc_sockfd < 0)
+//    {
+//        LYERRLOG("create socket for udp fail");
+//        return -1;
+//    }
+//    urc_local_addr.sin_family = AF_INET;
+//    urc_local_addr.sin_port = htons(LYNQ_URC_SERVICE_PORT);
+//    urc_local_addr.sin_addr.s_addr = htons(INADDR_ANY);
+//    /* Set socket to allow reuse of address and port, SO_REUSEADDR value is 2*/
+//    rt = setsockopt(lynq_urc_sockfd,SOL_SOCKET,SO_REUSEADDR,&on,sizeof on);
+//    if(rt<0)
+//    {
+//        LYERRLOG("SO_REUSEADDR fail");
+//        close(lynq_urc_sockfd);
+//        lynq_urc_sockfd = -1;
+//        return -1;
+//    }
+//    rt = bind(lynq_urc_sockfd ,(struct sockaddr*)&urc_local_addr, sizeof(urc_local_addr));
+//    if (rt == -1)
+//    {
+//        LYERRLOG("bind failed");
+//        close(lynq_urc_sockfd);
+//        lynq_urc_sockfd = -1;
+//        return -1;
+//    }
+//    return 0;
+    return lynq_register_urc_socket() > 0 ? 0 : -1;
 }
 
 int lynq_socket_recv_stop()