Re: [PATCH 4/*] libnfnetlink fixes

[Amin Azez <azez@ufomechanic.net>]

[-- Attachment #1: Type: text/plain, Size: 640 bytes --]

Harald Welte wrote:

>On Fri, Sep 02, 2005 at 05:12:38PM +0100, Amin Azez wrote:
>  
>
>>Harald Welte wrote:
>>
>>    
>>
>>>On Wed, Jul 13, 2005 at 09:23:56AM +0100, Amin Azez wrote:
>>>
>>> 
>>>
>>>I think this change is fine.  Would you mind to re-submit the patch
>>>against current svn?  Please also document the meaning of the return
>>>values, probably with a comment in the code or the header file?
>>>
>>> 
>>>
>>>      
>>>
>>Will do (Monday)
>>
>>thanks for the feedback.
>>    
>>
>
>I haven't received an updated patch so far. Did I miss it somehow?
>
>  
>
err... you must have, I sent it on 5th Sept.

Attached again.

Azez


[-- Attachment #2: libnfnetlink.c.diff --]
[-- Type: text/x-patch, Size: 1691 bytes --]

Index: src/libnfnetlink.c
===================================================================
--- src/libnfnetlink.c	(revision 4254)
+++ src/libnfnetlink.c	(working copy)
@@ -257,6 +257,16 @@
  *
  * nfnhl: libnfnetlink handle
  * handler: callback function to be called for every netlink message
+ *          - the callback handler should normally return 0
+ *          - but may return a negative error code which will cause
+ *            nfnl_listen to return immediately with the same error code
+ *          - or return a postivie error code which will cause 
+ *            nfnl_listen to return after it has finished processing all
+ *            the netlink messages in the current packet
+ *          Thus a positive error code will terminate nfnl_listen "soon"
+ *          without any loss of data, a negative error code will terminate
+ *          nfnl_listen "very soon" and throw away data already read from
+ *          the netlink socket.
  * jarg: opaque argument passed on to callback
  *
  */
@@ -270,6 +280,7 @@
 	int remain;
 	struct nlmsghdr *h;
 	struct nlmsgerr *msgerr;
+	int quit=0;
 
 	struct msghdr msg = {
 		(void *)&nladdr, sizeof(nladdr),
@@ -283,7 +294,7 @@
 	iov.iov_base = buf;
 	iov.iov_len = sizeof(buf);
 
-	while (1) {
+	while (! quit) {
 		remain = recvmsg(nfnlh->fd, &msg, 0);
 		if (remain < 0) {
 			if (errno == EINTR)
@@ -332,6 +343,7 @@
 			err = handler(&nladdr, h, jarg);
 			if (err < 0)
 				return err;
+			quit |= err;
 		
 			/* FIXME: why not _NEXT macros, etc.? */
 			//h = NLMSG_NEXT(h, remain);
@@ -348,7 +360,7 @@
 		}
 	}
 
-	return 0;
+	return quit;
 }
 
 int nfnl_talk(struct nfnl_handle *nfnlh, struct nlmsghdr *n, pid_t peer,