diff options
| author | Sander Vrijders <sander.vrijders@intec.ugent.be> | 2016-10-07 16:20:45 +0200 |
|---|---|---|
| committer | Sander Vrijders <sander.vrijders@intec.ugent.be> | 2016-10-07 16:20:45 +0200 |
| commit | dbf3ab8dfb2cbe8167c464e3cf6a9aa757bfff6a (patch) | |
| tree | d3d0b18c009757cc5ac7081882152c5f9d9e005b /src/ipcpd | |
| parent | 55d5b9157b78d90d4f6a575d253c58fd50ca531f (diff) | |
| parent | 192ccde3ae37e33eb33421a6877ed4b4a025fbdb (diff) | |
| download | ouroboros-dbf3ab8dfb2cbe8167c464e3cf6a9aa757bfff6a.tar.gz ouroboros-dbf3ab8dfb2cbe8167c464e3cf6a9aa757bfff6a.zip | |
Merged in dstaesse/ouroboros/be-ipcp-read-fd (pull request #258)
lib: Add non-copy reading from fd for IPCPs
Diffstat (limited to 'src/ipcpd')
| -rw-r--r-- | src/ipcpd/shim-eth-llc/main.c | 2 | ||||
| -rw-r--r-- | src/ipcpd/shim-udp/main.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/ipcpd/shim-eth-llc/main.c b/src/ipcpd/shim-eth-llc/main.c index c5e6d74d..130f3945 100644 --- a/src/ipcpd/shim-eth-llc/main.c +++ b/src/ipcpd/shim-eth-llc/main.c @@ -597,7 +597,7 @@ static void * eth_llc_ipcp_sdu_writer(void * o) uint8_t dsap; uint8_t r_addr[MAC_SIZE]; - fd = ipcp_flow_read(&sdb); + fd = ipcp_read_shim(&sdb); if (fd < 0) continue; diff --git a/src/ipcpd/shim-udp/main.c b/src/ipcpd/shim-udp/main.c index 8c31e11a..12f6d82e 100644 --- a/src/ipcpd/shim-udp/main.c +++ b/src/ipcpd/shim-udp/main.c @@ -510,7 +510,7 @@ static void * ipcp_udp_sdu_loop(void * o) int fd; struct shm_du_buff * sdb; - fd = ipcp_flow_read(&sdb); + fd = ipcp_read_shim(&sdb); if (fd < 0) continue; |