Fix up indentation in targets.cc.

targets.cc

@@ -167,8 +167,8 @@ void returnhost(HostGroupState *hs) {
   hs->next_batch_no--;
 }
 
-/* Is the host passed as Target to be excluded, much of this logic had  (mdmcl)
+/* Is the host passed as Target to be excluded? Much of this logic had
- * to be rewritten from wam's original code to allow for the objects */
+   to be rewritten from wam's original code to allow for the objects */
 static int hostInExclude(struct sockaddr *checksock, size_t checksocklen, 
                   TargetGroup *exclude_group) {
   unsigned long tmpTarget; /* ip we examine */
@@ -193,8 +193,7 @@ static int hostInExclude(struct sockaddr *checksock, size_t checksocklen,
   targets_type = exclude_group[i].get_targets_type();
 
   /* Lets go through the targets until we reach our uninitialized placeholder */
-  while (exclude_group[i].get_targets_type() != TargetGroup::TYPE_NONE)
+  while (exclude_group[i].get_targets_type() != TargetGroup::TYPE_NONE) { 
-  { 
     /* while there are still hosts in the target group */
     while (exclude_group[i].get_next_host(&ss, &slen) == 0) {
       tmpTarget = sin->sin_addr.s_addr; 
@@ -208,8 +207,7 @@ static int hostInExclude(struct sockaddr *checksock, size_t checksocklen,
         if ((tmpTarget & mask) == (checkhost_in->sin_addr.s_addr & mask)) {
           exclude_group[i].rewind();
           return 1;
-        }
+        } else {
-	else {
           break;
         }
       } 
@@ -222,8 +220,8 @@ static int hostInExclude(struct sockaddr *checksock, size_t checksocklen,
         if (tmpTarget == checkhost_in->sin_addr.s_addr) {
           exclude_group[i].rewind();
           return 1;
-        }
+        } else {
-        else { /* note these are in network byte order */
+          /* note these are in network byte order */
           if ((tmpTarget & 0x000000ff) != (checkhost_in->sin_addr.s_addr & 0x000000ff))
             exclude_group[i].skip_range(TargetGroup::FIRST_OCTET); 
           else if ((tmpTarget & 0x0000ff00) != (checkhost_in->sin_addr.s_addr & 0x0000ff00))
@@ -342,14 +340,12 @@ size_t read_host_from_file(FILE *fp, char *buf, size_t n)
   return i;
 }
 
-/* A debug routine to dump some information to stdout.                  (mdmcl)
+/* A debug routine to dump some information to stdout. Invoked if debugging is
- * Invoked if debugging is set to 3 or higher
+   set to 3 or higher. I had to make significant changes from wam's code.
- * I had to make signigicant changes from wam's code. Although wam
+   Although wam displayed much more detail, alot of this is now hidden inside of
- * displayed much more detail, alot of this is now hidden inside
+   the Target Group Object. Rather than writing a bunch of methods to return
- * of the Target Group Object. Rather than writing a bunch of methods
+   private attributes, which would only be used for debugging, I went for the
- * to return private attributes, which would only be used for 
+   method below. */
- * debugging, I went for the method below.
- */
 int dumpExclude(TargetGroup *exclude_group) {
   int i=0, debug_save=0, type=TargetGroup::TYPE_NONE;
   unsigned int mask = 0;
@@ -357,13 +353,12 @@ int dumpExclude(TargetGroup *exclude_group) {
   struct sockaddr_in *sin = (struct sockaddr_in *) &ss;
   size_t slen;
 
-  /* shut off debugging for now, this is a debug routine in itself,
+  /* shut off debugging for now, this is a debug routine in itself, we don't
-   * we don't want to see all the debug messages inside of the object */
+     want to see all the debug messages inside of the object */
   debug_save = o.debugging;
   o.debugging = 0;
 
-  while ((type = exclude_group[i].get_targets_type()) != TargetGroup::TYPE_NONE)
+  while ((type = exclude_group[i].get_targets_type()) != TargetGroup::TYPE_NONE) {
-  {
     switch (type) {
       case TargetGroup::IPV4_NETMASK:
         exclude_group[i].get_next_host(&ss, &slen);
@@ -449,8 +444,7 @@ hs->current_batch_sz = hs->next_batch_no = 0;
   do {
     /* Grab anything we have in our current_expression */
     while (hs->current_batch_sz < hs->max_batch_sz && 
-	 hs->current_expression.get_next_host(&ss, &sslen) == 0)
+        hs->current_expression.get_next_host(&ss, &sslen) == 0) {
-    {
       if (hostInExclude((struct sockaddr *)&ss, sslen, exclude_group)) {
         continue; /* Skip any hosts the user asked to exclude */
       }
@@ -492,7 +486,8 @@ do {
         if (rnfo.ii.device_type == devt_ethernet) {
           if (o.spoofMACAddress())
             hs->hostbatch[hidx]->setSrcMACAddress(o.spoofMACAddress());
-	  else hs->hostbatch[hidx]->setSrcMACAddress(rnfo.ii.mac);
+          else
+            hs->hostbatch[hidx]->setSrcMACAddress(rnfo.ii.mac);
         }
         hs->hostbatch[hidx]->setSourceSockAddr(&rnfo.srcaddr, sizeof(rnfo.srcaddr));
         if (hidx == 0) /* Because later ones can have different src addy and be cut off group */
@@ -501,10 +496,9 @@ do {
         // printf("Target %s %s directly connected, goes through local iface %s, which %s ethernet\n", hs->hostbatch[hidx]->NameIP(), hs->hostbatch[hidx]->directlyConnected()? "IS" : "IS NOT", hs->hostbatch[hidx]->deviceName(), (hs->hostbatch[hidx]->ifType() == devt_ethernet)? "IS" : "IS NOT");
       }
 
-
+      /* In some cases, we can only allow hosts that use the same device in a
-      /* In some cases, we can only allow hosts that use the same
+         group. Similarly, we don't mix directly-connected boxes with those that
-	 device in a group.  Similarly, we don't mix
+         aren't */
-	 directly-connected boxes with those that aren't */
       if (o.af() == AF_INET && o.isr00t && hidx > 0 && 
           hs->hostbatch[hidx]->deviceName() && 
           (hs->hostbatch[hidx]->v4source().s_addr != hs->hostbatch[0]->v4source().s_addr || 
@@ -553,13 +547,16 @@ if (hs->randomize) {
   gettimeofday(&now, NULL);
   if ((o.sendpref & PACKET_SEND_ETH) && 
       hs->hostbatch[0]->ifType() == devt_ethernet) {
-   for(i=0; i < hs->current_batch_sz; i++)
+    for (i=0; i < hs->current_batch_sz; i++) {
       if (!(hs->hostbatch[i]->flags & HOST_DOWN) && 
-	 !hs->hostbatch[i]->timedOut(&now))
+          !hs->hostbatch[i]->timedOut(&now)) {
-       if (!setTargetNextHopMAC(hs->hostbatch[i]))
+        if (!setTargetNextHopMAC(hs->hostbatch[i])) {
           fatal("%s: Failed to determine dst MAC address for target %s", 
               __func__, hs->hostbatch[i]->NameIP());
         }
+      }
+    }
+  }
 
   /* TODO: Maybe I should allow real ping scan of directly connected
      ethernet hosts? */
@@ -579,7 +576,8 @@ if (hs->randomize) {
     massping(hs->hostbatch, hs->current_batch_sz, ports);
   }
 
- if (!o.noresolve) nmap_mass_rdns(hs->hostbatch, hs->current_batch_sz);
+  if (!o.noresolve)
+    nmap_mass_rdns(hs->hostbatch, hs->current_batch_sz);
 
   return hs->hostbatch[hs->next_batch_no++];
 }