Wizzard
/
ip-lookup
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle downloading VPN database better, avoiding situation where it could query ips without the list downloaded

This commit is contained in:
Wizzard 2024-03-08 07:06:03 -05:00
parent b3eef56fe2
commit b2a56aff51
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/main.c
View File

@ -54,17 +54,19 @@ static size_t write_data(void *ptr, size_t size, size_t nmemb, FILE *stream) {
return written; return written;
} }
void download_vpn_list(const char *url, const char *output_path) { int download_vpn_list(const char *url, const char *output_path) {
CURL *curl; CURL *curl;
FILE *fp; FILE *fp;
CURLcode res; CURLcode res;
int result = 1; // Assume failure
curl = curl_easy_init(); curl = curl_easy_init();
if (curl) { if (curl) {
fp = fopen(output_path, "wb"); fp = fopen(output_path, "wb");
if (fp == NULL) { if (fp == NULL) {
fprintf(stderr, "Cannot open file %s\n", output_path); fprintf(stderr, "Cannot open file %s\n", output_path);
return; curl_easy_cleanup(curl);
return result;
} }
curl_easy_setopt(curl, CURLOPT_URL, url); curl_easy_setopt(curl, CURLOPT_URL, url);
@ -72,13 +74,16 @@ void download_vpn_list(const char *url, const char *output_path) {
curl_easy_setopt(curl, CURLOPT_WRITEDATA, fp); curl_easy_setopt(curl, CURLOPT_WRITEDATA, fp);
res = curl_easy_perform(curl); res = curl_easy_perform(curl);
if (res != CURLE_OK) { if (res == CURLE_OK) {
result = 0; // Success
} else {
fprintf(stderr, "curl_easy_perform() failed: %s\n", curl_easy_strerror(res)); fprintf(stderr, "curl_easy_perform() failed: %s\n", curl_easy_strerror(res));
} }
fclose(fp); fclose(fp);
curl_easy_cleanup(curl); curl_easy_cleanup(curl);
} }
return result;
} }
static size_t write_callback(void *contents, size_t size, size_t nmemb, void *userp) { static size_t write_callback(void *contents, size_t size, size_t nmemb, void *userp) {
@ -89,14 +94,18 @@ static size_t write_callback(void *contents, size_t size, size_t nmemb, void *us
} }
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
int vpnCheck = is_vpn(argv[1]);
download_vpn_list(VPN_LIST_URL, VPN_LIST_PATH);
if (argc != 2) { if (argc != 2) {
printf("Usage: %s <IP_ADDRESS>\n", argv[0]); printf("Usage: %s <IP_ADDRESS>\n", argv[0]);
return 1; return 1;
} }
if (download_vpn_list(VPN_LIST_URL, VPN_LIST_PATH) != 0) {
fprintf(stderr, "Failed to download VPN list.\n");
return 1;
}
int vpnCheck = is_vpn(argv[1]);
char url[256] = "http://ip-api.com/json/"; char url[256] = "http://ip-api.com/json/";
strcat(url, argv[1]); strcat(url, argv[1]);