Changeset 7d86ee2

Timestamp:

11/07/18 11:34:25 (2 years ago)

Author:

Jacob Van Walraven <jcv9@…>

Branches:

develop

Children:

93f4c64

Parents:

774b237

Message:

Added some error checking

File:

• examples/tutorial/ipdist.c (modified) (11 diffs)

examples/tutorial/ipdist.c

@@ -33 +33 @@
         /* Commands that need to be sent to gnuplot */
         char *commands[] = {"set term png size 1280,960",
+                            "set title 'IP Distrubtion'",
                             "set xrange [0:255]",
+                            "set xlabel 'Prefix'",
+                            "set ylabel 'Hits'",
                             "set xtics 0,10,255",
                             "set output 'ipdist.png'",
@@ -41 +44 @@
         FILE *gnuplot = popen("gnuplot -persistent", "w");
         /* send all commands to gnuplot */
-        for(i=0;i<6;i++) {
+        for(i=0;i<9;i++) {
                 fprintf(gnuplot, "%s \n", commands[i]);
         }
@@ -78 +81 @@
                 uint32_t address = htonl(ip4.s_addr);
 
-                /* Check if the address is part of an excluded network.
-                   This is performed before splitting the into octets so if performed over entire address. */
+                /* Check if the address is part of an excluded network. */
                 if(network_excluded(address) == 0) {
 
@@ -89 +91 @@
                         octet[3] = (address & 0x000000ff);
 
-                        /* check if the supplied address was a source or destination, increment
-                           the correct one */
+                        /* check if the supplied address was a source or destination,
+                           increment the correct one */
                         if(srcaddr) {
                                 srcaddrcount[octet[0]]++;
@@ -97 +99 @@
                         }
                 }
-
         }
 }
@@ -118 +119 @@
                 process_ip(address, 0);
         }
-
+}
+
+static void libtrace_cleanup(libtrace_t *trace, libtrace_packet_t *packet) {
+        /* Only destroy trace and packet if they are not NULL */
+        if(trace) {
+                trace_destroy(trace);
+        }
+        if(packet) {
+                trace_destroy_packet(packet);
+        }
 }
 
@@ -128 +138 @@
         /* Ensure the input URI was supplied */
         if(argc < 2) {
-                fprintf(stderr, "Usage: %s inputURI\n", argv[0]);
+                fprintf(stderr, "Usage: %s inputURI [excluded networks]\n", argv[0]);
+                fprintf(stderr, "       eg. ./ipdist input.erf 210.10.3.0/24 70.5.0.0/16\n");
                 return 1;
         }
@@ -149 +160 @@
         char delim[] = "/";
         // Convert supplied address and mask to a exclude_network structure
-        for(i=2;i<argc;i++) {
-                char *address = strtok(argv[i], delim);
+        for(i=0;i<argc-2;i++) {
+                char *address = strtok(argv[i+2], delim);
                 char *mask = strtok(NULL, delim);
 
+                /* Check the subnet mask is valid */
+                if(atoi(mask) == 0 || atoi(mask) > 32 || atoi(mask) < 0) {
+                        fprintf(stderr, "Invalid subnet mask: %s\n", mask);
+                        return 1;
+                }
                 /* right shift so netmask is in network byte order */
-                exclude[i-2].mask = 0xffffffff << (32 - atoi(mask));
+                exclude[i].mask = 0xffffffff << (32 - atoi(mask));
 
                 struct in_addr addr;
-                /* Convert address string into uint32_t */
-                inet_aton(address, &addr);
+                /* Convert address string into uint32_t and check its valid*/
+                if(inet_aton(address, &addr) == 0) {
+                        fprintf(stderr, "Invalid exclude address: %s\n", address);
+                        return 1;
+                }
                 /* Ensure its saved in network byte order */
-                exclude[i-2].address = htonl(addr.s_addr);
+                exclude[i].address = htonl(addr.s_addr);
 
                 /* Calculate the network address */
-                exclude[i-2].network = exclude[i-2].address & exclude[i-2].mask;
+                exclude[i].network = exclude[i].address & exclude[i].mask;
         }
 
         /* Create the packet structure */
         packet = trace_create_packet();
+        /* Ensure no error has occured creating the packet */
+        if(packet == NULL) {
+                perror("Creating libtrace packet");
+                libtrace_cleanup(trace, packet);
+                return 1;
+        }
 
         /* Create the trace */
         trace = trace_create(argv[1]);
-
         /* Ensure no error has occured creating the trace */
         if(trace_is_err(trace)) {
                 trace_perror(trace, "Opening trace file");
+                libtrace_cleanup(trace, packet);
                 return 1;
         }
@@ -181 +206 @@
         if(trace_start(trace) == -1) {
                 trace_perror(trace, "Starting trace");
-                trace_destroy(trace);
+                libtrace_cleanup(trace, packet);
                 return 1;
         }
@@ -194 +219 @@
         if(trace_is_err(trace)) {
                 trace_perror(trace, packet);
+                libtrace_cleanup(trace, packet);
                 return 1;
         }
@@ -203 +229 @@
         plot_results();
 
-        trace_destroy(trace);
-        trace_destroy_packet(packet);
-        //libtrace_cleanup(trace, packet);
+        /* cleanup */
+        libtrace_cleanup(trace, packet);
+
         return 0;
 }