[Feature][T106][task-view-934]Modify the IP address of RIL service and related libraries to 127.0.0.1
Only Configure: Yes
Affected branch: master
Affected module: RIL
Is it affected on both ZXIC and MTK: only ZXIC
Self-test: Yes
Doc Update: No
Change-Id: I4c30dd88721735a2932f4dadd2442ca506a22898
diff --git a/cap/zx297520v3/src/lynq/framework/lynq-ril-service/src/ril.cpp b/cap/zx297520v3/src/lynq/framework/lynq-ril-service/src/ril.cpp
index 35d4268..8ad93bb 100755
--- a/cap/zx297520v3/src/lynq/framework/lynq-ril-service/src/ril.cpp
+++ b/cap/zx297520v3/src/lynq/framework/lynq-ril-service/src/ril.cpp
@@ -173,10 +173,13 @@
// Enable RILC log
#define RILC_LOG 1
/*Warren add for t800 RIL service 2021_12_10 start*/
+#define LYNQ_RIL_FWK_IP "127.0.0.1"
#define LYNQ_SOCKET_ENVNT_FD_MAX 100
#define LYNQ_SERVICE_PORT 8088
#define LYNQ_AT_SERVICE_PORT 8087
#define LYNQ_BRODCAST_PORT 8086
+/*Interfaces lo net addr 127.0.0.1,mask 255.0.0.0,so lo broadcast addr is 127.255.255.255*/
+#define LYNQ_RIL_FWK_BROADCAST_IP "127.255.255.255" /*hong.liu change broadcast addr on 2024.2.18*/
#define LYNQ_SOCKET_BUFFER (1024*8+sizeof(int)*3+10)
/*lei add*/
#define DSET_IP_ADDRESS "127.0.0.1"
@@ -6180,26 +6183,24 @@
RLOGD("set broadcast fail!!!\n");
exit(1);
}
+
+ struct sockaddr_in ril_lynq_urcCLient_socket;
+ bzero(&ril_lynq_urcCLient_socket, sizeof(ril_lynq_urcCLient_socket));
+
+ ril_lynq_urcCLient_socket.sin_family = AF_INET;
+ ril_lynq_urcCLient_socket.sin_addr.s_addr = inet_addr(LYNQ_RIL_FWK_IP);
+ ret = bind(lynq_urc_socket_fd, (struct sockaddr *)&ril_lynq_urcCLient_socket, sizeof(ril_lynq_urcCLient_socket));
+ if (-1 == ret)
+ {
+ LYERRLOG("ril_lynq_urcCLient_socket bind fail,errno:%d",errno);
+ exit(EXIT_FAILURE);
+ }
+
urc_broadcast_addr.sin_family = AF_INET; //IPv4
urc_broadcast_addr.sin_port = htons(LYNQ_BRODCAST_PORT);
- urc_broadcast_addr.sin_addr.s_addr = inet_addr("255.255.255.255" );//255.255.255.255 broadcast addrress.
- printf("LYNQ_RIL_urcClientInit success!!!\n");
+ urc_broadcast_addr.sin_addr.s_addr = inet_addr(LYNQ_RIL_FWK_BROADCAST_IP);/*hong.liu change broadcast addr on 2024.2.18*/
+ RLOGE("LYNQ_RIL_urcClientInit success!!!");
return;
- /*
- while(1)
- {
- len = sendto(lynq_urc_socket_fd,"hello world",11,0,(struct sockaddr *)&urc_broadcast_addr,sizeof(urc_broadcast_addr));
- if(len > 0)
- {
- printf("sendto success,len=%d\n",len);
- }
- else
- {
- printf("sendto fail\n");
- }
- sleep(1);
- }
- */
}
//add by hq for bug 760 2023/02/09
@@ -6536,7 +6537,7 @@
struct sockaddr_in server_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(LYNQ_RIL_FWK_IP);
server_addr.sin_port = htons(SERVER_PORT);
/* create socket */
//int server_socket_fd = socket(AF_INET, SOCK_DGRAM, 0);
diff --git a/cap/zx297520v3/src/lynq/lib/liblynq-call/lynq_module_socket.cpp b/cap/zx297520v3/src/lynq/lib/liblynq-call/lynq_module_socket.cpp
index 68a8e9b..6f171ad 100755
--- a/cap/zx297520v3/src/lynq/lib/liblynq-call/lynq_module_socket.cpp
+++ b/cap/zx297520v3/src/lynq/lib/liblynq-call/lynq_module_socket.cpp
@@ -20,7 +20,7 @@
#define LYNQ_SERVICE_PORT 8088
#define LYNQ_ADDRESS "127.0.0.1"
#define LYNQ_URC_SERVICE_PORT 8086
-#define LYNQ_URC_ADDRESS "0.0.0.0"
+#define LYNQ_URC_ADDRESS "127.255.255.255" /*hong.liu change broadcast addr on 2024.2.18*/
#define LYNQ_REQUEST_PARAM_BUF 8192
#define LYNQ_REC_BUF 8192
@@ -666,6 +666,18 @@
return -1;
}
+ struct sockaddr_in liblynq_data_socket;
+ bzero(&liblynq_data_socket, sizeof(liblynq_data_socket));
+ //set this lib socket config
+ liblynq_data_socket.sin_family = AF_INET;
+ liblynq_data_socket.sin_addr.s_addr = inet_addr(LYNQ_ADDRESS);
+ int ret = bind(module_rc_sock_fd, (struct sockaddr *)&liblynq_data_socket, sizeof(liblynq_data_socket));
+ if (-1 == ret)
+ {
+ LYERRLOG("liblynq_data_socket bind fail,errno:%d",errno);
+ return -1;
+ }
+
LYINFLOG("module_rc_sock_fd = %d",module_rc_sock_fd);
memset(&module_rc_addr_serv, 0, sizeof(module_rc_addr_serv));
@@ -684,7 +696,6 @@
BLOCK_RECV_MSG_UNLOCK();
// pthread_attr_t attr;
- int ret;
pthread_mutex_init(&s_sendto_mutex, NULL);
pthread_mutex_init(&s_RecvMsgBlockMutex, NULL);
diff --git a/cap/zx297520v3/src/lynq/lib/liblynq-data/lynq_data_urc.cpp b/cap/zx297520v3/src/lynq/lib/liblynq-data/lynq_data_urc.cpp
index 8d61536..8cf5e45 100755
--- a/cap/zx297520v3/src/lynq/lib/liblynq-data/lynq_data_urc.cpp
+++ b/cap/zx297520v3/src/lynq/lib/liblynq-data/lynq_data_urc.cpp
@@ -199,7 +199,7 @@
}
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);
+ urc_local_addr.sin_addr.s_addr = inet_addr(LYNQ_RIL_FWK_BROADCAST_IP);/*hong.liu change broadcast addr on 2024.2.18*/
/* 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)
diff --git a/cap/zx297520v3/src/lynq/lib/liblynq-data/lynq_data_urc.h b/cap/zx297520v3/src/lynq/lib/liblynq-data/lynq_data_urc.h
index 6e1ae58..1aa7986 100755
--- a/cap/zx297520v3/src/lynq/lib/liblynq-data/lynq_data_urc.h
+++ b/cap/zx297520v3/src/lynq/lib/liblynq-data/lynq_data_urc.h
@@ -4,6 +4,7 @@
using ::android::Parcel;
#define LYNQ_URC_SERVICE_PORT 8086
+#define LYNQ_RIL_FWK_BROADCAST_IP "127.255.255.255" /*hong.liu change broadcast addr on 2024.2.18*/
/*the same with lynq_interface.h begin*/
#define LYNQ_REQUEST_VENDOR_BASE 8000
diff --git a/cap/zx297520v3/src/lynq/lib/liblynq-network/lynq_module_socket.cpp b/cap/zx297520v3/src/lynq/lib/liblynq-network/lynq_module_socket.cpp
index c3f7334..cf51053 100755
--- a/cap/zx297520v3/src/lynq/lib/liblynq-network/lynq_module_socket.cpp
+++ b/cap/zx297520v3/src/lynq/lib/liblynq-network/lynq_module_socket.cpp
@@ -20,7 +20,7 @@
#define LYNQ_SERVICE_PORT 8088
#define LYNQ_ADDRESS "127.0.0.1"
#define LYNQ_URC_SERVICE_PORT 8086
-#define LYNQ_URC_ADDRESS "0.0.0.0"
+#define LYNQ_URC_ADDRESS "127.255.255.255" /*hong.liu change broadcast addr on 2024.2.18*/
#define LYNQ_REQUEST_PARAM_BUF 8192
#define LYNQ_REC_BUF 8192
@@ -129,11 +129,11 @@
* other:failure
*/
const int waitResponse(Parcel*& p, int token,int time_out)
-{
+{
int waitToken = token;
int wakeup_token=-1;
int resp_type;
- struct timeval now;
+ struct timeval now;
struct timespec timeout;
int ret;
std::list<Parcel*>::iterator iter;
@@ -141,8 +141,8 @@
gettimeofday(&now,NULL);
timeout.tv_sec = now.tv_sec+time_out; //timeout is 1min
- timeout.tv_nsec = now.tv_usec*1000;
-
+ timeout.tv_nsec = now.tv_usec*1000;
+
LYINFLOG("%s wait token is %d, wait time is %d",__func__,waitToken,time_out);
BLOCK_RECV_MSG_LOCK();
@@ -666,6 +666,18 @@
return -1;
}
+ struct sockaddr_in liblynq_data_socket;
+ bzero(&liblynq_data_socket, sizeof(liblynq_data_socket));
+ //set this lib socket config
+ liblynq_data_socket.sin_family = AF_INET;
+ liblynq_data_socket.sin_addr.s_addr = inet_addr(LYNQ_ADDRESS);
+ int ret = bind(module_rc_sock_fd, (struct sockaddr *)&liblynq_data_socket, sizeof(liblynq_data_socket));
+ if (-1 == ret)
+ {
+ LYERRLOG("liblynq_data_socket bind fail,errno:%d",errno);
+ return -1;
+ }
+
LYINFLOG("module_rc_sock_fd = %d",module_rc_sock_fd);
memset(&module_rc_addr_serv, 0, sizeof(module_rc_addr_serv));
@@ -684,7 +696,6 @@
BLOCK_RECV_MSG_UNLOCK();
// pthread_attr_t attr;
- int ret;
pthread_mutex_init(&s_sendto_mutex, NULL);
pthread_mutex_init(&s_RecvMsgBlockMutex, NULL);
diff --git a/cap/zx297520v3/src/lynq/lib/liblynq-sim/lynq_module_socket.cpp b/cap/zx297520v3/src/lynq/lib/liblynq-sim/lynq_module_socket.cpp
index 84bc08a..c47cff4 100755
--- a/cap/zx297520v3/src/lynq/lib/liblynq-sim/lynq_module_socket.cpp
+++ b/cap/zx297520v3/src/lynq/lib/liblynq-sim/lynq_module_socket.cpp
@@ -20,7 +20,7 @@
#define LYNQ_SERVICE_PORT 8088
#define LYNQ_ADDRESS "127.0.0.1"
#define LYNQ_URC_SERVICE_PORT 8086
-#define LYNQ_URC_ADDRESS "0.0.0.0"
+#define LYNQ_URC_ADDRESS "127.255.255.255" /*hong.liu change broadcast addr on 2024.2.18*/
#define LYNQ_REQUEST_PARAM_BUF 8192
#define LYNQ_REC_BUF 8192
@@ -686,6 +686,18 @@
return -1;
}
+ struct sockaddr_in liblynq_data_socket;
+ bzero(&liblynq_data_socket, sizeof(liblynq_data_socket));
+ //set this lib socket config
+ liblynq_data_socket.sin_family = AF_INET;
+ liblynq_data_socket.sin_addr.s_addr = inet_addr(LYNQ_ADDRESS);
+ int ret = bind(module_rc_sock_fd, (struct sockaddr *)&liblynq_data_socket, sizeof(liblynq_data_socket));
+ if (-1 == ret)
+ {
+ LYERRLOG("liblynq_data_socket bind fail,errno:%d",errno);
+ return -1;
+ }
+
LYINFLOG("module_rc_sock_fd = %d",module_rc_sock_fd);
memset(&module_rc_addr_serv, 0, sizeof(module_rc_addr_serv));
@@ -704,7 +716,6 @@
BLOCK_RECV_MSG_UNLOCK();
// pthread_attr_t attr;
- int ret;
pthread_mutex_init(&s_sendto_mutex, NULL);
pthread_mutex_init(&s_RecvMsgBlockMutex, NULL);
diff --git a/cap/zx297520v3/src/lynq/lib/liblynq-sim/lynq_sim.cpp b/cap/zx297520v3/src/lynq/lib/liblynq-sim/lynq_sim.cpp
index 10a86fa..21125a0 100755
--- a/cap/zx297520v3/src/lynq/lib/liblynq-sim/lynq_sim.cpp
+++ b/cap/zx297520v3/src/lynq/lib/liblynq-sim/lynq_sim.cpp
@@ -342,6 +342,19 @@
{
return sock_fd;
}
+
+ struct sockaddr_in liblynq_data_socket;
+ bzero(&liblynq_data_socket, sizeof(liblynq_data_socket));
+ //set this lib socket config
+ liblynq_data_socket.sin_family = AF_INET;
+ liblynq_data_socket.sin_addr.s_addr = inet_addr(DSET_IP_ADDRESS);
+ int ret = bind(sock_fd, (struct sockaddr *)&liblynq_data_socket, sizeof(liblynq_data_socket));
+ if (-1 == ret)
+ {
+ RLOGE("liblynq_data_socket bind fail,errno:%d",errno);
+ return -1;
+ }
+
struct timeval timeOut;
timeOut.tv_sec = 60;
timeOut.tv_usec = 0;
diff --git a/cap/zx297520v3/src/lynq/lib/liblynq-sms/lynq_module_socket.cpp b/cap/zx297520v3/src/lynq/lib/liblynq-sms/lynq_module_socket.cpp
index 1926a23..f8c4170 100755
--- a/cap/zx297520v3/src/lynq/lib/liblynq-sms/lynq_module_socket.cpp
+++ b/cap/zx297520v3/src/lynq/lib/liblynq-sms/lynq_module_socket.cpp
@@ -20,7 +20,7 @@
#define LYNQ_SERVICE_PORT 8088
#define LYNQ_ADDRESS "127.0.0.1"
#define LYNQ_URC_SERVICE_PORT 8086
-#define LYNQ_URC_ADDRESS "0.0.0.0"
+#define LYNQ_URC_ADDRESS "127.255.255.255" /*hong.liu change broadcast addr on 2024.2.18*/
#define LYNQ_REQUEST_PARAM_BUF 8192
#define LYNQ_REC_BUF 8192
@@ -692,6 +692,18 @@
return -1;
}
+ struct sockaddr_in liblynq_data_socket;
+ bzero(&liblynq_data_socket, sizeof(liblynq_data_socket));
+ //set this lib socket config
+ liblynq_data_socket.sin_family = AF_INET;
+ liblynq_data_socket.sin_addr.s_addr = inet_addr(LYNQ_ADDRESS);
+ int ret = bind(module_rc_sock_fd, (struct sockaddr *)&liblynq_data_socket, sizeof(liblynq_data_socket));
+ if (-1 == ret)
+ {
+ LYERRLOG("liblynq_data_socket bind fail,errno:%d",errno);
+ return -1;
+ }
+
LYINFLOG("module_rc_sock_fd = %d",module_rc_sock_fd);
memset(&module_rc_addr_serv, 0, sizeof(module_rc_addr_serv));
@@ -710,7 +722,6 @@
BLOCK_RECV_MSG_UNLOCK();
// pthread_attr_t attr;
- int ret;
pthread_mutex_init(&s_sendto_mutex, NULL);
pthread_mutex_init(&s_RecvMsgBlockMutex, NULL);