diff options
| author | dimitri staessens <dimitri.staessens@intec.ugent.be> | 2016-05-10 19:13:02 +0200 | 
|---|---|---|
| committer | dimitri staessens <dimitri.staessens@intec.ugent.be> | 2016-05-10 19:13:02 +0200 | 
| commit | e32a1b1c1add67ebe82ef6a3e45ae8b51f9f2e97 (patch) | |
| tree | 857de7ccf8303aba1bc36db56cbf0e7120479913 /src/lib | |
| parent | b4397485d19dc8bd4c109641e0495f8c5a5f4d16 (diff) | |
| parent | ba8b2ba46a5b499004272c9acc9049539b600082 (diff) | |
| download | ouroboros-e32a1b1c1add67ebe82ef6a3e45ae8b51f9f2e97.tar.gz ouroboros-e32a1b1c1add67ebe82ef6a3e45ae8b51f9f2e97.zip | |
Merged in sandervrijders/ouroboros/be (pull request #72)
ipcpd: Allow disabling of DNS
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/dev.c | 14 | 
1 files changed, 2 insertions, 12 deletions
| diff --git a/src/lib/dev.c b/src/lib/dev.c index c1cfe043..24e688ef 100644 --- a/src/lib/dev.c +++ b/src/lib/dev.c @@ -22,6 +22,7 @@  #define OUROBOROS_PREFIX "libouroboros-dev" +#include <ouroboros/config.h>  #include <ouroboros/logs.h>  #include <ouroboros/dev.h>  #include <ouroboros/sockets.h> @@ -34,16 +35,6 @@  #include <stdlib.h>  #include <string.h> -#define AP_MAX_FLOWS 256 - -#ifndef DU_BUFF_HEADSPACE -  #define DU_BUFF_HEADSPACE 128 -#endif - -#ifndef DU_BUFF_TAILSPACE -  #define DU_BUFF_TAILSPACE 0 -#endif -  struct flow {          struct shm_ap_rbuff * rb;          int                   port_id; @@ -161,7 +152,7 @@ int ap_reg(char ** difs,          }          if (_ap_instance == NULL) { -                LOG_DBG("ap_init was not called"); +                LOG_DBG("ap_init was not called.");                  return -1;          } @@ -416,7 +407,6 @@ int flow_cntl(int fd, int cmd, int oflags)  ssize_t flow_write(int fd, void * buf, size_t count)  { -        /* the AP chooses the amount of headspace and tailspace */          size_t index = shm_create_du_buff(_ap_instance->dum,                                            count + DU_BUFF_HEADSPACE +                                            DU_BUFF_TAILSPACE, | 
