chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sysusers: fix uninitialized warning
[elogind.git]
/
src
/
libsystemd
/
sd-rtnl
/
rtnl-internal.h
diff --git
a/src/libsystemd/sd-rtnl/rtnl-internal.h
b/src/libsystemd/sd-rtnl/rtnl-internal.h
index 0c17d94c59cdd0df4657214511350eb33ee5d511..a192198419e76525695ec9535b1b6f2fcd74c832 100644
(file)
--- a/
src/libsystemd/sd-rtnl/rtnl-internal.h
+++ b/
src/libsystemd/sd-rtnl/rtnl-internal.h
@@
-29,7
+29,9
@@
#include "sd-rtnl.h"
#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
#define RTNL_WQUEUE_MAX 1024
#define RTNL_RQUEUE_MAX 64*1024
@@
-64,9
+66,18
@@
struct sd_rtnl {
sd_rtnl_message **rqueue;
unsigned rqueue_size;
sd_rtnl_message **rqueue;
unsigned rqueue_size;
+ size_t rqueue_allocated;
+
+ sd_rtnl_message **rqueue_partial;
+ unsigned rqueue_partial_size;
+ size_t rqueue_partial_allocated;
sd_rtnl_message **wqueue;
unsigned wqueue_size;
sd_rtnl_message **wqueue;
unsigned wqueue_size;
+ size_t wqueue_allocated;
+
+ struct nlmsghdr *rbuffer;
+ size_t rbuffer_allocated;
bool processing:1;
bool processing:1;
@@
-91,18
+102,24
@@
struct sd_rtnl_message {
sd_rtnl *rtnl;
struct nlmsghdr *hdr;
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 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;
- unsigned short rta_tb_size;
+ size_t *rta_offset_tb
[RTNL_CONTAINER_DEPTH]
;
+ unsigned short rta_tb_size
[RTNL_CONTAINER_DEPTH]
;
bool sealed:1;
bool sealed:1;
+
+ sd_rtnl_message *next; /* next in a chain of multi-part messages */
};
};
-int message_new(sd_rtnl *rtnl, sd_rtnl_message **ret,
size_t initial_siz
e);
+int message_new(sd_rtnl *rtnl, sd_rtnl_message **ret,
uint16_t typ
e);
int socket_write_message(sd_rtnl *nl, sd_rtnl_message *m);
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_rqueue_partial_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,
int rtnl_message_read_internal(sd_rtnl_message *m, unsigned short type, void **data);
int rtnl_message_parse(sd_rtnl_message *m,