/* * netsniff-ng - the packet sniffing beast * Copyright 2009, 2010, 2011, 2012 Daniel Borkmann. * Subject to the GPL, version 2. */ #define _GNU_SOURCE #include #include #include #include #include #include #include #include #include "xmalloc.h" #include "built_in.h" #include "die.h" #include "str.h" void *xmalloc(size_t size) { void *ptr; if (unlikely(size == 0)) panic("xmalloc: zero size\n"); ptr = malloc(size); if (unlikely(ptr == NULL)) panic("xmalloc: out of memory (allocating %zu bytes)\n", size); return ptr; } void *xzmalloc(size_t size) { void *ptr = xmalloc(size); memset(ptr, 0, size); return ptr; } void *xmalloc_aligned(size_t size, size_t alignment) { int ret; void *ptr; if (unlikely(size == 0)) panic("xmalloc_aligned: zero size\n"); ret = posix_memalign(&ptr, alignment, size); if (unlikely(ret != 0)) panic("xmalloc_aligned: out of memory (allocating %zu " "bytes)\n", size); return ptr; } void *xzmalloc_aligned(size_t size, size_t alignment) { void *ptr = xmalloc_aligned(size, alignment); memset(ptr, 0, size); return ptr; } void *xmallocz(size_t size) { void *ptr; if (unlikely(size + 1 < size)) panic("xmallocz: data too large to fit into virtual " "memory space\n"); ptr = xmalloc(size + 1); ((char*) ptr)[size] = 0; return ptr; } void *xmemdupz(const void *data, size_t len) { return memcpy(xmallocz(len), data, len); } void *xrealloc(void *ptr, size_t nmemb, size_t size) { void *new_ptr; size_t new_size = nmemb * size; if (unlikely(new_size == 0)) panic("xrealloc: zero size\n"); if (unlikely(((size_t) ~0) / nmemb < size)) panic("xrealloc: nmemb * size > SIZE_T_MAX\n"); if (ptr == NULL) new_ptr = malloc(new_size); else new_ptr = realloc(ptr, new_size); if (unlikely(new_ptr == NULL)) panic("xrealloc: out of memory (new_size %zu bytes)\n", new_size); return new_ptr; } void xfree_func(void *ptr) { if (unlikely(ptr == NULL)) panic("xfree: NULL pointer given as argument\n"); free(ptr); } char *xstrdup(const char *str) { size_t len; char *cp; len = strlen(str) + 1; cp = xmalloc(len); strlcpy(cp, str, len); return cp; } char *xstrndup(const char *str, size_t size) { size_t len; char *cp; len = strlen(str) + 1; if (size < len) len = size; cp = xmalloc(len); strlcpy(cp, str, len); return cp; } og msg
diff options
context:
space:
mode:
authorJulian Anastasov <ja@ssi.bg>2017-02-06 23:14:12 +0200
committerDavid S. Miller <davem@davemloft.net>2017-02-07 13:07:46 -0500
commit4ff0620354f2b39b9fe2a91c22c4de9d1fba0c8e (patch)
tree1d29569c1059553f11c2da53df68f3698df92906
parent9b8805a325591cf5b6b9df71200de25a2bd721fd (diff)
net: add dst_pending_confirm flag to skbuff
Add new skbuff flag to allow protocols to confirm neighbour. When same struct dst_entry can be used for many different neighbours we can not use it for pending confirmations. Add sock_confirm_neigh() helper to confirm the neighbour and use it for IPv4, IPv6 and VRF before dst_neigh_output. Signed-off-by: Julian Anastasov <ja@ssi.bg> Acked-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat
-rw-r--r--drivers/net/vrf.c5
-rw-r--r--include/linux/skbuff.h12
-rw-r--r--include/net/sock.h14
-rw-r--r--net/ipv4/ip_output.c5
-rw-r--r--net/ipv6/ip6_output.c1
5 files changed, 35 insertions, 2 deletions
diff --git a/drivers/net/vrf.c b/drivers/net/vrf.c