dundee: Watch for signals only on DUNDEE_SERVICE

[framework/connectivity/connman.git] / src / iptables.c

diff --git a/src/iptables.c b/src/iptables.c
index ed52bf2..531e933 100644 (file)
--- a/src/iptables.c
+++ b/src/iptables.c
@@ -2,7 +2,7 @@
  *
  *  Connection Manager
  *
- *  Copyright (C) 2007-2011  Intel Corporation. All rights reserved.
+ *  Copyright (C) 2007-2012  Intel Corporation. All rights reserved.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
@@ -696,7 +696,10 @@ static int iptables_insert_rule(struct connman_iptables *table,
        if (new_entry == NULL)
                return -EINVAL;
 
-       ret = iptables_add_entry(table, new_entry, chain_head->next, builtin);
+       if (builtin == -1)
+               chain_head = chain_head->next;
+
+       ret = iptables_add_entry(table, new_entry, chain_head, builtin);
        if (ret < 0)
                g_free(new_entry);
 
@@ -1495,6 +1498,7 @@ static int parse_ip_and_mask(const char *str, struct in_addr *ip, struct in_addr
        }
 
        mask->s_addr = htonl(tmp);
+       ip->s_addr = ip->s_addr & mask->s_addr;
        err = 0;
 out:
        g_strfreev(tokens);
@@ -1522,7 +1526,7 @@ static int iptables_command(int argc, char *argv[])
        insert = FALSE;
        delete = FALSE;
        compare = FALSE;
-       table_name = chain = new_chain = match_name = target_name = NULL;
+       chain = new_chain = match_name = target_name = NULL;
        flush_chain = delete_chain = policy = NULL;
        memset(&ip, 0, sizeof(struct ipt_ip));
        table = NULL;