Changeset 2193905 for lib/protocols_ospf.c

Timestamp:

11/29/18 10:12:59 (2 years ago)

Author:

Jacob Van Walraven <jcv9@…>

Branches:

develop

Children:

fdf23b8

Parents:

d74ca03

Message:

Apply changes required for pull request #81

File:

• lib/protocols_ospf.c (modified) (12 diffs)

lib/protocols_ospf.c

@@ -27 +27 @@
 #include "libtrace.h"
 #include "protocols.h"
-#include <assert.h>
 #include <stdlib.h>
 #include <stdio.h> // fprintf
@@ -45 +44 @@
                 return NULL;
         }
-        /*assert(version != NULL && "version may not be NULL when calling trace_get_ospf_header!");*/
         if (!version) {
                 fprintf(stderr, "NULL version passed into trace_get_ospf_version()\n");
@@ -70 +68 @@
         char *ptr;
 
-        /*assert(remaining != NULL && "remaining may not be NULL when calling trace_get_ospf_contents!");*/
         if (!remaining) {
                 fprintf(stderr, "Remaining may not be NULL when calling trace_get_ospf_contents()\n");
@@ -86 +83 @@
                 *ospf_type = 0;
                 *remaining = 0;
-                fprintf(stderr, "Remaining may not be less than the size of libtrace_ospf_v2_t when calling trace_get_ospf_contents()\n");
                 return NULL;
         }
@@ -104 +100 @@
 
         unsigned char *link_ptr = NULL;
-        /*assert(remaining != NULL && "remaining may not be NULL when calling trace_get_first_link_from_router_lsa_v2!");*/
         if (!remaining) {
                 fprintf(stderr, "Remaining may not be NULL when calling trace_get_first_link_from_router_lsa_v2()\n");
@@ -116 +111 @@
         if (*remaining < sizeof(libtrace_ospf_router_lsa_v2_t)) {
                 *remaining = 0;
-                fprintf(stderr, "Remaining may not be less than the size of libtrace_ospf_router_lsa_v2_t when calling trace_get_first_ospf_link_from_router_lsa_v2()\n");
                 return NULL;
         }
@@ -132 +126 @@
         unsigned char *lsa_ptr = NULL;
 
-        /*assert(remaining != NULL && "remaining may not be NULL when calling trace_get_first_ospf_v2_lsa!");*/
         if (!remaining) {
                 fprintf(stderr, "Remaining may not be NULL when calling trace_get_first_ospf_v2_lsa()\n");
@@ -144 +137 @@
         if (*remaining < sizeof(libtrace_ospf_db_desc_v2_t)) {
                 *remaining = 0;
-                fprintf(stderr, "Remaining may not be less than the size of libtrace_ospf_db_desc_v2_t when calling trace_get_first_ospf_lsa_from_db_desc_v2()\n");
                 return NULL;
         }
@@ -160 +152 @@
         unsigned char *lsa_ptr = NULL;
 
-        /*assert(remaining != NULL && "remaining may not be NULL when calling trace_get_first_ospf_v2_lsa!");*/
         if (!remaining) {
-                fprintf(stderr, "Remaining may not be NULL when calling trace_get_first_ospf_v2_lsa()\n");
+                fprintf(stderr, "Remaining may not be NULL when calling "
+                        "trace_get_first_ospf_lsa_from_update_v2()\n");
                 return NULL;
         }
         if (!ls_update) {
-                fprintf(stderr, "ls_update may not be NULL when calling trace_get_first_ospf_v2_lsa()\n");
+                fprintf(stderr, "ls_update may not be NULL when calling "
+                        "trace_get_first_ospf_lsa_from_update_v2()\n");
                 return NULL;
         }
@@ -172 +165 @@
         if (*remaining < sizeof(libtrace_ospf_ls_update_t)) {
                 *remaining = 0;
-                fprintf(stderr, "Remaining may not be less than the size of an ls_update when calling trace_get_first_ospf_v2_lsa()\n");
                 return NULL;
         }
@@ -187 +179 @@
         uint32_t metric = 0;
 
-        /*assert(as_lsa);*/
         if (!as_lsa) {
                 fprintf(stderr, "NULL as_lsa passed into trace_get_ospf_metric_from_as_external_lsa_v2()\n");
@@ -206 +197 @@
         uint32_t metric = 0;
 
-        /*assert(sum_lsa);*/
         if (!sum_lsa) {
                 fprintf(stderr, "NULL sum_lsa passed into trace_get_ospf_metric_from_summary_lsa_v2()\n");