chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
6fc5188
)
sd-rtnl: message - don't put NULL message on rqueue
author
Tom Gundersen
<teg@jklm.no>
Wed, 16 Apr 2014 16:17:24 +0000
(18:17 +0200)
committer
Tom Gundersen
<teg@jklm.no>
Sat, 19 Apr 2014 14:47:52 +0000
(16:47 +0200)
If nothing interesting was receieved we should not put anything on
the queue.
src/libsystemd/sd-rtnl/rtnl-message.c
patch
|
blob
|
history
diff --git
a/src/libsystemd/sd-rtnl/rtnl-message.c
b/src/libsystemd/sd-rtnl/rtnl-message.c
index 47dcd4a7828bde54e55b72e85082b52c8466744d..ffc19f1bb66ec533856a88e86a54936de9fba3d2 100644
(file)
--- a/
src/libsystemd/sd-rtnl/rtnl-message.c
+++ b/
src/libsystemd/sd-rtnl/rtnl-message.c
@@
-1194,12
+1194,17
@@
int socket_read_message(sd_rtnl *rtnl) {
break;
}
- r = rtnl_rqueue_make_room(rtnl);
- if (r < 0)
- return r;
+ if (first) {
+ r = rtnl_rqueue_make_room(rtnl);
+ if (r < 0)
+ return r;
+
+ rtnl->rqueue[rtnl->rqueue_size ++] = first;
+ first = NULL;
+ }
- rtnl->rqueue[rtnl->rqueue_size ++] = first;
-
first = NULL
;
+ if (len)
+
log_debug("sd-rtnl: discarding %zu bytes of incoming message", len)
;
return ret;
}