diff options
| author | /C=EU/ST=EU/CN=Jozsef Kadlecsik/emailAddress=kadlec@blackhole.kfki.hu </C=EU/ST=EU/CN=Jozsef Kadlecsik/emailAddress=kadlec@blackhole.kfki.hu> | 2007-08-28 11:23:22 +0000 |
|---|---|---|
| committer | /C=EU/ST=EU/CN=Jozsef Kadlecsik/emailAddress=kadlec@blackhole.kfki.hu </C=EU/ST=EU/CN=Jozsef Kadlecsik/emailAddress=kadlec@blackhole.kfki.hu> | 2007-08-28 11:23:22 +0000 |
| commit | e9d21d2b8304c184a745382c68a0bfc4122729c4 (patch) | |
| tree | e05d122edb8bb07abe4d7e182f884a9b3783138d /ipset_ipporthash.c | |
| parent | a3e8a59918618bb44bab10d1d3028ed3ed0630b9 (diff) | |
New release: 2.3.0 (see ChangeLog)
Diffstat (limited to 'ipset_ipporthash.c')
| -rw-r--r-- | ipset_ipporthash.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ipset_ipporthash.c b/ipset_ipporthash.c index 0548b86..ef527fa 100644 --- a/ipset_ipporthash.c +++ b/ipset_ipporthash.c @@ -181,7 +181,7 @@ void create_final(void *data, unsigned int flags) if (mydata->to - mydata->from > MAX_RANGE) exit_error(PARAMETER_PROBLEM, - "Range to large. Max is %d IPs in range\n", + "Range too large. Max is %d IPs in range\n", MAX_RANGE+1); } @@ -206,7 +206,7 @@ ip_set_ip_t adt_parser(unsigned cmd, const char *optarg, void *data) DP("ipporthash: %p %p", optarg, data); - ptr = strsep(&tmp, "%"); + ptr = strsep(&tmp, ":%"); parse_ip(ptr, &mydata->ip); if (tmp) @@ -262,7 +262,7 @@ void printips(struct set *set, void *data, size_t len, unsigned options) if (*ipptr) { ip = (*ipptr>>16) + mysetdata->first_ip; port = (uint16_t) *ipptr; - printf("%s%%%s\n", + printf("%s:%s\n", ip_tostring(ip, options), port_tostring(port, options)); } @@ -298,7 +298,7 @@ void saveips(struct set *set, void *data, size_t len, unsigned options) if (*ipptr) { ip = (*ipptr>>16) + mysetdata->first_ip; port = (uint16_t) *ipptr; - printf("-A %s %s%%%s\n", set->name, + printf("-A %s %s:%s\n", set->name, ip_tostring(ip, options), port_tostring(port, options)); } @@ -316,7 +316,7 @@ static char * unpack_ipport_tostring(struct set *set, ip_set_ip_t bip, unsigned ip = (bip>>16) + mysetdata->first_ip; port = (uint16_t) bip; - sprintf(buffer, "%s%%%s", + sprintf(buffer, "%s:%s", ip_tostring(ip, options), port_tostring(port, options)); return buffer; @@ -329,9 +329,9 @@ void usage(void) " [--hashsize hashsize] [--probes probes ] [--resize resize]\n" "-N set ipporthash --network IP/mask\n" " [--hashsize hashsize] [--probes probes ] [--resize resize]\n" - "-A set IP%%port\n" - "-D set IP%%port\n" - "-T set IP%%port\n"); + "-A set IP:port\n" + "-D set IP:port\n" + "-T set IP:port\n"); } static struct settype settype_ipporthash = { |