[NETFILTER]: more verbose return codes from nf_{log,queue}

[Linux Kernel Mailing List]

tree 650d0bdca48e7f3ea6bc356f6aa868f34c6a226f
parent bbd86b9fc469b7e91dc7444e6abb8930811d79cb
author Harald Welte <[EMAIL PROTECTED]> Wed, 10 Aug 2005 10:23:36 -0700
committer David S. Miller <[EMAIL PROTECTED]> Tue, 30 Aug 2005 05:51:21 -0700

[NETFILTER]: more verbose return codes from nf_{log,queue}

This adds EEXIST to distinguish between the following return values:
0:      nobody was registered, registration successful
EEXIST: the exact same handler was already registered, no registration
        required
EBUSY:  somebody else is registered, registration unsuccessful.

Signed-off-by: Harald Welte <[EMAIL PROTECTED]>
Signed-off-by: David S. Miller <[EMAIL PROTECTED]>

 net/netfilter/nf_log.c   |    6 +++++-
 net/netfilter/nf_queue.c |    6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/net/netfilter/nf_log.c b/net/netfilter/nf_log.c
--- a/net/netfilter/nf_log.c
+++ b/net/netfilter/nf_log.c
@@ -18,6 +18,8 @@
 static struct nf_logger *nf_logging[NPROTO]; /* = NULL */
 static DEFINE_SPINLOCK(nf_log_lock);
 
+/* return EBUSY if somebody else is registered, EEXIST if the same logger
+ * is registred, 0 on success. */
 int nf_log_register(int pf, struct nf_logger *logger)
 {
        int ret = -EBUSY;
@@ -28,7 +30,9 @@ int nf_log_register(int pf, struct nf_lo
        if (!nf_logging[pf]) {
                rcu_assign_pointer(nf_logging[pf], logger);
                ret = 0;
-       }
+       } else if (nf_logging[pf] == logger)
+               ret = -EEXIST;
+
        spin_unlock(&nf_log_lock);
        return ret;
 }              
diff --git a/net/netfilter/nf_queue.c b/net/netfilter/nf_queue.c
--- a/net/netfilter/nf_queue.c
+++ b/net/netfilter/nf_queue.c
@@ -20,6 +20,8 @@ static struct nf_queue_rerouter *queue_r
 
 static DEFINE_RWLOCK(queue_handler_lock);
 
+/* return EBUSY when somebody else is registered, return EEXIST if the
+ * same handler is registered, return 0 in case of success. */
 int nf_register_queue_handler(int pf, struct nf_queue_handler *qh)
 {      
        int ret;
@@ -28,7 +30,9 @@ int nf_register_queue_handler(int pf, st
                return -EINVAL;
 
        write_lock_bh(&queue_handler_lock);
-       if (queue_handler[pf])
+       if (queue_handler[pf] == qh)
+               ret = -EEXIST;
+       else if (queue_handler[pf])
                ret = -EBUSY;
        else {
                queue_handler[pf] = qh;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html