setsockopt() failures are already fatal,

so treat them as such and print error instead of warning.

diff --git a/src/source-ipfw.c b/src/source-ipfw.c
index b42333756429573cf120e275775a5e768904e0bc..3b450ad9caa1a597f59791bcc8ef1b6daac40cea 100644 (file)
--- a/src/source-ipfw.c
+++ b/src/source-ipfw.c
@@ -349,7 +349,7 @@ TmEcode ReceiveIPFWThreadInit(ThreadVars *tv, void *initdata, void **data)
     timev.tv_usec = 0;
 
     if (setsockopt(nq->fd, SOL_SOCKET, SO_RCVTIMEO, &timev, sizeof(timev)) == -1) {
-        SCLogWarning(SC_WARN_IPFW_SETSOCKOPT,"Can't set IPFW divert socket timeout: %s", strerror(errno));
+        SCLogError(SC_ERR_IPFW_SETSOCKOPT,"Can't set IPFW divert socket timeout: %s", strerror(errno));
         SCReturnInt(TM_ECODE_FAILED);
     }
 
@@ -358,7 +358,7 @@ TmEcode ReceiveIPFWThreadInit(ThreadVars *tv, void *initdata, void **data)
     flag = 1;
 
     if (setsockopt(nq->fd, SOL_SOCKET, SO_BROADCAST, &flag, sizeof(flag)) == -1) {
-        SCLogWarning(SC_WARN_IPFW_SETSOCKOPT,"Can't set IPFW divert socket broadcast flag: %s", strerror(errno));
+        SCLogError(SC_ERR_IPFW_SETSOCKOPT,"Can't set IPFW divert socket broadcast flag: %s", strerror(errno));
         SCReturnInt(TM_ECODE_FAILED);
     }
 

diff --git a/src/util-error.c b/src/util-error.c
index 0a5e02b40d9ed676f74c8ec1cdf4eeeead8d4097..f8426b991a9e771eef6849fe055cffe65e304449 100644 (file)
--- a/src/util-error.c
+++ b/src/util-error.c
@@ -139,10 +139,10 @@ const char * SCErrorToString(SCError err)
         CASE_CODE (SC_ERR_IPFW_NOSUPPORT);
         CASE_CODE (SC_ERR_IPFW_BIND);
         CASE_CODE (SC_ERR_IPFW_SOCK);
+        CASE_CODE (SC_ERR_IPFW_SETSOCKOPT);
         CASE_CODE (SC_ERR_IPFW_NOPORT);
         CASE_CODE (SC_WARN_IPFW_RECV);
         CASE_CODE (SC_WARN_IPFW_XMIT);
-        CASE_CODE (SC_WARN_IPFW_SETSOCKOPT);
         CASE_CODE (SC_WARN_IPFW_UNBIND);
         CASE_CODE (SC_ERR_MULTIPLE_RUN_MODE);
         CASE_CODE (SC_ERR_BPF);

diff --git a/src/util-error.h b/src/util-error.h
index b9b0f0b2fdf7ca662854ac41f0a0d7805ccf2005..6c8a5062e786a6b6032305bf9c8094eff4139afc 100644 (file)
--- a/src/util-error.h
+++ b/src/util-error.h
@@ -109,10 +109,10 @@ typedef enum {
     SC_ERR_IPFW_NOSUPPORT,
     SC_ERR_IPFW_BIND,
     SC_ERR_IPFW_SOCK,
+    SC_ERR_IPFW_SETSOCKOPT,
     SC_ERR_IPFW_NOPORT,
     SC_WARN_IPFW_RECV,
     SC_WARN_IPFW_XMIT,
-    SC_WARN_IPFW_SETSOCKOPT,
     SC_WARN_IPFW_UNBIND,
     SC_ERR_DAEMON,
     SC_ERR_UNIMPLEMENTED,