diff options
| author | Sander Vrijders <sander.vrijders@ugent.be> | 2018-10-11 14:10:03 +0200 |
|---|---|---|
| committer | Sander Vrijders <sander.vrijders@ugent.be> | 2018-10-11 14:10:03 +0200 |
| commit | 6856f3e24fa00b99747bab790b478866212b2e2d (patch) | |
| tree | ca2a4f818bb1844408f015aa2ebe32cdb8a9e3a1 /src/lib | |
| parent | 91299fe1de31465b0b389ba6fee76db23db830fb (diff) | |
| parent | 9b8d2830250ecffb298f6c72196cffb94991f4d1 (diff) | |
| download | ouroboros-6856f3e24fa00b99747bab790b478866212b2e2d.tar.gz ouroboros-6856f3e24fa00b99747bab790b478866212b2e2d.zip | |
Merge branch 'testing' into be
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/lib/dev.c | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt index a6dc00c6..42164fac 100644 --- a/src/lib/CMakeLists.txt +++ b/src/lib/CMakeLists.txt @@ -176,7 +176,7 @@ set(SHM_RDRB_MULTI_BLOCK true CACHE BOOL "Packet buffer multiblock packet support") set(SHM_RBUFF_LOCKLESS 0 CACHE BOOL "Enable shared memory lockless rbuff support") -set(QOS_DISABLE_CRC 0 CACHE BOOL +set(QOS_DISABLE_CRC TRUE CACHE BOOL "Ignores ber setting on all QoS cubes") set(SOURCE_FILES_DEV diff --git a/src/lib/dev.c b/src/lib/dev.c index 2a5c3f83..6dbb925e 100644 --- a/src/lib/dev.c +++ b/src/lib/dev.c @@ -345,7 +345,10 @@ static void init(int argc, prog = argv[1]; ai.pid = getpid(); - +#ifdef HAVE_LIBGCRYPT + if (!gcry_check_version(GCRYPT_VERSION)) + goto fail_fds; +#endif ai.fds = bmp_create(PROG_MAX_FLOWS - PROG_RES_FDS, PROG_RES_FDS); if (ai.fds == NULL) goto fail_fds; |