forked from linux-audit/audit-userspace
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ausearch: convert contid to comma/carrat-sep cnode/clist
Convert the contid list from a list of strings to a list of contids for faster and more efficient processing. Signed-off-by: Richard Guy Briggs <[email protected]>
- Loading branch information
Showing
9 changed files
with
313 additions
and
122 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,171 @@ | ||
| /* | ||
| * ausearch-contid.c - Minimal linked list library for contid | ||
| * adapted from ausearch-string.c | ||
| * Copyright (c) 2005,2008,2014,2019 Red Hat Inc., Durham, North Carolina. | ||
| * All Rights Reserved. | ||
| * | ||
| * This software may be freely redistributed and/or modified under the | ||
| * terms of the GNU General Public License as published by the Free | ||
| * Software Foundation; either version 2, or (at your option) any | ||
| * later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program; see the file COPYING. If not, write to the | ||
| * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor | ||
| * Boston, MA 02110-1335, USA. | ||
| * | ||
| * Authors: | ||
| * Steve Grubb <[email protected]> | ||
| * Richard Guy Briggs <[email protected]> | ||
| */ | ||
|
|
||
| #include "ausearch-contid.h" | ||
| #include <stdlib.h> | ||
|
|
||
|
|
||
| void clist_create(clist *l) | ||
| { | ||
| l->head = NULL; | ||
| l->cur = NULL; | ||
| l->cnt = 0; | ||
| } | ||
|
|
||
| void clist_last(clist *l) | ||
| { | ||
| register cnode* cur; | ||
|
|
||
| if (l->head == NULL) | ||
| return; | ||
|
|
||
| // Try using cur so that we don't have to start at beginnning | ||
| if (l->cur) | ||
| cur = l->cur; | ||
| else | ||
| cur = l->head; | ||
|
|
||
| // Loop until no next value | ||
| while (cur->next) | ||
| cur = cur->next; | ||
| l->cur = cur; | ||
| } | ||
|
|
||
| cnode *clist_next(clist *l) | ||
| { | ||
| if (l->cur == NULL) | ||
| return NULL; | ||
| l->cur = l->cur->next; | ||
| return l->cur; | ||
| } | ||
|
|
||
| void clist_append(clist *l, cnode *node) | ||
| { | ||
| cnode* newnode; | ||
|
|
||
| newnode = malloc(sizeof(cnode)); | ||
|
|
||
| newnode->id = node->id; | ||
| newnode->hits = node->hits; | ||
| newnode->next = NULL; | ||
|
|
||
| // Make sure cursor is at the end | ||
| clist_last(l); | ||
|
|
||
| // if we are at top, fix this up | ||
| if (l->head == NULL) | ||
| l->head = newnode; | ||
| else // Otherwise add pointer to newnode | ||
| l->cur->next = newnode; | ||
|
|
||
| // make newnode current | ||
| l->cur = newnode; | ||
| l->cnt++; | ||
| } | ||
|
|
||
| void clist_clear(clist* l) | ||
| { | ||
| cnode* nextnode; | ||
| register cnode* current; | ||
|
|
||
| current = l->head; | ||
| while (current) { | ||
| nextnode=current->next; | ||
| free(current); | ||
| current=nextnode; | ||
| } | ||
| l->head = NULL; | ||
| l->cur = NULL; | ||
| l->cnt = 0; | ||
| } | ||
|
|
||
| /* This function dominates the timing of aureport. Needs to be more efficient */ | ||
| int clist_add_if_uniq(clist *l, const unsigned long long id) | ||
| { | ||
| cnode cn; | ||
| register cnode *cur; | ||
|
|
||
| if (id == (unsigned long long)-1) | ||
| return -1; | ||
|
|
||
| cur = l->head; | ||
| while (cur) { | ||
| if (id == cur->id) { | ||
| cur->hits++; | ||
| l->cur = cur; | ||
| return 0; | ||
| } else | ||
| cur = cur->next; | ||
| } | ||
|
|
||
| /* No matches, append to the end */ | ||
| cn.id = id; | ||
| cn.hits = 1; | ||
| clist_append(l, &cn); | ||
| return 1; | ||
| } | ||
|
|
||
| // If lprev would be NULL, use l->head | ||
| static void swap_nodes(cnode *lprev, cnode *left, cnode *right) | ||
| { | ||
| cnode *t = right->next; | ||
| if (lprev) | ||
| lprev->next = right; | ||
| right->next = left; | ||
| left->next = t; | ||
| } | ||
|
|
||
| // This will sort the list from most hits to least | ||
| void clist_sort_by_hits(clist *l) | ||
| { | ||
| register cnode* cur, *prev; | ||
|
|
||
| if (l->cnt <= 1) | ||
| return; | ||
|
|
||
| prev = cur = l->head; | ||
|
|
||
| while (cur && cur->next) { | ||
| /* If the next node is bigger */ | ||
| if (cur->hits < cur->next->hits) { | ||
| if (cur == l->head) { | ||
| // Update the actual list head | ||
| l->head = cur->next; | ||
| prev = NULL; | ||
| } | ||
| swap_nodes(prev, cur, cur->next); | ||
|
|
||
| // start over | ||
| prev = cur = l->head; | ||
| continue; | ||
| } | ||
| prev = cur; | ||
| cur = cur->next; | ||
| } | ||
| // End with cur pointing at first record | ||
| l->cur = l->head; | ||
| } | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| /* | ||
| * ausearch-contid.h - Header file for ausearch-contid.c | ||
| * adapted from ausearch-string.h | ||
| * Copyright (c) 2005,2008,2019 Red Hat Inc., Durham, North Carolina. | ||
| * All Rights Reserved. | ||
| * | ||
| * This software may be freely redistributed and/or modified under the | ||
| * terms of the GNU General Public License as published by the Free | ||
| * Software Foundation; either version 2, or (at your option) any | ||
| * later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program; see the file COPYING. If not, write to the | ||
| * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor | ||
| * Boston, MA 02110-1335, USA. | ||
| * | ||
| * Authors: | ||
| * Steve Grubb <[email protected]> | ||
| * Richard Guy Briggs <[email protected]> | ||
| */ | ||
|
|
||
| #ifndef AUCONTID_HEADER | ||
| #define AUCONTID_HEADER | ||
|
|
||
| #include "config.h" | ||
|
|
||
| /* This is the node of the linked list. message & item are the only elements | ||
| * at this time. Any data elements that are per item goes here. */ | ||
| typedef struct _cnode{ | ||
| unsigned long long id; // The audit container id | ||
| unsigned int hits; // Number of times this contid was attempted to be added | ||
| struct _cnode* next; // Next contid node pointer | ||
| } cnode; | ||
|
|
||
| /* This is the linked list head. Only data elements that are 1 per | ||
| * event goes here. */ | ||
| typedef struct { | ||
| cnode *head; // List head | ||
| cnode *cur; // Pointer to current node | ||
| unsigned int cnt; // How many items in this list | ||
| } clist; | ||
|
|
||
| void clist_create(clist *l); | ||
| static inline void clist_first(clist *l) { l->cur = l->head; } | ||
| void clist_last(clist *l); | ||
| cnode *clist_next(clist *l); | ||
| static inline cnode *clist_get_cur(clist *l) { return l->cur; } | ||
| void clist_append(clist *l, cnode *node); | ||
| void clist_clear(clist* l); | ||
|
|
||
| /* append a contid if its not already on the list */ | ||
| int clist_add_if_uniq(clist *l, const unsigned long long id); | ||
| void clist_sort_by_hits(clist *l); | ||
|
|
||
| #endif | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.