*
* 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
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);
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;
+}
+
static int iptables_command(int argc, char *argv[])
{
struct connman_iptables *table;
char *flush_chain, *delete_chain, *policy;
int c, ret, in_len, out_len;
gboolean dump, invert, insert, delete, compare;
- struct in_addr src, dst;
if (argc == 0)
return -EINVAL;
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;
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 '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;