From: Victor Julien <victor@inliniac.net>
Date: Tue, 21 Jun 2016 15:07:15 +0000 (+0200)
Subject: af-packet: minor cleanups
X-Git-Tag: suricata-3.1.1~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4111331ab067c8e6038cf131eb31b2c8350b3ead;p=thirdparty%2Fsuricata.git

af-packet: minor cleanups
---

diff --git a/src/runmode-af-packet.c b/src/runmode-af-packet.c
index 714589fc55..d230eabbba 100644
--- a/src/runmode-af-packet.c
+++ b/src/runmode-af-packet.c
@@ -408,12 +408,14 @@ finalize:
         if (rss_queues > 0) {
             if (rss_queues < aconf->threads) {
                 aconf->threads = rss_queues;
-                SCLogInfo("More cores than RSS queues, using %d threads for interface %s",
-                          aconf->threads, iface);
+                SCLogInfo("More cores than RSS queues, using %d threads "
+                        "for interface %s", aconf->threads, iface);
             }
         }
-        if (aconf->threads)
-            SCLogPerf("Using %d AF_PACKET threads for interface %s", aconf->threads, iface);
+        if (aconf->threads) {
+            SCLogPerf("Using %d AF_PACKET threads for interface %s",
+                    aconf->threads, iface);
+        }
     }
     if (aconf->threads <= 0) {
         aconf->threads = 1;
diff --git a/src/source-af-packet.c b/src/source-af-packet.c
index db6f5056bc..2721ed47f6 100644
--- a/src/source-af-packet.c
+++ b/src/source-af-packet.c
@@ -1879,7 +1879,7 @@ static int AFPCreateSocket(AFPThreadVars *ptv, char *devname, int verbose)
         if (setsockopt(ptv->socket, SOL_PACKET, PACKET_AUXDATA, &val,
                     sizeof(val)) == -1 && errno != ENOPROTOOPT) {
             SCLogWarning(SC_ERR_NO_AF_PACKET,
-                         "'kernel' checksum mode not supported, failling back to full mode.");
+                         "'kernel' checksum mode not supported, falling back to full mode.");
             ptv->checksum_mode = CHECKSUM_VALIDATION_ENABLE;
         }
     }
@@ -1920,14 +1920,13 @@ static int AFPCreateSocket(AFPThreadVars *ptv, char *devname, int verbose)
 #ifdef HAVE_PACKET_FANOUT
     /* add binded socket to fanout group */
     if (ptv->threads > 1) {
-        uint32_t option = 0;
         uint16_t mode = ptv->cluster_type;
         uint16_t id = ptv->cluster_id;
-        option = (mode << 16) | (id & 0xffff);
+        uint32_t option = (mode << 16) | (id & 0xffff);
         r = setsockopt(ptv->socket, SOL_PACKET, PACKET_FANOUT,(void *)&option, sizeof(option));
         if (r < 0) {
             SCLogError(SC_ERR_AFP_CREATE,
-                       "Coudn't set fanout mode, error %s",
+                       "Couldn't set fanout mode, error %s",
                        strerror(errno));
             goto socket_err;
         }
@@ -1938,7 +1937,7 @@ static int AFPCreateSocket(AFPThreadVars *ptv, char *devname, int verbose)
     if (if_flags == -1) {
         if (verbose) {
             SCLogError(SC_ERR_AFP_READ,
-                    "Can not acces to interface '%s'",
+                    "Couldn't get flags for interface '%s'",
                     ptv->iface);
         }
         ret = AFP_RECOVERABLE_ERROR;