gfwleak/tango-tsg-master
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复IP归属地日志字段填充错误

Browse Source
This commit is contained in:
liuxueli
2020-08-05 14:41:14 +08:00
parent d38b1b68b4
commit 99dc6723f1
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/tsg_send_log.cpp
View File

@@ -209,9 +209,9 @@ int set_common_field_from_label(struct tsg_log_instance_t *_instance, struct TLD
if(internal_label->client_location!=NULL) if(internal_label->client_location!=NULL)
{ {
location=internal_label->client_location; location=internal_label->client_location;
snprintf(buff, sizeof(buff), "%s,%s,%s", (memcmp(location->city_full, "null", 4) ? "" : location->city_full), snprintf(buff, sizeof(buff), "%s,%s,%s", (!(memcmp(location->city_full, "null", 4)) ? "" : location->city_full),
(memcmp(location->province_full, "null", 4) ? "" : location->province_full), (!(memcmp(location->province_full, "null", 4)) ? "" : location->province_full),
(memcmp(location->country_full, "null", 4) ? "" : location->country_full) (!(memcmp(location->country_full, "null", 4)) ? "" : location->country_full)
); );
TLD_append(_handle, _instance->id2field[LOG_COMMON_CLINET_LOCATION].name, (void *)buff, TLD_TYPE_STRING); TLD_append(_handle, _instance->id2field[LOG_COMMON_CLINET_LOCATION].name, (void *)buff, TLD_TYPE_STRING);
} }
@@ -219,9 +219,9 @@ int set_common_field_from_label(struct tsg_log_instance_t *_instance, struct TLD
if(internal_label->server_location!=NULL) if(internal_label->server_location!=NULL)
{ {
location=internal_label->server_location; location=internal_label->server_location;
snprintf(buff, sizeof(buff), "%s,%s,%s", (memcmp(location->city_full, "null", 4) ? "" : location->city_full), snprintf(buff, sizeof(buff), "%s,%s,%s", (!(memcmp(location->city_full, "null", 4)) ? "" : location->city_full),
(memcmp(location->province_full, "null", 4) ? "" : location->province_full), (!(memcmp(location->province_full, "null", 4)) ? "" : location->province_full),
(memcmp(location->country_full, "null", 4) ? "" : location->country_full) (!(memcmp(location->country_full, "null", 4)) ? "" : location->country_full)
); );
TLD_append(_handle, _instance->id2field[LOG_COMMON_SERVER_LOCATION].name, (void *)buff, TLD_TYPE_STRING); TLD_append(_handle, _instance->id2field[LOG_COMMON_SERVER_LOCATION].name, (void *)buff, TLD_TYPE_STRING);
} }