aiden
/
suricata
mirror of https://github.com/OISF/suricata
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add Host specific wrapper to StorageRegister()

Browse Source
pull/466/head
Victor Julien 13 years ago
parent b5ccf0b9c7
commit 0d2a6e515e
5 changed files with 254 additions and 8 deletions
Show Stats Download Patch File Download Diff File

225
src/host-storage.c
Unescape Escape View File

@ -32,29 +32,246 @@ unsigned int HostStorageSize(void) {
}
void *HostGetStorageById(Host *h, int id) {
return StorageGetById((Storage *)(h + HostStorageSize()), STORAGE_HOST, id);
return StorageGetById((Storage *)((void *)h + sizeof(Host)), STORAGE_HOST, id);
}
int HostSetStorageById(Host *h, int id, void *ptr) {
return StorageSetById((Storage *)((void *)h + sizeof(Host)), STORAGE_HOST, id, ptr);
}
void *HostAllocStorageById(Host *h, int id) {
return StorageAllocById((Storage **)&h + HostStorageSize(), STORAGE_HOST, id);
return StorageAllocByIdPrealloc((Storage *)((void *)h + sizeof(Host)), STORAGE_HOST, id);
}
void HostFreeStorageById(Host *h, int id) {
StorageFreeById((Storage *)(h + HostStorageSize()), STORAGE_HOST, id);
StorageFreeById((Storage *)((void *)h + sizeof(Host)), STORAGE_HOST, id);
}
void HostFreeStorage(Host *h) {
StorageFreeAll((Storage *)(h + HostStorageSize()), STORAGE_HOST);
StorageFreeAll((Storage *)((void *)h + sizeof(Host)), STORAGE_HOST);
}
int HostStorageRegister(const char *name, const unsigned int size, void *(*Init)(unsigned int), void (*Free)(void *)) {
return StorageRegister(STORAGE_HOST, name, size, Init, Free);
}
#ifdef UNITTESTS
static void *StorageTestInit(unsigned int size) {
void *x = SCMalloc(size);
return x;
}
static void StorageTestFree(void *x) {
if (x)
SCFree(x);
}
static int HostStorageTest01(void) {
StorageInit();
int id1 = HostStorageRegister("test", 8, StorageTestInit, StorageTestFree);
if (id1 < 0)
goto error;
int id2 = HostStorageRegister("variable", 24, StorageTestInit, StorageTestFree);
if (id2 < 0)
goto error;
int id3 = HostStorageRegister("store", sizeof(void *), StorageTestInit, StorageTestFree);
if (id3 < 0)
goto error;
if (StorageFinalize() < 0)
goto error;
HostInitConfig(1);
Address a;
memset(&a, 0x00, sizeof(a));
a.addr_data32[0] = 0x01020304;
a.family = AF_INET;
Host *h = HostGetHostFromHash(&a);
if (h == NULL) {
printf("failed to get host: ");
goto error;
}
void *ptr = HostGetStorageById(h, id1);
if (ptr != NULL) {
goto error;
}
ptr = HostGetStorageById(h, id2);
if (ptr != NULL) {
goto error;
}
ptr = HostGetStorageById(h, id3);
if (ptr != NULL) {
goto error;
}
void *ptr1a = HostAllocStorageById(h, id1);
if (ptr1a == NULL) {
goto error;
}
void *ptr2a = HostAllocStorageById(h, id2);
if (ptr2a == NULL) {
goto error;
}
void *ptr3a = HostAllocStorageById(h, id3);
if (ptr3a == NULL) {
goto error;
}
void *ptr1b = HostGetStorageById(h, id1);
if (ptr1a != ptr1b) {
goto error;
}
void *ptr2b = HostGetStorageById(h, id2);
if (ptr2a != ptr2b) {
goto error;
}
void *ptr3b = HostGetStorageById(h, id3);
if (ptr3a != ptr3b) {
goto error;
}
HostRelease(h);
HostShutdown();
StorageCleanup();
return 1;
error:
HostShutdown();
StorageCleanup();
return 0;
}
static int HostStorageTest02(void) {
StorageInit();
int id1 = HostStorageRegister("test", sizeof(void *), NULL, StorageTestFree);
if (id1 < 0)
goto error;
if (StorageFinalize() < 0)
goto error;
HostInitConfig(1);
Address a;
memset(&a, 0x00, sizeof(a));
a.addr_data32[0] = 0x01020304;
a.family = AF_INET;
Host *h = HostGetHostFromHash(&a);
if (h == NULL) {
printf("failed to get host: ");
goto error;
}
void *ptr = HostGetStorageById(h, id1);
if (ptr != NULL) {
goto error;
}
void *ptr1a = SCMalloc(128);
if (ptr1a == NULL) {
goto error;
}
HostSetStorageById(h, id1, ptr1a);
void *ptr1b = HostGetStorageById(h, id1);
if (ptr1a != ptr1b) {
goto error;
}
HostRelease(h);
HostShutdown();
StorageCleanup();
return 1;
error:
HostShutdown();
StorageCleanup();
return 0;
}
static int HostStorageTest03(void) {
StorageInit();
int id1 = HostStorageRegister("test1", sizeof(void *), NULL, StorageTestFree);
if (id1 < 0)
goto error;
int id2 = HostStorageRegister("test2", sizeof(void *), NULL, StorageTestFree);
if (id2 < 0)
goto error;
int id3 = HostStorageRegister("test3", 32, StorageTestInit, StorageTestFree);
if (id3 < 0)
goto error;
if (StorageFinalize() < 0)
goto error;
HostInitConfig(1);
Address a;
memset(&a, 0x00, sizeof(a));
a.addr_data32[0] = 0x01020304;
a.family = AF_INET;
Host *h = HostGetHostFromHash(&a);
if (h == NULL) {
printf("failed to get host: ");
goto error;
}
void *ptr = HostGetStorageById(h, id1);
if (ptr != NULL) {
goto error;
}
void *ptr1a = SCMalloc(128);
if (ptr1a == NULL) {
goto error;
}
HostSetStorageById(h, id1, ptr1a);
void *ptr2a = SCMalloc(256);
if (ptr2a == NULL) {
goto error;
}
HostSetStorageById(h, id2, ptr2a);
void *ptr3a = HostAllocStorageById(h, id3);
if (ptr3a == NULL) {
goto error;
}
void *ptr1b = HostGetStorageById(h, id1);
if (ptr1a != ptr1b) {
goto error;
}
void *ptr2b = HostGetStorageById(h, id2);
if (ptr2a != ptr2b) {
goto error;
}
void *ptr3b = HostGetStorageById(h, id3);
if (ptr3a != ptr3b) {
goto error;
}
HostRelease(h);
HostShutdown();
StorageCleanup();
return 1;
error:
HostShutdown();
StorageCleanup();
return 0;
}
#endif
void RegisterHostStorageTests(void) {
#ifdef UNITTESTS
UtRegisterTest("HostStorageTest01", HostStorageTest01, 1);
UtRegisterTest("HostStorageTest02", HostStorageTest02, 1);
UtRegisterTest("HostStorageTest03", HostStorageTest03, 1);
#endif
}

