Refactored main.c and added a bit more verbose error handling to check_fractions

Author: skelly

client/include/fraction.h

@@ -29,5 +29,5 @@ int check_magic(uint32_t data);
 void print_fraction(fraction_t fraction);
 void fraction_free(fraction_t *fraction);
 int compare_fractions(const void* a, const void* b);
-void check_fractions(fraction_t *fraction, size_t size);
+int check_fractions(fraction_t *fraction, size_t size);
 #endif

client/src/fraction.c

@@ -133,10 +133,15 @@ uint32_t calc_crc(fraction_t *frac){
   return calculated_crc == frac->crc;
 }
 
-void check_fractions(fraction_t *fraction, size_t size){
+int check_fractions(fraction_t *fraction, size_t size){
   for(size_t i = 0; i < size; i++){
-    calc_crc(&fraction[i]);
+    if (!calc_crc(&fraction[i])) {
+      fprintf(stderr, "Failed to validate integrity of fraction:\n");
+      print_fraction(fraction[i]);
+      return 1;
+    }
   }
+  return 0;
 }
 
 void fraction_free(fraction_t *fraction) {

client/src/main.c

@@ -7,107 +7,130 @@
 #include "../include/sock.h"
 #include "../include/utils.h"
 
-/* Networking constants */
 #define SERVER_IP "127.0.0.1"
 #define SERVER_PORT "8000"
 
+/* Helper functions to assist with cleanup, I hate cleanup */
+static void cleanup_char_array(char **array, int n_elem) {
+  for (int i = 0; i < n_elem; i++) {
+    free(array[i]);
+  }
+  free(array);
+}
+
+static void cleanup_fraction_array(fraction_t *array, int n_elem) {
+  for (int i = 0; i < n_elem; i++) {
+    fraction_free(&array[i]);
+  }
+  free(array);
+}
+
 int main(void) {
   struct addrinfo hints, *ainfo;
-  int sfd; // socket file descriptor
+  int sfd = -1; // to be extra professional
   http_res_t http_fraction_res, http_post_res;
-  /* Setup socket and initiate connection with the server */
+  char **fraction_links = NULL;
+  fraction_t *fractions = NULL;
+
   setup_hints(&hints);
 
   if (h_getaddrinfo(SERVER_IP, SERVER_PORT, &hints, &ainfo) != 0) {
     fprintf(stderr, "Failed to resolve server address\n");
     return EXIT_FAILURE;
   }
 
-
   printf("Connecting to: %s:%s\n", SERVER_IP, SERVER_PORT);
   sfd = create_sock_and_conn(ainfo);
+  freeaddrinfo(ainfo);
   if (sfd == -1) {
     fprintf(stderr, "Failed to create socket and connect\n");
     return EXIT_FAILURE;
   }
-  freeaddrinfo(ainfo); // ainfo no longer needed
 
-  /* Get the fraction links */
   if (http_get(sfd, "/", &http_fraction_res) != HTTP_SUCCESS) {
     fprintf(stderr, "Failed to retrieve fraction links\n");
-    goto cleanup_socket;
+    goto cleanup;
   }
 
-  // Count number of links
   int num_links = count_lines(http_fraction_res.data) + 1;
-
-  // Allocate memory for fraction links
-  char **fraction_links = malloc(num_links * sizeof(char *));
+  fraction_links = malloc(num_links * sizeof(char *));
   if (!fraction_links) {
     fprintf(stderr, "Failed to allocate memory for fraction links\n");
     http_free(&http_fraction_res);
-    goto cleanup_socket;
+    goto cleanup;
   }
 
-  // Split the response data into lines
   int lines_read =
       split_fraction_links(http_fraction_res.data, fraction_links, num_links);
   if (lines_read < 0) {
     fprintf(stderr, "Failed to split fraction links\n");
-    free(fraction_links);
+    cleanup_char_array(fraction_links, num_links);
     http_free(&http_fraction_res);
-    goto cleanup_socket;
+    goto cleanup;
   }
 
-  // Storing the fractions in a array
-  fraction_t *fractions = malloc(lines_read * sizeof(fraction_t));
-  if (fractions == NULL) {
-    fprintf(stderr, "Failed to malloc memory for fractions\n");
+
+  fractions = malloc(lines_read * sizeof(fraction_t));
+  if (!fractions) {
+    fprintf(stderr, "Failed to allocate memory for fractions\n");
+    cleanup_char_array(fraction_links, num_links);
+    http_free(&http_fraction_res);
+    http_free(&http_post_res);
+    goto cleanup;
   }
 
-  for (int i=0; i<lines_read; i++) {
+  for (int i = 0; i < lines_read; i++) {
     if (download_fraction(sfd, fraction_links[i], &fractions[i]) != 0) {
-      fprintf(stderr, "Failed to parse fraction\n");
+      fprintf(stderr, "Failed to download fraction\n");
     }
   }
 
-  // Sort the fractions based on index
   qsort(fractions, lines_read, sizeof(fraction_t), compare_fractions);
   for (int i = 0; i < lines_read; i++) {
     print_fraction(fractions[i]);
   }
 
-  check_fractions(fractions, lines_read);
+  if (check_fractions(fractions, lines_read)) { // if this works, s0s4 and skelly is to blame!
+    fprintf(stderr, "Fractions check failed\n");
+    cleanup_char_array(fraction_links, num_links);
+    cleanup_fraction_array(fractions, lines_read);
+    http_free(&http_fraction_res);
+    http_free(&http_post_res);
+    goto cleanup;
+  }
 
-  /* Notify the server that we successfully downloaded the fractions */
   if (http_post(sfd, "/deadbeef", "plain/text", "{'downloaded':true}",
                 &http_post_res) != HTTP_SUCCESS) {
     fprintf(stderr, "Failed to send POST request\n");
-    free(fraction_links);
+    cleanup_char_array(fraction_links, num_links);
     http_free(&http_fraction_res);
-    http_free(&http_post_res);
-    goto cleanup_socket;
+    goto cleanup;
   }
 
-  /* Cleanup */
   http_free(&http_fraction_res);
   http_free(&http_post_res);
-
-  // Free fractions and links
-  for (int i = 0; i < lines_read; i++) {
-    free(fraction_links[i]);
-    fraction_free(&fractions[i]);
-  }
-  free(fraction_links);
-  free(fractions);
+  cleanup_char_array(fraction_links, num_links);
+  cleanup_fraction_array(fractions, lines_read);
 
   close(sfd);
   return EXIT_SUCCESS;
 
-
-
-
-cleanup_socket:
-  close(sfd);
+/* There's nothing to see here, move on*/
+cleanup: // we accept NO comments on this. have a !nice day
+  if (sfd != -1) {
+    close(sfd);
+  }
+  if (fraction_links) {
+    cleanup_char_array(fraction_links, num_links);
+  }
+  if (fractions) {
+    cleanup_fraction_array(fractions, num_links);
+  }
+  if (http_fraction_res.data) {
+    http_free(&http_fraction_res);
+  }
+  if (http_post_res.data) {
+    http_free(&http_post_res);
+  }
   return EXIT_FAILURE;
 }