pdxx
/
fastdfs
mirror of https://github.com/happyfish100/fastdfs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

memset return ip address to ascii 0 for Java SDK

pull/484/head
YuQing 2019-12-30 17:51:24 +08:00
parent a9e593e03b
commit 28f9c419a3
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
HISTORY
View File

@ -1,6 +1,7 @@
Version 6.06 2019-12-26 Version 6.06 2019-12-30
* bugfixed: fdfs_storaged can't quit normally * bugfixed: fdfs_storaged can't quit normally
* bugfixed: init/memset return ip address to ascii 0 for Java SDK
Version 6.05 2019-12-25 Version 6.05 2019-12-25
* fdfs_trackerd and fdfs_storaged print the server version in usage. * fdfs_trackerd and fdfs_storaged print the server version in usage.

10
tracker/tracker_service.c
View File

@ -2399,7 +2399,7 @@ static int tracker_deal_server_list_group_storages(struct fast_task_info *pTask)
pStorageId = NULL; pStorageId = NULL;
} }
memset(pTask->data + sizeof(TrackerHeader), 0, \ memset(pTask->data + sizeof(TrackerHeader), 0,
pTask->size - sizeof(TrackerHeader)); pTask->size - sizeof(TrackerHeader));
pDest = pStart = (TrackerStorageStat *)(pTask->data + \ pDest = pStart = (TrackerStorageStat *)(pTask->data + \
sizeof(TrackerHeader)); sizeof(TrackerHeader));
@ -2617,11 +2617,12 @@ static int tracker_deal_service_query_fetch_update( \
} }
pTask->length = sizeof(TrackerHeader) + \ pTask->length = sizeof(TrackerHeader) +
TRACKER_QUERY_STORAGE_FETCH_BODY_LEN + \ TRACKER_QUERY_STORAGE_FETCH_BODY_LEN +
(server_count - 1) * (IP_ADDRESS_SIZE - 1); (server_count - 1) * (IP_ADDRESS_SIZE - 1);
p = pTask->data + sizeof(TrackerHeader); p = pTask->data + sizeof(TrackerHeader);
memset(p, 0, pTask->length - sizeof(TrackerHeader));
memcpy(p, pGroup->group_name, FDFS_GROUP_NAME_MAX_LEN); memcpy(p, pGroup->group_name, FDFS_GROUP_NAME_MAX_LEN);
p += FDFS_GROUP_NAME_MAX_LEN; p += FDFS_GROUP_NAME_MAX_LEN;
strcpy(p, fdfs_get_ipaddr_by_peer_ip( strcpy(p, fdfs_get_ipaddr_by_peer_ip(
@ -3009,6 +3010,8 @@ static int tracker_deal_service_query_storage( \
return ENOENT; return ENOENT;
} }
memset(p, 0, active_count * (IP_ADDRESS_SIZE +
FDFS_PROTO_PKG_LEN_SIZE));
ppEnd = pStoreGroup->active_servers + active_count; ppEnd = pStoreGroup->active_servers + active_count;
for (ppServer=pStoreGroup->active_servers; ppServer<ppEnd; \ for (ppServer=pStoreGroup->active_servers; ppServer<ppEnd; \
ppServer++) ppServer++)
@ -3023,6 +3026,7 @@ static int tracker_deal_service_query_storage( \
} }
else else
{ {
memset(p, 0, IP_ADDRESS_SIZE);
strcpy(p, fdfs_get_ipaddr_by_peer_ip( strcpy(p, fdfs_get_ipaddr_by_peer_ip(
&pStorageServer->ip_addrs, pTask->client_ip)); &pStorageServer->ip_addrs, pTask->client_ip));
p += IP_ADDRESS_SIZE - 1; p += IP_ADDRESS_SIZE - 1;