sharpetronics/strongswan
1
0
Fork 0
mirror of https://github.com/strongswan/strongswan.git synced 2025-10-08 00:02:03 -04:00
Code Issues Projects Releases Wiki Activity

tun-device: Read from tun to buffer on stack to avoid over-allocation of packets

Browse Source 
Instead of allocating MTU-sized buffers for each packet, read to a stack buffer
and copy to an allocation of the actual packet size. While it requires an
additional copy on non-Apple platforms, this should make allocation more
efficient for small packets.
This commit is contained in:
Martin Willi 2014-11-21 11:23:08 +01:00
parent eaca7f2143
commit 946cf367d4
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/libstrongswan/networking/tun_device.c
View File

@ -346,29 +346,27 @@ METHOD(tun_device_t, write_packet, bool,
METHOD(tun_device_t, read_packet, bool, METHOD(tun_device_t, read_packet, bool,
private_tun_device_t *this, chunk_t *packet) private_tun_device_t *this, chunk_t *packet)
{ {
chunk_t data;
ssize_t len; ssize_t len;
bool old; bool old;
*packet = chunk_alloc(get_mtu(this)); data = chunk_alloca(get_mtu(this));
thread_cleanup_push(free, packet->ptr);
old = thread_cancelability(TRUE); old = thread_cancelability(TRUE);
len = read(this->tunfd, packet->ptr, packet->len); len = read(this->tunfd, data.ptr, data.len);
thread_cancelability(old); thread_cancelability(old);
thread_cleanup_pop(FALSE);
if (len < 0) if (len < 0)
{ {
DBG1(DBG_LIB, "reading from TUN device %s failed: %s", this->if_name, DBG1(DBG_LIB, "reading from TUN device %s failed: %s", this->if_name,
strerror(errno)); strerror(errno));
free(packet->ptr);
return FALSE; return FALSE;
} }
packet->len = len; data.len = len;
#ifdef __APPLE__ #ifdef __APPLE__
/* UTUN's prepend packets with a 32-bit protocol number */ /* UTUN's prepend packets with a 32-bit protocol number */
packet->len -= sizeof(u_int32_t); data = chunk_skip(data, sizeof(u_int32_t));
memmove(packet->ptr, packet->ptr + sizeof(u_int32_t), packet->len);
#endif #endif
*packet = chunk_clone(data);
return TRUE; return TRUE;
} }