dnsproxy: Only one copy of the relevant buffers will be made to a TCP request

[framework/connectivity/connman.git] / tools / iptables-test.c

diff --git a/tools/iptables-test.c b/tools/iptables-test.c
index a6780f1..881fa0b 100644 (file)
--- a/tools/iptables-test.c
+++ b/tools/iptables-test.c
@@ -1,7 +1,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
@@ -689,7 +689,10 @@ static int connman_iptables_insert_rule(struct connman_iptables *table,
        if (new_entry == NULL)
                return -EINVAL;
 
-       ret = connman_add_entry(table, new_entry, chain_head->next, builtin);
+       if (builtin == -1)
+               chain_head = chain_head->next;
+
+       ret = connman_add_entry(table, new_entry, chain_head, builtin);
        if (ret < 0)
                g_free(new_entry);
 
@@ -1456,6 +1459,43 @@ done:
        return xt_m;
 }
 
+static int parse_ip_and_mask(const char *str, struct in_addr *ip, struct in_addr *mask)
+{
+       char **tokens;
+       uint32_t prefixlength;
+       uint32_t tmp;
+       int err;
+
+       tokens = g_strsplit(str, "/", 2);
+       if (tokens == NULL)
+               return -1;
+
+       if (!inet_pton(AF_INET, tokens[0], ip)) {
+               err = -1;
+               goto out;
+       }
+
+       if (tokens[1] != NULL) {
+               prefixlength = strtol(tokens[1], NULL, 10);
+               if (prefixlength > 31) {
+                       err = -1;
+                       goto out;
+               }
+
+               tmp = ~(0xffffffff >> prefixlength);
+       } else {
+               tmp = 0xffffffff;
+       }
+
+       mask->s_addr = htonl(tmp);
+       ip->s_addr = ip->s_addr & mask->s_addr;
+       err = 0;
+out:
+       g_strfreev(tokens);
+
+       return err;
+}
+
 int main(int argc, char *argv[])
 {
        struct connman_iptables *table;
@@ -1467,7 +1507,6 @@ int main(int argc, char *argv[])
        char *delete_chain, *flush_chain, *policy;
        int c, in_len, out_len;
        gboolean dump, invert, delete, insert, delete_rule, compare_rule;
-       struct in_addr src, dst;
 
        xtables_init_all(&connman_iptables_globals, NFPROTO_IPV4);
 
@@ -1477,7 +1516,7 @@ int main(int argc, char *argv[])
        insert = FALSE;
        delete_rule = FALSE;
        compare_rule = FALSE;
-       table_name = chain = new_chain = match_name = target_name = NULL;
+       chain = new_chain = match_name = target_name = NULL;
        delete_chain = flush_chain = policy = NULL;
        memset(&ip, 0, sizeof(struct ipt_ip));
        table = NULL;
@@ -1554,15 +1593,13 @@ int main(int argc, char *argv[])
                        break;
 
                case 'd':
-                       if (!inet_pton(AF_INET, optarg, &dst))
+                       if (!parse_ip_and_mask(optarg, &ip.dst, &ip.dmsk))
                                break;
 
-                       ip.dst = dst;
-                       inet_pton(AF_INET, "255.255.255.255", &ip.dmsk);
-
                        if (invert)
                                ip.invflags |= IPT_INV_DSTIP;
 
+
                        break;
 
                case 'i':
@@ -1610,12 +1647,9 @@ int main(int argc, char *argv[])
                        break;
 
                case 's':
-                       if (!inet_pton(AF_INET, optarg, &src))
+                       if (!parse_ip_and_mask(optarg, &ip.src, &ip.smsk))
                                break;
 
-                       ip.src = src;
-                       inet_pton(AF_INET, "255.255.255.255", &ip.smsk);
-
                        if (invert)
                                ip.invflags |= IPT_INV_SRCIP;