commit 0e551da4e307600ce2377c8248540bf8e888343d
author lh <lh@exm.com> Tue Mar 28 09:50:20 2023 +0800
committer lh <lh@exm.com> Tue Mar 28 09:50:20 2023 +0800
tree f62e2a33442d84044d9417f437802b06539673dd
parent ab05a713d2ef88187f6bd8b53164b586d0023d5c

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

This reverts commit 3d21c1d06ec9570ee681282aa92d1fc964598d8b.

Reason for revert: <INSERT REASONING HERE>

Change-Id: Ia25499d2e747c1fce9d22cdac8b32e9c8b8253c1

lib/liblynq-data/lynq_data_urc.cpp

diff --git a/lib/liblynq-data/lynq_data_urc.cpp b/lib/liblynq-data/lynq_data_urc.cpp
index d527ed2..9f211eb 100755
--- a/lib/liblynq-data/lynq_data_urc.cpp
+++ b/lib/liblynq-data/lynq_data_urc.cpp
@@ -13,7 +13,6 @@
 #include "lynq_data_urc.h"
 #include "liblog/lynq_deflog.h"
 #include "lynq_shm.h"
-#include "lynq_urc_socket.h"
 
 #define LYNQ_REC_BUF 8192
 
@@ -77,8 +76,7 @@
     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 = lynq_recv_urc_msg(urc_data,sizeof(urc_data));
+        res = recvfrom(lynq_urc_sockfd,urc_data,sizeof(urc_data),0,(struct sockaddr *)&urc_local_addr,(socklen_t*)&lynq_len_urc_addr_serv);
         
         if(res<sizeof(int32_t)*2)
         {
@@ -167,38 +165,37 @@
 
 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;
-    return lynq_register_urc_socket() > 0 ? 0 : -1;
+    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 lynq_socket_recv_stop()