Skip to content

Minor streaming buffer cleanup/v2 #10276

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
inashivb wants to merge 1 commit into from
Closed

Minor streaming buffer cleanup/v2 #10276

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/util-streaming-buffer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ StreamingBufferBlock *SBB_RB_FIND_INCLUSIVE(struct SBB *head, StreamingBufferBlo
* \brief does data region intersect with list region 'r'
* Takes the max gap into account.
*/
static inline bool RegionsIntersect(const StreamingBuffer *sb, const StreamingBufferConfig *cfg,
static inline bool RegionsIntersect(const StreamingBufferConfig *cfg,
const StreamingBufferRegion *r, const uint64_t offset, const uint64_t re)
{
/* create the data range for the region, adding the max gap */
Expand Down Expand Up @@ -158,7 +158,7 @@ static StreamingBufferRegion *FindFirstRegionForOffset(const StreamingBuffer *sb

StreamingBufferRegion *p = NULL;
for (; r != NULL; r = r->next) {
if (RegionsIntersect(sb, cfg, r, offset, data_re) == true) {
if (RegionsIntersect(cfg, r, offset, data_re) == true) {
*prev = p;
return r;
}
Expand All @@ -182,7 +182,7 @@ static StreamingBufferRegion *FindLargestRegionForOffset(const StreamingBuffer *
SCLogDebug("checking: %p/%" PRIu64 "/%" PRIu64 ", offset %" PRIu64 "/%" PRIu64, r,
r->stream_offset, reg_re, offset, data_re);
#endif
if (!RegionsIntersect(sb, cfg, r, offset, data_re))
if (!RegionsIntersect(cfg, r, offset, data_re))
return candidate;

if (r->buf_size > candidate->buf_size) {
Expand All @@ -200,7 +200,7 @@ static StreamingBufferRegion *FindRightEdge(const StreamingBuffer *sb,
const uint64_t data_re = offset + len;
StreamingBufferRegion *candidate = r;
for (; r != NULL; r = r->next) {
if (!RegionsIntersect(sb, cfg, r, offset, data_re)) {
if (!RegionsIntersect(cfg, r, offset, data_re)) {
SCLogDebug(
"r %p is out of scope: %" PRIu64 "/%u/%" PRIu64, r, offset, len, offset + len);
return candidate;
Expand Down Expand Up @@ -1433,11 +1433,11 @@ static StreamingBufferRegion *BufferInsertAtRegion(StreamingBuffer *sb,
data_offset + data_len);
ListRegions(sb);

if (RegionsIntersect(sb, cfg, &sb->region, data_offset, data_offset + data_len)) {
if (RegionsIntersect(cfg, &sb->region, data_offset, data_offset + data_len)) {
SCLogDebug("data_offset %" PRIu64 ", data_len %u intersects with main region (next %p)",
data_offset, data_len, sb->region.next);
if (sb->region.next == NULL ||
!RegionsIntersect(sb, cfg, sb->region.next, data_offset, data_offset + data_len)) {
!RegionsIntersect(cfg, sb->region.next, data_offset, data_offset + data_len)) {
SCLogDebug(
"data_offset %" PRIu64
", data_len %u intersects with main region, no next or way before next region",
Expand Down