X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flibsystemd%2Fsd-rtnl%2Frtnl-internal.h;h=2f788d04f6cd08c2402ba0a9d0aa1d5073d45d41;hb=1403f45ab61d6f2026a3a7a06b52a536c1b7a3b3;hp=28c7b963fb7f14d9644034ebc95db98cf6eb90d2;hpb=cf6a8911738fe2635a5210769d5348b05b166691;p=elogind.git diff --git a/src/libsystemd/sd-rtnl/rtnl-internal.h b/src/libsystemd/sd-rtnl/rtnl-internal.h index 28c7b963f..2f788d04f 100644 --- a/src/libsystemd/sd-rtnl/rtnl-internal.h +++ b/src/libsystemd/sd-rtnl/rtnl-internal.h @@ -29,7 +29,9 @@ #include "sd-rtnl.h" -#define RTNL_DEFAULT_TIMEOUT ((usec_t) (10 * USEC_PER_SEC)) +#include "rtnl-types.h" + +#define RTNL_DEFAULT_TIMEOUT ((usec_t) (25 * USEC_PER_SEC)) #define RTNL_WQUEUE_MAX 1024 #define RTNL_RQUEUE_MAX 64*1024 @@ -64,9 +66,11 @@ struct sd_rtnl { sd_rtnl_message **rqueue; unsigned rqueue_size; + size_t rqueue_allocated; sd_rtnl_message **wqueue; unsigned wqueue_size; + size_t wqueue_allocated; bool processing:1; @@ -88,18 +92,34 @@ struct sd_rtnl { struct sd_rtnl_message { RefCount n_ref; + sd_rtnl *rtnl; + struct nlmsghdr *hdr; + const struct NLTypeSystem *(container_type_system[RTNL_CONTAINER_DEPTH]); /* the type of the container and all its parents */ size_t container_offsets[RTNL_CONTAINER_DEPTH]; /* offset from hdr to each container's start */ unsigned n_containers; /* number of containers */ size_t next_rta_offset; /* offset from hdr to next rta */ - + size_t *rta_offset_tb[RTNL_CONTAINER_DEPTH]; + unsigned short rta_tb_size[RTNL_CONTAINER_DEPTH]; bool sealed:1; + + sd_rtnl_message *next; /* next in a chain of multi-part messages */ }; -int message_new(sd_rtnl_message **ret, size_t initial_size); +int message_new(sd_rtnl *rtnl, sd_rtnl_message **ret, uint16_t type); int socket_write_message(sd_rtnl *nl, sd_rtnl_message *m); -int socket_read_message(sd_rtnl *nl, sd_rtnl_message **ret); +int socket_read_message(sd_rtnl *nl); + +int rtnl_rqueue_make_room(sd_rtnl *rtnl); + +int rtnl_message_read_internal(sd_rtnl_message *m, unsigned short type, void **data); +int rtnl_message_parse(sd_rtnl_message *m, + size_t **rta_offset_tb, + unsigned short *rta_tb_size, + int max, + struct rtattr *rta, + unsigned int rt_len); /* Make sure callbacks don't destroy the rtnl connection */ #define RTNL_DONT_DESTROY(rtnl) \