<html><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; "> On Jan 26, 2012, at 5:32 PM, Laine Stump wrote: <blockquote type="cite">On 01/20/2012 09:56 AM, D. Herrendoerfer wrote: </blockquote><blockquote type="cite"><blockquote type="cite">From: "D. Herrendoerfer"<<a href="mailto:d.herrendoerfer@herrendoerfer.name">d.herrendoerfer@herrendoerfer.name</a>> </blockquote></blockquote><blockquote type="cite"><blockquote type="cite"> </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">This code adds an event service for netlink messages addressed </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">to libvirt and passes the message to registered callback handlers. </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">Itself, it makes use of the polling file event service and follows </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">a similar design. </blockquote></blockquote><blockquote type="cite"><blockquote type="cite"> </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">Signed-off-by: D. Herrendoerfer<<a href="mailto:d.herrendoerfer@herrendoerfer.name">d.herrendoerfer@herrendoerfer.name</a>> </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">--- </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">daemon/Makefile.am | 3 +- </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">daemon/libvirtd.c | 7 + </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">src/Makefile.am | 1 + </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">src/libvirt_private.syms | 7 + </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">src/util/netlink-event.c | 363 ++++++++++++++++++++++++++++++++++++++++++++++ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">src/util/netlink-event.h | 63 ++++++++ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">src/util/netlink.c | 1 + </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">7 files changed, 444 insertions(+), 1 deletions(-) </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">create mode 100644 src/util/netlink-event.c </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">create mode 100644 src/util/netlink-event.h </blockquote></blockquote><blockquote type="cite"><blockquote type="cite"> </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">diff --git a/daemon/Makefile.am b/daemon/Makefile.am </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">index 73a6e1f..d027ff6 100644 </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">--- a/daemon/Makefile.am </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+++ b/daemon/Makefile.am </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">@@ -114,7 +114,8 @@ libvirtd_LDADD += ../src/probes.o </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">endif </blockquote></blockquote><blockquote type="cite"><blockquote type="cite"> </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">libvirtd_LDADD += \ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">- ../src/libvirt-qemu.la </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ ../src/libvirt-qemu.la \ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ ../src/libvirt_util.la </blockquote></blockquote><blockquote type="cite"><blockquote type="cite"> </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">if ! WITH_DRIVER_MODULES </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">if WITH_QEMU </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">index d7a03d7..b118fd0 100644 </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">--- a/daemon/libvirtd.c </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+++ b/daemon/libvirtd.c </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">@@ -55,6 +55,8 @@ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">#include "uuid.h" </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">#include "viraudit.h" </blockquote></blockquote><blockquote type="cite"><blockquote type="cite"> </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+#include "netlink-event.h" </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">#ifdef WITH_DRIVER_MODULES </blockquote></blockquote><blockquote type="cite"><blockquote type="cite"># include "driver.h" </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">#else </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">@@ -1577,6 +1579,11 @@ int main(int argc, char **argv) { </blockquote></blockquote><blockquote type="cite"><blockquote type="cite"> goto cleanup; </blockquote></blockquote><blockquote type="cite"><blockquote type="cite"> } </blockquote></blockquote><blockquote type="cite"><blockquote type="cite"> </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ /* Register the netlink event service */ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ if (netlinkEventServiceStart()< 0) { </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ VIR_WARN("Netlink service did not start. Netlink events are not available."); </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ } </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite"> /* Run event loop. */ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite"> virNetServerRun(srv); </blockquote></blockquote><blockquote type="cite"> </blockquote><blockquote type="cite">You started your service, but never stop it when libvirtd is shutting down (even though you have a function to do that). </blockquote><blockquote type="cite"> </blockquote><blockquote type="cite"><blockquote type="cite"> </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">diff --git a/src/Makefile.am b/src/Makefile.am </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">index 93bf54c..abaeb9c 100644 </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">--- a/src/Makefile.am </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+++ b/src/Makefile.am </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">@@ -67,6 +67,7 @@ UTIL_SOURCES = \ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite"> util/dnsmasq.c util/dnsmasq.h \ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite"> util/json.c util/json.h \ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite"> util/logging.c util/logging.h \ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ util/netlink-event.c util/netlink-event.h \ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite"> util/memory.c util/memory.h \ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite"> util/netlink.c util/netlink.h \ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite"> util/pci.c util/pci.h \ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">index 48ffdf2..34a36bd 100644 </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">--- a/src/libvirt_private.syms </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+++ b/src/libvirt_private.syms </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">@@ -743,6 +743,13 @@ virShrinkN; </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">nlComm; </blockquote></blockquote><blockquote type="cite"><blockquote type="cite"> </blockquote></blockquote><blockquote type="cite"><blockquote type="cite"> </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+#netlink-event.h </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+netlinkEventServiceStop; </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+netlinkEventServiceStart; </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+netlinkEventAddClient; </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+netlinkEventRemoveClient; </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite"># netdev_bandwidth_conf.h </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">virNetDevBandwidthFormat; </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">virNetDevBandwidthParse; </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">diff --git a/src/util/netlink-event.c b/src/util/netlink-event.c </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">new file mode 100644 </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">index 0000000..7c6746d </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">--- /dev/null </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+++ b/src/util/netlink-event.c </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">@@ -0,0 +1,363 @@ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+/* </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ * lldpad-event.c: event loop for monitoring netlink messages </blockquote></blockquote><blockquote type="cite"> </blockquote><blockquote type="cite">name change ^^ </blockquote> All agreed. <blockquote type="cite"><blockquote type="cite">+ * </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ * Copyright (C) 2011,2012 IBM Corporation. </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ * Copyright (C) 2011,2012 Dirk Herrendoerfer </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ * </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ * This library is free software; you can redistribute it and/or </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ * modify it under the terms of the GNU Lesser General Public </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ * License as published by the Free Software Foundation; either </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ * version 2.1 of the License, or (at your option) any later version. </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ * </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ * This library is distributed in the hope that it will be useful, </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ * but WITHOUT ANY WARRANTY; without even the implied warranty of </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ * Lesser General Public License for more details. </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ * </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ * You should have received a copy of the GNU Lesser General Public </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ * License along with this library; if not, write to the Free Software </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ * </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ * Author: Dirk Herrendoerfer<herrend[at]de[dot]ibm[dot]com> </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ */ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+#include<config.h> </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+#include<asm/types.h> </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+#include<sys/socket.h> </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+#include<netlink/netlink.h> </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+#include<errno.h> </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+#include<unistd.h> </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+#include<sys/types.h> </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+#include "event.h" </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+#include "logging.h" </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+#include "memory.h" </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+#include "netlink.h" </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+#include "netlink-event.h" </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+#include "virterror_internal.h" </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+#define VIR_FROM_THIS VIR_FROM_NET </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+#define EVENT_DEBUG(fmt, ...) VIR_DEBUG(fmt, __VA_ARGS__) </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+#define virNetError(code, ...) \ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ virReportErrorHelper(VIR_FROM_THIS, code, __FILE__, \ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ __FUNCTION__, __LINE__, __VA_ARGS__) </blockquote></blockquote><blockquote type="cite"> </blockquote><blockquote type="cite">This file is compiled on all platforms, even those that don't support (or have chosen to compile out) netlink support. If you look at netlink.c (which is in the same situation), you'll see that it has appropriate #ifdef WITH_LIBNL lines, and stub functions to replace the working functions when libnl support isn't being compiled in for some reason. You need to do the same thing for this file. </blockquote><blockquote type="cite"> </blockquote>Yes, doing so now. <blockquote type="cite"> </blockquote><blockquote type="cite"><blockquote type="cite">+ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+/* State for a single netlink event handle */ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+struct netlinkEventHandle { </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ int watch; </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ netlinkEventHandleCallback cb; </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ void *opaque; </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ unsigned char macaddr[6]; </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ int deleted; </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+}; </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+/* State for the main netlink event loop */ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+struct netlinkEventLoop { </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ virMutex lock; </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ int handeled; </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ size_t handlesCount; </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ size_t handlesAlloc; </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ struct netlinkEventHandle *handles; </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+}; </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+/* Only have one event loop */ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+static struct netlinkEventLoop eventLoop; </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+/* Unique ID for the next netlink watch to be registered */ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+static int nextWatch = 1; </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+/* Allocate extra slots for virEventPollHandle/virEventPollTimeout </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ records in this multiple */ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+#define NETLINK_EVENT_ALLOC_EXTENT 10 </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+static netlinkEventSrvPrivatePtr server = 0; </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+/* Function definitions */ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+static void </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+netlinkEventServerLock(netlinkEventSrvPrivatePtr driver) { </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ virMutexLock(&driver->lock); </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+} </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+static void </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+netlinkEventServerUnlock(netlinkEventSrvPrivatePtr driver) { </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ virMutexUnlock(&driver->lock); </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+} </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+static void </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+netlinkEventCallback(int watch, </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ int fd ATTRIBUTE_UNUSED, </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ int events ATTRIBUTE_UNUSED, </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ void *opaque) { </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ netlinkEventSrvPrivatePtr srv = opaque; </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ unsigned char *msg; </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ struct sockaddr_nl peer; </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ struct ucred *creds = NULL; </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ int i, length, handeled; </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ length = nl_recv(srv->netlinknh,&peer,&msg,&creds); </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ netlinkEventServerLock(srv); </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ handeled=0; </blockquote></blockquote><blockquote type="cite"> </blockquote><blockquote type="cite">s/handeled/handled/g </blockquote><blockquote type="cite"> </blockquote><blockquote type="cite"><blockquote type="cite">+ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ virMutexLock(&eventLoop.lock); </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ VIR_INFO("dispatching to max %d clients, called from event watch %d", </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ (int)eventLoop.handlesCount, watch); </blockquote></blockquote><blockquote type="cite"> </blockquote><blockquote type="cite">I think most of the VIR_INFOs should be VIR_DEBUG instead. </blockquote><blockquote type="cite"> </blockquote><blockquote type="cite"><blockquote type="cite">+ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ for (i = 0 ; i< eventLoop.handlesCount ; i++) { </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ if (eventLoop.handles[i].deleted) { </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ continue; </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ } </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ VIR_INFO("dispatching client %d.",i); </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ netlinkEventHandleCallback cb = eventLoop.handles[i].cb; </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ void *cpopaque = eventLoop.handles[i].opaque; </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ (cb)( msg, length,&peer,&handeled, cpopaque); </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ } </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ virMutexUnlock(&eventLoop.lock); </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ if (handeled == 0) { </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ VIR_INFO("nobody cared."); </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ } </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ free(msg); </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ for (i = 0 ; i< eventLoop.handlesCount ; i++) { </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ if (eventLoop.handles[i].deleted == 1) { </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ VIR_FREE(eventLoop.handles[i].opaque); </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ eventLoop.handles[i].deleted = 2; </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ } </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ } </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ netlinkEventServerUnlock(srv); </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+} </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+static int </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+setupNetlinkEventServer(netlinkEventSrvPrivatePtr srv) { </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ int fd; </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ netlinkEventServerLock(srv); </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ /* Allocate a new socket and get fd */ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ srv->netlinknh = nl_handle_alloc(); </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ if (!srv->netlinknh) { </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ virNetError(errno, </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ "%s", _("cannot allocate nlhandle for netlinkEvent server")); </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ return -1; </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ } </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ if (nl_connect(srv->netlinknh, NETLINK_ROUTE)< 0) { </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ virNetError(errno, </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ "%s", _("cannot connect to netlink socket")); </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ goto exit_cleanup; </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ } </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ fd = nl_socket_get_fd(srv->netlinknh); </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ nl_socket_set_nonblocking(srv->netlinknh); </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ if ((srv->eventwatch = virEventAddHandle(fd, </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ VIR_EVENT_HANDLE_READABLE, </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ netlinkEventCallback, </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ srv, NULL))< 0) { </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ virNetError(VIR_ERR_INTERNAL_ERROR, "%s", </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ _("Failed to add netlink event handle watch")); </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ goto exit_cleanup; </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ } </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ srv->netlinkfd = fd; </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ VIR_INFO("netlink event listener on fd: %i",fd); </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ netlinkEventServerUnlock(srv); </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ return 0; </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+exit_cleanup: </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ nl_close(srv->netlinknh); </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ nl_handle_destroy(srv->netlinknh); </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ netlinkEventServerUnlock(srv); </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ return -1; </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+} </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+/** </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ * netlinkEventServiceStop: </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ * </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ * stop the monitor to receive netlink messages for libvirtd. </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ * This removes the netlink socket fd from the event handler. </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ * </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ * returns -1 if the monitor cannot be unregistered, 0 upon success </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ */ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+int </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+netlinkEventServiceStop(void) { </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ netlinkEventSrvPrivatePtr srv = server; </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ VIR_INFO("stopping netlink event service"); </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ if (server) { </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ errno = EINVAL; </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ return -1; </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ } </blockquote></blockquote><blockquote type="cite"> </blockquote><blockquote type="cite">I think you mean "if (!server). </blockquote><blockquote type="cite"> </blockquote><blockquote type="cite"> </blockquote><blockquote type="cite"><blockquote type="cite">+ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ netlinkEventServerLock(srv); </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ nl_close(srv->netlinknh); </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ nl_handle_destroy(srv->netlinknh); </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ virEventRemoveHandle(srv->eventwatch); </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ server=0; </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ netlinkEventServerUnlock(srv); </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ return 0; </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+} </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+/** </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ * netlinkEventServiceStart: </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ * </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ * start a monitor to receive netlink messages for libvirtd. </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ * This registers a netlink socket with the event interface. </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ * </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ * returns -1 if the monitor cannot be registered, 0 upon success </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ */ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+int </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+netlinkEventServiceStart(void) { </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ netlinkEventSrvPrivatePtr srv; </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ if (server) { </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ return 0; </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ } </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ VIR_INFO("starting netlink event service"); </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ if (VIR_ALLOC(srv)< 0) </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ goto no_memory; </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ if (setupNetlinkEventServer(srv)) { </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ goto error; </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ } </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ VIR_INFO("netlink event service running"); </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ server=srv; </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ return 0; </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ no_memory: </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ virReportOOMError(); </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ error: </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ return -1; </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+} </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+/** </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ * netlinkEventAddClient: </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ * </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ * @cb: callback to invoke when an event occurs </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ * @opaque: user data to pass to callback </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ * @macaddr: macaddr to store with the data. Used to identify callers. May be null. </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ * </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ * register a callback for handling of netlink messages. The </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ * registered function receives the entire netlink message and </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ * may choose to act upon it. </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ * </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ * returns -1 if the file handle cannot be registered, number of monitor upon success </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ */ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+int </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+netlinkEventAddClient(netlinkEventHandleCallback cb, </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ void *opaque, </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ const unsigned char *macaddr) { </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ int i; </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ virMutexLock(&eventLoop.lock); </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ VIR_INFO("adding client: %d.",nextWatch); </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ /* first try to re-use deleted free slots */ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ for (i = 0 ; i< eventLoop.handlesCount ; i++) { </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ if (eventLoop.handles[i].deleted == 2) { </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ eventLoop.handles[i].watch = nextWatch; </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ eventLoop.handles[i].cb = cb; </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ eventLoop.handles[i].opaque = opaque; </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ eventLoop.handles[i].deleted = 0; </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ if (!macaddr) </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ memcpy(eventLoop.handles[i].macaddr, macaddr,6); </blockquote></blockquote><blockquote type="cite"> </blockquote><blockquote type="cite">You mean "if (macaddr)", not "if (!macaddr)" </blockquote><blockquote type="cite"> </blockquote><blockquote type="cite">Also, rather than duplicating the statements that are executed once you find an empty slot, why not have a boolean "found" that's false to begin with, is set to true in the loop if an empty slot is found, and then only do the RESIZE if found is still false (and set "i" accordingly). Then just do the assigment of stuff into the slot once, after you've picked (possibly allocating) a slot. This will prevent future bugs caused by adding something to one of the places you're doing assigment, but not the other (since there will only be one place to do it). </blockquote><blockquote type="cite"> </blockquote> Yes, the way it is now it's not good. <blockquote type="cite">Also, I don't see any handling for the situation where someone tries to add a client for a macaddress that is already registered. I don't know enough about potential use cases to know whether or not that could be problematic. </blockquote><blockquote type="cite"> </blockquote> I don't see the need to register several handlers for the same mac address right now, this would only make sense for other network monitoring purposes, and in any case there would only be one for each interface. More general netlink message handlers can still use their watch id to deregister. <blockquote type="cite"><blockquote type="cite">+ goto cleanup; </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ } </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ } </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ if (eventLoop.handlesCount == eventLoop.handlesAlloc) { </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ EVENT_DEBUG("Used %zu handle slots, adding at least %d more", </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ eventLoop.handlesAlloc, NETLINK_EVENT_ALLOC_EXTENT); </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ if (VIR_RESIZE_N(eventLoop.handles, eventLoop.handlesAlloc, </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ eventLoop.handlesCount, NETLINK_EVENT_ALLOC_EXTENT)< 0) { </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ virMutexUnlock(&eventLoop.lock); </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ return -1; </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ } </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ } </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ eventLoop.handles[eventLoop.handlesCount].watch = nextWatch; </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ eventLoop.handles[eventLoop.handlesCount].cb = cb; </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ eventLoop.handles[eventLoop.handlesCount].opaque = opaque; </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ eventLoop.handles[eventLoop.handlesCount].deleted = 0; </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ if (!macaddr) </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ memcpy(eventLoop.handles[i].macaddr, macaddr,6); </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ VIR_INFO("added client to loop slot: %d.",(int)eventLoop.handlesCount); </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ eventLoop.handlesCount++; </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+cleanup: </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ virMutexUnlock(&eventLoop.lock); </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ return nextWatch++; </blockquote></blockquote><blockquote type="cite"> </blockquote><blockquote type="cite">There is a race here (unless the C compiler guarantees that ++ is atomic (including the return value of the expression, and I don't think that's the case) - you need to assign nextWatch++ into a temporary variable while the lock is still held, then unlock and return the temp value. </blockquote><blockquote type="cite"> </blockquote><blockquote type="cite"> </blockquote>Will fix when I redo the above. <blockquote type="cite"><blockquote type="cite">+} </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+/** </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ * netlinkEventRemoveClient: </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ * </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ * @watch: watch whose handle to remove </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ * @macaddr: macaddr whose handle to remove </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ * </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ * Unregister a callback from a netlink monitor. </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ * The handler function referenced will no longer receive netlink messages. </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ * Either watch or macaddr may be used, the other should be null. </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ * </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ * returns -1 if the file handle was not registered, 0 upon success </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ */ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+int </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+netlinkEventRemoveClient(int watch, const unsigned char *macaddr) { </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ int i; </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ if (watch<= 0&& macaddr == 0) { </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ VIR_WARN("Ignoring invalid netlink client id: %d", watch); </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ return -1; </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ } </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ virMutexLock(&eventLoop.lock); </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ for (i = 0 ; i< eventLoop.handlesCount ; i++) { </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ if (eventLoop.handles[i].deleted) </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ continue; </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ if (watch != 0&& eventLoop.handles[i].watch == watch) { </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ eventLoop.handles[i].deleted = 1; </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ virMutexUnlock(&eventLoop.lock); </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ VIR_INFO("removed client: %d by index.", </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ eventLoop.handles[i].watch); </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ return 0; </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ } </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ if (watch == 0&& memcmp(macaddr, eventLoop.handles[i].macaddr, 6)) { </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ eventLoop.handles[i].deleted = 1; </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ virMutexUnlock(&eventLoop.lock); </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ VIR_INFO("removed client: %d by mac.", </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ eventLoop.handles[i].watch); </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ return 0; </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ } </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ } </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ virMutexUnlock(&eventLoop.lock); </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ VIR_INFO("client not found to remove."); </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ return -1; </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+} </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">diff --git a/src/util/netlink-event.h b/src/util/netlink-event.h </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">new file mode 100644 </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">index 0000000..da97395 </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">--- /dev/null </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+++ b/src/util/netlink-event.h </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">@@ -0,0 +1,63 @@ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+/* </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ * lldpad-event.h: event loop for monitoring netlink messages </blockquote></blockquote><blockquote type="cite"> </blockquote><blockquote type="cite">name change ^^ </blockquote><blockquote type="cite"><blockquote type="cite">+ * </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ * Copyright (C) 2011,2012 IBM Corporation. </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ * Copyright (C) 2011,2012 Dirk Herrendoerfer </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ * </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ * This library is free software; you can redistribute it and/or </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ * modify it under the terms of the GNU Lesser General Public </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ * License as published by the Free Software Foundation; either </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ * version 2.1 of the License, or (at your option) any later version. </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ * </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ * This library is distributed in the hope that it will be useful, </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ * but WITHOUT ANY WARRANTY; without even the implied warranty of </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ * Lesser General Public License for more details. </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ * </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ * You should have received a copy of the GNU Lesser General Public </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ * License along with this library; if not, write to the Free Software </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ * </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ * Author: Dirk Herrendoerfer<herrend[at]de[dot]ibm[dot]com> </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ */ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+#ifndef NETLINK_EVENT_CONF_H </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+# define NETLINK_EVENT_CONF_H </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+#include<netlink/netlink.h> </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+#include "internal.h" </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+#include "threads.h" </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+typedef struct _netlinkEventSrvPrivate netlinkEventSrvPrivate; </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+typedef netlinkEventSrvPrivate *netlinkEventSrvPrivatePtr; </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+struct _netlinkEventSrvPrivate { </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ virMutex lock; </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ int eventwatch; </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ int netlinkfd; </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ struct nl_handle *netlinknh; </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+}; </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+typedef void (*netlinkEventHandleCallback)( unsigned char *msg, int length, struct sockaddr_nl *peer, int *handled, void *opaque); </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+/** </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ * stopNetlinkEventServer: stop the monitor to receive netlink messages for libvirtd </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ */ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+int netlinkEventServiceStop(void); </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+/** </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ * startNetlinkEventServer: start a monitor to receive netlink messages for libvirtd </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ */ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+int netlinkEventServiceStart(void); </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+/** </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ * netlinkEventAddClient: register a callback for handling of netlink messages </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ */ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+int netlinkEventAddClient(netlinkEventHandleCallback cb, void *opaque, const unsigned char *macaddr); </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+/** </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ * netlinkEventRemoveClient: unregister a callback from a netlink monitor </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ */ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+int netlinkEventRemoveClient(int watch, const unsigned char *macaddr); </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+#endif /* NETLINK_EVENT_CONF_H */ </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">diff --git a/src/util/netlink.c b/src/util/netlink.c </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">index 0672184..51bd78a 100644 </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">--- a/src/util/netlink.c </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+++ b/src/util/netlink.c </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">@@ -131,6 +131,7 @@ err_exit: </blockquote></blockquote><blockquote type="cite"><blockquote type="cite"> *respbuflen = 0; </blockquote></blockquote><blockquote type="cite"><blockquote type="cite"> } </blockquote></blockquote><blockquote type="cite"><blockquote type="cite"> </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">+ nl_close(nlhandle); </blockquote></blockquote><blockquote type="cite"> </blockquote><blockquote type="cite"> </blockquote><blockquote type="cite">Isn't this an unrelated bugfix? If so, you should submit a separate patch for it. </blockquote><blockquote type="cite"> </blockquote>That should'nt have gone in here - The close is supposedly not needed, but it makes the communitation with libvirt more robust it seems. <blockquote type="cite"> </blockquote><blockquote type="cite"><blockquote type="cite"> nl_handle_destroy(nlhandle); </blockquote></blockquote><blockquote type="cite"><blockquote type="cite"> return rc; </blockquote></blockquote><blockquote type="cite"><blockquote type="cite">} </blockquote></blockquote><blockquote type="cite"> </blockquote> Thank you for the comments ! DirkH <blockquote type="cite">-- </blockquote><blockquote type="cite">libvir-list mailing list </blockquote><blockquote type="cite"><a href="mailto:libvir-list@redhat.com">libvir-list@redhat.com</a> </blockquote><blockquote type="cite"><a href="https://www.redhat.com/mailman/listinfo/libvir-list">https://www.redhat.com/mailman/listinfo/libvir-list</a> </blockquote><div> </div></body></html>