3
src/host-storage.h
Unescape Escape View File

@ -32,6 +32,7 @@
unsigned int HostStorageSize(void);
void *HostGetStorageById(Host *h, int id);
int HostSetStorageById(Host *h, int id, void *ptr);
void *HostAllocStorageById(Host *h, int id);
void HostFreeStorageById(Host *h, int id);
@ -39,4 +40,6 @@ void HostFreeStorage(Host *h);
void RegisterHostStorageTests(void);
int HostStorageRegister(const char *name, const unsigned int size, void *(*Init)(unsigned int), void (*Free)(void *));
#endif /* __HOST_STORAGE_H__ */

2
src/suricata.c
Unescape Escape View File

@ -194,6 +194,7 @@
#include "util-mpm-ac.h"
#endif
#include "util-storage.h"
#include "host-storage.h"
/*
* we put this here, because we only use it here in main.
@ -1748,6 +1749,7 @@ int main(int argc, char **argv)
CudaBufferRegisterUnittests();
#endif
StorageRegisterTests();
RegisterHostStorageTests();
if (list_unittests) {
UtListTests(regex_arg);

30
src/util-storage.c
Unescape Escape View File

@ -94,7 +94,7 @@ int StorageRegister(const StorageEnum type, const char *name, const unsigned int
return -1;
if (type >= STORAGE_MAX || name == NULL || strlen(name) == 0 ||
size == 0 || Init == NULL || Free == NULL)
size == 0 || (size != sizeof(void *) && Init == NULL) || Free == NULL)
return -1;
StorageList *list = storage_list;
@ -206,6 +206,28 @@ void *StorageGetById(const Storage *storage, const StorageEnum type, const int i
return storage[id];
}
int StorageSetById(Storage *storage, const StorageEnum type, const int id, void *ptr) {
SCLogDebug("storage %p id %d", storage, id);
if (storage == NULL)
return -1;
storage[id] = ptr;
return 0;
}
void *StorageAllocByIdPrealloc(Storage *storage, StorageEnum type, int id) {
SCLogDebug("storage %p id %d", storage, id);
StorageMapping *map = &storage_map[type][id];
if (storage[id] == NULL && map->Init != NULL) {
storage[id] = map->Init(map->size);
if (storage[id] == NULL) {
return NULL;
}
}
return storage[id];
}
void *StorageAllocById(Storage **storage, StorageEnum type, int id) {
SCLogDebug("storage %p id %d", storage, id);
@ -219,7 +241,7 @@ void *StorageAllocById(Storage **storage, StorageEnum type, int id) {
}
SCLogDebug("store %p", store);
if (store[id] == NULL) {
if (store[id] == NULL && map->Init != NULL) {
store[id] = map->Init(map->size);
if (store[id] == NULL) {
SCFree(store);
@ -284,7 +306,7 @@ static void *StorageTestInit(unsigned int size) {
void *x = SCMalloc(size);
return x;
}
void StorageTestFree(void *x) {
static void StorageTestFree(void *x) {
if (x)
SCFree(x);
}
@ -403,7 +425,7 @@ static int StorageTest03(void) {
goto error;
}
id = StorageRegister(STORAGE_HOST, "test1", 8, NULL, StorageTestFree);
id = StorageRegister(STORAGE_HOST, "test1", 6, NULL, StorageTestFree);
if (id != -1) {
printf("duplicate registration should have failed (2): ");
goto error;

2
src/util-storage.h
Unescape Escape View File

@ -45,6 +45,8 @@ unsigned int StorageGetCnt(const StorageEnum type);
unsigned int StorageGetSize(const StorageEnum type);
void *StorageGetById(const Storage *storage, const StorageEnum type, const int id);
int StorageSetById(Storage *storage, const StorageEnum type, const int id, void *ptr);
void *StorageAllocByIdPrealloc(Storage *storage, StorageEnum type, int id);
void *StorageAllocById(Storage **storage, const StorageEnum type, const int id);
void StorageFreeById(Storage *storage, const StorageEnum type, const int id);
void StorageFreeAll(Storage *storage, const StorageEnum type);

Write Preview
Loading…
Cancel
Save