chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bus: fix callback index when dispatching kernel messages
[elogind.git]
/
src
/
libsystemd-rtnl
/
rtnl-internal.h
diff --git
a/src/libsystemd-rtnl/rtnl-internal.h
b/src/libsystemd-rtnl/rtnl-internal.h
index b34e7ea126f63345074462456f3f04e11090dba7..a229ae77ad1ae9b85163049f9daaf1894bd3d4aa 100644
(file)
--- a/
src/libsystemd-rtnl/rtnl-internal.h
+++ b/
src/libsystemd-rtnl/rtnl-internal.h
@@
-21,7
+21,20
@@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
+#include <linux/netlink.h>
+
#include "refcnt.h"
#include "refcnt.h"
+#include "prioq.h"
+
+#include "sd-rtnl.h"
+
+struct reply_callback {
+ sd_rtnl_message_handler_t callback;
+ void *userdata;
+ usec_t timeout;
+ uint64_t serial;
+ unsigned prioq_idx;
+};
struct sd_rtnl {
RefCount n_ref;
struct sd_rtnl {
RefCount n_ref;
@@
-33,15
+46,38
@@
struct sd_rtnl {
struct sockaddr_nl nl;
} sockaddr;
struct sockaddr_nl nl;
} sockaddr;
+ sd_rtnl_message **rqueue;
+ unsigned rqueue_size;
+
+ sd_rtnl_message **wqueue;
+ unsigned wqueue_size;
+
+ bool processing:1;
+
uint32_t serial;
uint32_t serial;
+ struct Prioq *reply_callbacks_prioq;
+ Hashmap *reply_callbacks;
+
pid_t original_pid;
pid_t original_pid;
+
+ sd_event_source *io_event_source;
+ sd_event_source *time_event_source;
+ sd_event_source *quit_event_source;
+ sd_event *event;
};
#define RTNL_DEFAULT_TIMEOUT ((usec_t) (10 * USEC_PER_SEC))
};
#define RTNL_DEFAULT_TIMEOUT ((usec_t) (10 * USEC_PER_SEC))
-int message_get_errno(sd_rtnl_message *m);
-int message_get_serial(sd_rtnl_message *m);
+#define RTNL_WQUEUE_MAX 1024
+#define RTNL_RQUEUE_MAX 64*1024
+
+int message_new_synthetic_error(int error, uint32_t serial, sd_rtnl_message **ret);
+uint32_t message_get_serial(sd_rtnl_message *m);
int message_seal(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 message_seal(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);
+
+/* Make sure callbacks don't destroy the rtnl connection */
+#define RTNL_DONT_DESTROY(rtnl) \
+ _cleanup_sd_rtnl_unref_ _unused_ sd_rtnl *_dont_destroy_##rtnl = sd_rtnl_ref(rtnl)