set SO_BROADCAST on the divert socket. #249
Conversation
packets can be reinjected.
| 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)); |
There was a problem hiding this comment.
This shouldn't be a warning if it's actually an error, which it seems to be since we return "failed"
There was a problem hiding this comment.
Sent from my iPhone
On 22.12.2012, at 14:00, Victor Julien notifications@github.com wrote:
In src/source-ipfw.c:
@@ -352,6 +353,15 @@ TmEcode ReceiveIPFWThreadInit(ThreadVars _tv, void *initdata, void *_data)
SCReturnInt(TM_ECODE_FAILED);
}
- /* set SO_BROADCAST on the divert socket, otherwise sendto()
\* returns EACCES when reinjecting broadcast packets. */- 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));
This shouldn't be a warning if it's actually an error, which it seems to be
since we return "failed"
I just copy+pasted from the setsockopt() call before this one, so maybe
both need to be changed?
There was a problem hiding this comment.
Yes, changing both would be better.
There was a problem hiding this comment.
I've updated the pull request with another commit changing them both to errors instead of warnings.
so treat them as such and print error instead of warning.
| SC_ERR_IPFW_NOPORT, | ||
| SC_WARN_IPFW_RECV, | ||
| SC_WARN_IPFW_XMIT, | ||
| SC_WARN_IPFW_SETSOCKOPT, |
There was a problem hiding this comment.
This changes the actual numbers of the error codes, which is unwanted.
There was a problem hiding this comment.
So I leave the WARN and add the ERR at the end?
There was a problem hiding this comment.
Yeah we shouldn't change the order.
There was a problem hiding this comment.
Ok. They are not going to be grouped anymore, but the order will remain the same for the existing error codes. I will push the update now.
restore SC_WARN_IPFW_SETSOCKOPT move SC_ERR_IPFW_SETSOCKOPT at the end of the enum
|
Merged, thanks! |
set SO_BROADCAST on the divert socket so that broadcast packets can be reinjected.