diff --git a/src/client/Makefile b/src/client/Makefile index 07b8558..f4fbec7 100644 --- a/src/client/Makefile +++ b/src/client/Makefile @@ -1,6 +1,6 @@ CC = gcc FLAGS = -Wall -Wextra -Wshadow -SRC = main.c sock.c http.c utils.c +SRC = main.c sock.c http.c utils.c fraction.c OUT = client all: diff --git a/src/client/fraction.c b/src/client/fraction.c new file mode 100644 index 0000000..93eb9f9 --- /dev/null +++ b/src/client/fraction.c @@ -0,0 +1,110 @@ +#include "fraction.h" +#include + + +// Change the return type to int to indicate success or failure +int download_fraction(int sfd, char *url, fraction_t *fraction) { + char *path = NULL; + http_res_t res; + fraction_t downloaded_fraction = {}; // Initialize to zero in case of failure + + // Parse the URL to get the path + path = get_path_from_url(url); + if (!path) { + fprintf(stderr, "Invalid URL: %s\n", url); + return 1; // Return failure + } + + // Perform the HTTP GET request + if (http_get(sfd, path, &res) != HTTP_SUCCESS) { + fprintf(stderr, "Failed to download: %s\n", url); + return 1; // Return failure + } + + // Parse the downloaded data into a fraction + if (fraction_parse(res.data, res.size, &downloaded_fraction) != 0) { + fprintf(stderr, "Failed to parse fraction from downloaded data\n"); + http_free(&res); // Free HTTP response + return 1; // Return failure + } + + // If the user provided a fraction pointer, copy the result + if (fraction) { + *fraction = downloaded_fraction; + } + + // Cleanup + http_free(&res); + + return 0; // Return success +} + +int fraction_parse(char *data, size_t size, fraction_t *fraction) { + const size_t IV_SIZE = 16; // 16 bytes for the IV + const size_t MAGIC_SIZE = sizeof(uint32_t); + const size_t INDEX_SIZE = sizeof(uint32_t); + const size_t CRC_SIZE = sizeof(uint32_t); + const size_t HEADER_SIZE = MAGIC_SIZE + INDEX_SIZE + IV_SIZE + CRC_SIZE; + + // Ensure the data size is sufficient + if (size < HEADER_SIZE) { + return 1; // Failure: data size is too small + } + + // Extract fields from data buffer with endianess handling + uint32_t magic, index, crc; + memcpy(&magic, data, MAGIC_SIZE); + memcpy(&index, data + MAGIC_SIZE, INDEX_SIZE); + memcpy(fraction->iv, data + MAGIC_SIZE + INDEX_SIZE, IV_SIZE); + memcpy(&crc, data + MAGIC_SIZE + INDEX_SIZE + IV_SIZE, CRC_SIZE); + + // Convert from little-endian to host byte order if needed (for + // little-endian systems, this is usually not required) + magic = __bswap_32(magic); + index = __bswap_32(index); + crc = __bswap_32(crc); + + // Set the extracted values in the fraction structure + fraction->magic = magic; + fraction->index = index; + fraction->crc = crc; + + // Check the magic number + if (!check_magic(fraction->magic)) { + return 1; // Failure: magic number does not match + } + + // Allocate memory for fraction data + size_t data_size = size - HEADER_SIZE; + fraction->data = malloc(data_size); + if (!fraction->data) { + return 1; // Failure: memory allocation error + } + + // Copy the remaining data + memcpy(fraction->data, data + HEADER_SIZE, data_size); + + return 0; // Success +} + +int check_magic(uint32_t magic) { + return magic == MAGIC; +} + +void print_fraction(fraction_t fraction) { + printf("Magic: 0x%08x\n", fraction.magic); + printf("Index: %u\n", fraction.index); + printf("CRC: 0x%08x\n", fraction.crc); + printf("IV: "); + for (size_t i = 0; i < sizeof(fraction.iv); i++) { + printf("%02x ", (unsigned char)fraction.iv[i]); + } + printf("\n"); +} + +void fraction_free(fraction_t *fraction) { + free(fraction->data); + fraction->magic = 0; + fraction->index = 0; + fraction->crc = 0; +} diff --git a/src/client/fraction.h b/src/client/fraction.h new file mode 100644 index 0000000..500ad09 --- /dev/null +++ b/src/client/fraction.h @@ -0,0 +1,29 @@ +#ifndef fractions_h +#define fractions_h + +#include +#include "http.h" +#include "utils.h" +#include +#include +#include + +#include + +#define MAGIC 0xdeadbeef + +typedef struct { + uint32_t magic; + uint32_t index; + char iv[16]; + uint32_t crc; + + char *data; +} fraction_t; + +int download_fraction(int sfd, char *url, fraction_t *fraction); +int fraction_parse(char *data, size_t size, fraction_t *fraction); +int check_magic(uint32_t data); +void print_fraction(fraction_t fraction); +void fraction_free(fraction_t *fraction); +#endif diff --git a/src/client/http.c b/src/client/http.c index d1ed73d..04b7bf6 100644 --- a/src/client/http.c +++ b/src/client/http.c @@ -291,42 +291,6 @@ int http_get(int sfd, const char *path, http_res_t *res) { return err; } -/* Perform a GET request to path and write the body to the file specified in - * f_path */ -int http_download_data_to_file(int sfd, const char *path, const char *f_path) { - http_res_t res; - FILE *file; - int error; - - error = http_get(sfd, path, &res); - if (error != HTTP_SUCCESS) { - return error; - } - - file = fopen(f_path, "w"); - if (file == NULL) { - perror("Error: Failed to open file"); - http_free(&res); - return -1; - } - - if (fwrite(res.data, sizeof(char), res.size, file) != res.size) { - perror("Error: Failed to write data to file"); - fclose(file); - http_free(&res); - return -2; - } - - if (fclose(file) != 0) { - perror("Error: Failed to close file"); - http_free(&res); - return -3; - } - - http_free(&res); - return 0; -} - /* Properly free a http_res_t structure */ void http_free(http_res_t *res) { free(res->data); diff --git a/src/client/http.h b/src/client/http.h index 436d866..2102a87 100644 --- a/src/client/http.h +++ b/src/client/http.h @@ -5,6 +5,7 @@ #include #include #include "sock.h" +#include "utils.h" // error codes #define HTTP_SUCCESS 0 @@ -13,7 +14,7 @@ #define HTTP_OOM -3 #define HTTP_HEADERS_TOO_LONG -4 -#define HTTP_VERBOSE 1 +#define HTTP_VERBOSE 0 typedef struct { int status_code; @@ -27,8 +28,6 @@ void http_free(http_res_t *res); int http_get(int sfd, const char *path, http_res_t *res); int http_post(int sfd,const char* path,const char *content_type, const char* parameters, http_res_t *res); -int download_to_memory(int sfd,char **links,int n_links,char **bytes_array); - long parse_http_status_code(const char *buf); long parse_http_content_length(const char *buf); diff --git a/src/client/main.c b/src/client/main.c index bad6124..02ccb5b 100644 --- a/src/client/main.c +++ b/src/client/main.c @@ -2,6 +2,7 @@ #include #include +#include "fraction.h" #include "http.h" #include "sock.h" #include "utils.h" @@ -14,83 +15,92 @@ int main() { struct addrinfo hints, *ainfo; int sfd; // socket file descriptor char hostname[NI_MAXHOST]; - char **byte_arrays; - http_res_t http_fraction_res; - http_res_t http_post_res; + http_res_t http_fraction_res, http_post_res; /* Setup socket and initiate connection with the server */ setup_hints(&hints); if (h_getaddrinfo(SERVER_IP, SERVER_PORT, &hints, &ainfo) != 0) { + fprintf(stderr, "Failed to resolve server address\n"); return EXIT_FAILURE; } + if (h_getnameinfo(ainfo, hostname, sizeof(hostname)) != 0) { + freeaddrinfo(ainfo); + fprintf(stderr, "Failed to get server hostname\n"); return EXIT_FAILURE; } + printf("Connecting to: %s\n", hostname); sfd = create_sock_and_conn(ainfo); if (sfd == -1) { + fprintf(stderr, "Failed to create socket and connect\n"); return EXIT_FAILURE; } - - freeaddrinfo(ainfo); // we don't need these anymore + freeaddrinfo(ainfo); // ainfo no longer needed /* Get the fraction links */ if (http_get(sfd, "/", &http_fraction_res) != HTTP_SUCCESS) { - goto err; + fprintf(stderr, "Failed to retrieve fraction links\n"); + goto cleanup_socket; } + // Count number of links - int num_links = count_lines(http_fraction_res.data) + 1; // +1 for the last line if not ending with \n - + int num_links = count_lines(http_fraction_res.data) + 1; + // Allocate memory for fraction links char **fraction_links = malloc(num_links * sizeof(char *)); - if (fraction_links == NULL) { - fprintf(stderr, "malloc failed to allocate memory for fraction links\n"); + if (!fraction_links) { + fprintf(stderr, "Failed to allocate memory for fraction links\n"); http_free(&http_fraction_res); - goto err; + goto cleanup_socket; } // Split the response data into lines int lines_read = split_fraction_links(http_fraction_res.data, fraction_links, num_links); if (lines_read < 0) { - http_free(&http_fraction_res); + fprintf(stderr, "Failed to split fraction links\n"); free(fraction_links); - goto err; + http_free(&http_fraction_res); + goto cleanup_socket; } - // if(download_to_memory(sfd,fraction_links,lines_read ,byte_arrays)){ - // puts("Error downloading chunks"); - // return EXIT_FAILURE; - // }; - - // Print the fraction links - // TODO: Download each link to a file - for (int i = 0; i < lines_read; i++) { - // printf("%s\n", fraction_links[i]); - free(fraction_links[i]); // Free allocated memory for each line + fraction_t *fractions = malloc(lines_read * sizeof(fraction_t)); + for (int i=0; i #include #include #include @@ -15,6 +16,84 @@ static inline int count_lines(const char *str) { } return count; } + +static inline char *get_path_from_url(const char *url) { + const char *path_start = strstr(url, "://"); + + // If "://" is not found, return NULL + if (!path_start) + return NULL; + + path_start += 3; // Skip past "://" + + // Find the first '/' after the host part + const char *path = strchr(path_start, '/'); + + // If no path is found, return NULL + return path ? (char *)path : NULL; +} + int split_fraction_links(char *data, char *data_arr[], int maxlines); -char *get_path_from_url(const char *url); +void print_hex(char *str); + +const uint32_t crc32_tab[] = { + 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f, + 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988, + 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, 0x1db71064, 0x6ab020f2, + 0xf3b97148, 0x84be41de, 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7, + 0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9, + 0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172, + 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, 0x35b5a8fa, 0x42b2986c, + 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59, + 0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423, + 0xcfba9599, 0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924, + 0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190, 0x01db7106, + 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433, + 0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d, + 0x91646c97, 0xe6635c01, 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e, + 0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950, + 0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65, + 0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7, + 0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0, + 0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa, + 0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f, + 0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81, + 0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a, + 0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683, 0xe3630b12, 0x94643b84, + 0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1, + 0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb, + 0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc, + 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, 0xd6d6a3e8, 0xa1d1937e, + 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b, + 0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55, + 0x316e8eef, 0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236, + 0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe, 0xb2bd0b28, + 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d, + 0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, 0x9c0906a9, 0xeb0e363f, + 0x72076785, 0x05005713, 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, + 0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242, + 0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777, + 0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69, + 0x616bffd3, 0x166ccf45, 0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2, + 0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc, + 0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9, + 0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693, + 0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94, + 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d}; + +/* + * A function that calculates the CRC-32 based on the table above is + * given below for documentation purposes. An equivalent implementation + * of this function that's actually used in the kernel can be found + * in sys/libkern.h, where it can be inlined. + */ +uint32_t crc32(const void *buf, size_t size) { + const uint8_t *p = buf; + uint32_t crc; + + crc = ~0U; + while (size--) + crc = crc32_tab[(crc ^ *p++) & 0xFF] ^ (crc >> 8); + return crc ^ ~0U; +} #endif // UTILS_H