setsockopt() failures are already fatal,

so treat them as such and print error instead of warning.
pull/249/merge
Nikolay Denev 13 years ago committed by Victor Julien
parent 29b69fb026
commit 894ad21be5

@ -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);
}

@ -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);

@ -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,

Loading…
Cancel
Save