src: Code enhancement

Opportunistic code enhancing done to ease code viewing and understanding. No functional changed. Signed-off-by: Gan, Yi Fang <[email protected]>
intel · Oct 9, 2023 · c69b3b3 · c69b3b3
1 parent cfca981
commit c69b3b3
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 13 deletions.
diff --git a/src/opcua-tsn/multicallback_server.c b/src/opcua-tsn/multicallback_server.c
@@ -213,7 +213,7 @@ static UA_Server *setupOpcuaServer(struct ServerData *sdata)
 
 void copy_file(char *src_file, char *dst_file, bool clear_src)
 {
-	char ch;
+	int ch;
 	FILE *src, *dst;
 
 	/* Open source file for reading */

diff --git a/src/opcua-tsn/opcua_datasource.c b/src/opcua-tsn/opcua_datasource.c
@@ -167,7 +167,7 @@ subStoreDataReceived(UA_Server *server, const UA_NodeId *sessionId,
         }
 
         if (g_sData->msqid >= 0) {
-            ret = msgsnd(g_sData->msqid, (void *)&msgqB, sizeof(struct msgq_buf), IPC_NOWAIT);
+            ret = msgsnd(g_sData->msqid, (void *)&msgqB, sizeof(struct msgq_buf) - sizeof(msgqB.msg_type), IPC_NOWAIT);
             if (ret < 0) {
                 if (errno == EAGAIN) {
                     debug("msgsnd: queue is full\n");
@@ -222,7 +222,7 @@ pubReturnGetDataToTransmit(UA_Server *server, const UA_NodeId *sessionId,
 
     /* Give a window of 150us */
     for (int i = 0; i < 15; i++) {
-        ret = msgrcv(g_sData->msqid, (void *)&msgqC, sizeof(struct msgq_buf),
+        ret = msgrcv(g_sData->msqid, (void *)&msgqC, sizeof(struct msgq_buf) - sizeof(msgqC.msg_type),
                      MSGQ_TYPE, IPC_NOWAIT);
         if (ret < 0) {
             if (errno == EAGAIN) {

diff --git a/src/tsq.c b/src/tsq.c
@@ -324,7 +324,7 @@ void listener(struct opt *user_opt) {
 		error("[TSQ-L] Error opening listening socket\n");
 
 	// connection settings
-	memset(&serv, '0', sizeof(serv));
+	memset(&serv, 0, sizeof(serv));
 	serv.sin_family = AF_INET;
 	serv.sin_addr.s_addr = inet_addr(server_ip);
 	if (user_opt->port != 0)
@@ -414,7 +414,7 @@ void listener(struct opt *user_opt) {
 		for (int i = 0; i < CLIENT_COUNT; i++) {
 
 			bzero(recv_buff, BUFFER_SIZE);
-			memset(&temp_data, '0', sizeof(temp_data));
+			memset(&temp_data, 0, sizeof(temp_data));
 			connfd = cli_conns[i];
 
 			if (FD_ISSET(connfd, &readfds)) {
@@ -487,14 +487,14 @@ void listener(struct opt *user_opt) {
 
 			case 0:
 				skip_slot = false;
-				memset(&keep_data, '0', sizeof(payload));
+				memset(&keep_data, 0, sizeof(payload));
 				fprintf(glob_fp, "%d %lld %ld\n", rounds, secs_error, nsecs_error);
 				rounds++;
 				break;
 
 			default:
 				skip_slot = false;
-				memset(&keep_data, '0', sizeof(payload));
+				memset(&keep_data, 0, sizeof(payload));
 				printf("[TSQ-L] Waiting for samples alignment...\n");
 				break;
 			}
@@ -540,7 +540,7 @@ void talker(struct opt *user_opt){
 		printf("[TSQ-T] Assigned uid %d\n", uid);
 
 	/* Set up the socket for transmission */
-	memset(&serv, '0', sizeof(serv));
+	memset(&serv, 0, sizeof(serv));
 	serv.sin_family = AF_INET;
 	serv.sin_addr.s_addr = inet_addr(server_ip);
 	serv.sin_port = htons(port);

diff --git a/src/txrx-afpkt.c b/src/txrx-afpkt.c
@@ -102,6 +102,7 @@ static uint64_t extract_ts_from_cmsg(int sock, int recvmsg_flags)
 	struct msghdr msg;
 	struct iovec entry;
 	struct sockaddr_in from_addr;
+	int ret = 0;
 	struct {
 		struct cmsghdr cm;
 		char control[512];
@@ -117,7 +118,9 @@ static uint64_t extract_ts_from_cmsg(int sock, int recvmsg_flags)
 	msg.msg_control = &control;
 	msg.msg_controllen = sizeof(control);
 
-	recvmsg(sock, &msg, recvmsg_flags|MSG_DONTWAIT);
+	ret = recvmsg(sock, &msg, recvmsg_flags|MSG_DONTWAIT);
+	if (ret <= 0)
+		return 0;
 
 	return get_timestamp(&msg);
 }
@@ -529,6 +532,7 @@ int afpkt_recv_pkt(int sock, struct user_opt *opt)
 	host_address.sin_port = htons(0);
 	host_address.sin_addr.s_addr = INADDR_ANY;
 
+	memset(&msg, 0, sizeof(msg));
 	iov.iov_base = buffer;
 	iov.iov_len = 128; //TODO: use correct length based on VLAN header
 	msg.msg_iov = &iov;

diff --git a/src/txrx-afxdp.c b/src/txrx-afxdp.c
@@ -111,7 +111,7 @@ static struct pkt_buffer *create_umem(void *ubuf, struct xsk_opt *x_opt)
 	struct pkt_buffer *temp_buff;
 	uint32_t idx = 0;
 	int ret;
-	int i;
+	__u64 i;
 
 	struct xsk_umem_config uconfig = {
 		.fill_size = x_opt->frames_per_ring,
@@ -120,7 +120,7 @@ static struct pkt_buffer *create_umem(void *ubuf, struct xsk_opt *x_opt)
 		.frame_headroom = XSK_UMEM__DEFAULT_FRAME_HEADROOM,
 	};
 
-	single_umem_ring_size =  x_opt->frames_per_ring * x_opt->frame_size;
+	single_umem_ring_size = (uint64_t) (x_opt->frames_per_ring * x_opt->frame_size);
 
 	ret = posix_memalign(&ubuf, getpagesize(), /* PAGE_SIZE aligned */
 			     single_umem_ring_size);
@@ -191,7 +191,7 @@ static struct xsk_info *create_xsk_info(struct user_opt *opt, struct pkt_buffer
 static void prefill_tx_umem_rings(void *buff_addr, tsn_packet *example_pkt,
 				  int count, int frame_size)
 {
-	int i;
+	__u64 i;
 
 	for (i = 0; i < count; i++) {
 		memcpy(xsk_umem__get_data(buff_addr, i * frame_size),

diff --git a/src/txrx.c b/src/txrx.c
@@ -285,7 +285,7 @@ static struct argp argp = { options, parser, usage, summary };
 
 static void copy_file(char *src_file, char *dst_file, bool clear_src)
 {
-	char ch;
+	int ch;
 	FILE *src, *dst;
 
 	if (src_file == NULL || dst_file == NULL) {