Move memset() out of PACKET_INITIALIZE() to prepare for porting Tilera mPIPE #358
Conversation
The memset() inside PACKET_INITIALIZE() is redundant in some cases and it is cleaner to do as part of the memory allocation. This simplifies changes for integrating Tilera mPIPE support because the size of memory cleared in that case is different from SIZE_OF_PACKET. For the cases where Packets are directly allocated and then call PACKET_INITIALIZE() without memset() first, this patch adds memset() calls. A further change would use GetPacketFromAlloc() directly.
The PKT_ALLOC flag was being cleared by PACKET_RECYCLE(), which could then result in a packet being pushed back to the Packet ring buffer incorrectly.
|
Merged into master, thanks Ken. Btw, please rebase against master before submitting. |
|
It made our buildbot unhappy: https://buildbot.suricata-ids.org/builders/build%20deb6/builds/117/steps/shell_4/logs/stdio One of our coccinelle checks fails: Packet zeroed at /var/cache/buildbot/slave/build_deb6/build/src/decode.c:92 but pkt field is not set afterward. Guess we'll have to update the check. |
|
Hi Victor, Thanks. I thought I had rebased, but clearly I had not. I’m new to git. I have more changes coming, but wanted to start with small ones. Regards, From: Victor Julien [mailto:notifications@github.com] Merged into master, thanks Ken. Btw, please rebase against master before submitting. — |
|
Hi Victor, What is the policy for updating Copy Right dates on Suricata files? I have been updating to 2013 for files that I edit. Regards, From: Victor Julien [mailto:notifications@github.com] Merged into master, thanks Ken. Btw, please rebase against master before submitting. — |
The memset() inside PACKET_INITIALIZE() is redundant in some cases and
it is cleaner to do as part of the memory allocation. This simplifies
changes for integrating Tilera mPIPE support because the size of memory
cleared in that case is different from SIZE_OF_PACKET.
For the cases where Packets are directly allocated and then call
PACKET_INITIALIZE() without memset() first, this patch adds memset() calls.
A further change would use GetPacketFromAlloc() directly.