commit d5852374a9c7c3d38f36b8b04d41814c7b83cc25
author jb.qi <jb.qi@mobiletek.cn> Wed Mar 29 10:29:12 2023 +0800
committer jb.qi <jb.qi@mobiletek.cn> Wed Mar 29 10:29:12 2023 +0800
tree aca1ae21ffc679e19b307c332f3cc1c2bad5a476
parent 64de5d4db03351dcaa47b384ba25e3ed18e693d1

Revert "[Feature][T8TSK-28][Modem]Update Modem version to P4 0328"

This reverts commit 88c34e6d4f7a4582fc394605c0b6845ee007f0d1.

Reason for revert: <INSERT REASONING HERE>

Change-Id: Ifd3efc47064c1539b79bc010fadec02b981d90ce

framework/lynq-ril-service/src/ril.cpp

diff --git a/framework/lynq-ril-service/src/ril.cpp b/framework/lynq-ril-service/src/ril.cpp
index ccd0e01..ffcd658 100755
--- a/framework/lynq-ril-service/src/ril.cpp
+++ b/framework/lynq-ril-service/src/ril.cpp
@@ -169,6 +169,7 @@
 #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*/
@@ -5927,7 +5928,7 @@
     struct sockaddr_in lynqClient_addr;
     bzero(&server_addr, sizeof(server_addr));
     server_addr.sin_family = AF_INET;
-    server_addr.sin_addr.s_addr = htonl(INADDR_ANY);
+    server_addr.sin_addr.s_addr = inet_addr(DSET_IP_ADDRESS);
     server_addr.sin_port = htons(LYNQ_SERVICE_PORT);
     /* create socket */
     //int server_socket_fd = socket(AF_INET, SOCK_DGRAM, 0);

framework/lynq-sdk-ready/src/timer/lynq_timer.cpp

diff --git a/framework/lynq-sdk-ready/src/timer/lynq_timer.cpp b/framework/lynq-sdk-ready/src/timer/lynq_timer.cpp
index bbe70a0..c6e65e9 100755
--- a/framework/lynq-sdk-ready/src/timer/lynq_timer.cpp
+++ b/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 30

+#define TIMER 60

 

 using ::android::Parcel;

 

@@ -90,7 +90,7 @@
 }

 

 /**

- * @brief 30s request imei

+ * @brief 60s request imei

  * 

  * @param arg 

  * @return void* 

@@ -119,12 +119,21 @@
         /*set uci*/

         return NULL;

     }

-    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);

+    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);

     int send_num = -1;

     int recv_num = -1;

     int resp_type = -1;

@@ -142,7 +151,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 *)&addr_serv, len_addr_serv);

+        send_num = sendto(sock_fd, &client_t, sizeof(client_t), 0, (struct sockaddr *)&svr_addr, addr_len);

         RLOGD("send_num %d\n", send_num);

         if(send_num == 0)  

         {

@@ -161,7 +170,7 @@
             continue;

         }

         //get data msg

-        recv_num = recvfrom(sock_fd,res_data,sizeof(char)*MAX_LEN,0,(struct sockaddr *)&addr_serv,(socklen_t*)&len_addr_serv);

+        recv_num = recvfrom(sock_fd,res_data,sizeof(char)*MAX_LEN,0,(struct sockaddr *)&svr_addr,(socklen_t*)&addr_len);

         RLOGD("recv_num %d\n", recv_num);

         if(recv_num == 0)

         {