From 665e1b5cb16d058f478867d0e8a4f8632e2cb02e Mon Sep 17 00:00:00 2001
From: GuoWenxue <“guowenxue@gmail.com”>
Date: Fri, 29 Apr 2022 10:29:19 +0800
Subject: [PATCH] upate packet time to struct tm
---
apue/project_socket/src/packet.c | 92 +++++++++++++++++++++++++--------------------
1 files changed, 51 insertions(+), 41 deletions(-)
diff --git a/apue/project_socket/src/packet.c b/apue/project_socket/src/packet.c
index a904596..9bb680f 100644
--- a/apue/project_socket/src/packet.c
+++ b/apue/project_socket/src/packet.c
@@ -21,66 +21,76 @@
int get_devid(char *devid, int size, int sn)
{
- if( !devid || size<DEVID_LEN )
- {
- log_error("Invalid input arugments\n");
- return -1;
- }
+ if( !devid || size<DEVID_LEN )
+ {
+ log_error("Invalid input arugments\n");
+ return -1;
+ }
- memset(devid, 0, size);
- snprintf(devid, size, "rpi#%04d", sn);
- return 0;
+ memset(devid, 0, size);
+ snprintf(devid, size, "rpi#%04d", sn);
+ return 0;
}
-int get_time(char *strtime, int size)
+int get_time(struct tm *ptm)
{
+ if( !ptm )
+ {
+ log_error("Invalid input arugments\n");
+ return -1;
+ }
+
+
time_t now = time(NULL);
- struct tm *tnow = localtime(&now);
+ localtime_r(&now, ptm);
- if( !strtime || size<TIME_LEN )
- {
- log_error("Invalid input arugments\n");
- return -1;
- }
-
- snprintf(strtime, size, "%04d-%02d-%2d %02d:%02d:%02d",
- tnow->tm_year+1900, tnow->tm_mon+1, tnow->tm_mday,
- tnow->tm_hour, tnow->tm_min, tnow->tm_sec);
-
- return 0;
+ return 0;
}
int packet_segmented_pack(pack_info_t *pack_info, char *pack_buf, int size)
{
- if( !pack_info || !pack_buf || size<=0 )
- {
- log_error("Invalid input arguments\n");
- return -1;
- }
+ char strtime[TIME_LEN] = {'\0'};
+ struct tm *ptm;
+
+ if( !pack_info || !pack_buf || size<=0 )
+ {
+ log_error("Invalid input arguments\n");
+ return -1;
+ }
+
+ ptm = &pack_info->sample_time;
+ snprintf(strtime, sizeof(strtime), "%04d-%02d-%2d %02d:%02d:%02d",
+ ptm->tm_year+1900, ptm->tm_mon+1, ptm->tm_mday,
+ ptm->tm_hour, ptm->tm_min, ptm->tm_sec);
+
memset(pack_buf, 0, size);
+ snprintf(pack_buf, size, "%s|%s|%d.%d", pack_info->devid, strtime,
+ temper_integer(pack_info->temper), temper_fract(pack_info->temper));
- snprintf(pack_buf, size, "%s|%s|%d.%d", pack_info->devid, pack_info->strtime,
- temper_integer(pack_info->temper), temper_fract(pack_info->temper));
-
- return strlen(pack_buf);
+ return strlen(pack_buf);
}
int packet_json_pack(pack_info_t *pack_info, char *pack_buf, int size)
{
- if( !pack_info || !pack_buf || size<=0 )
- {
- log_error("Invalid input arguments\n");
- return -1;
- }
+ char strtime[TIME_LEN] = {'\0'};
+ struct tm *ptm;
+
+ if( !pack_info || !pack_buf || size<=0 )
+ {
+ log_error("Invalid input arguments\n");
+ return -1;
+ }
+
+ ptm = &pack_info->sample_time;
+ snprintf(strtime, sizeof(strtime), "%04d-%02d-%2d %02d:%02d:%02d",
+ ptm->tm_year+1900, ptm->tm_mon+1, ptm->tm_mday,
+ ptm->tm_hour, ptm->tm_min, ptm->tm_sec);
memset(pack_buf, 0, size);
+ snprintf(pack_buf, size, "{\"devid\":\"%s\", \"time\":\"%s\",\"temperature\":\"%d.%d\"}",
+ pack_info->devid, strtime, temper_integer(pack_info->temper), temper_fract(pack_info->temper));
- snprintf(pack_buf, size, "{\"devid\":\"%s\", \"time\":\"%s\",\"temperature\":\"%d.%d\"}",
- pack_info->devid, pack_info->strtime,
- temper_integer(pack_info->temper), temper_fract(pack_info->temper));
-
- return strlen(pack_buf);
+ return strlen(pack_buf);
}
-
--
Gitblit v1.9.1