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_macipmap.c | |
| parent | a3e8a59918618bb44bab10d1d3028ed3ed0630b9 (diff) | |
New release: 2.3.0 (see ChangeLog)
Diffstat (limited to 'ipset_macipmap.c')
| -rw-r--r-- | ipset_macipmap.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ipset_macipmap.c b/ipset_macipmap.c index c14547a..3385f19 100644 --- a/ipset_macipmap.c +++ b/ipset_macipmap.c @@ -184,7 +184,7 @@ ip_set_ip_t adt_parser(unsigned cmd, const char *optarg, void *data) DP("macipmap: %p %p", optarg, data); - ptr = strsep(&tmp, "%"); + ptr = strsep(&tmp, ":%"); parse_ip(ptr, &mydata->ip); if (tmp) @@ -246,7 +246,7 @@ void printips_sorted(struct set *set, void *data, size_t len, unsigned options) while (addr <= mysetdata->last_ip) { if (test_bit(IPSET_MACIP_ISSET, (void *)&table[addr - mysetdata->first_ip].flags)) { - printf("%s%%", ip_tostring(addr, options)); + printf("%s:", ip_tostring(addr, options)); print_mac(table[addr - mysetdata->first_ip]. ethernet); printf("\n"); @@ -281,7 +281,7 @@ void saveips(struct set *set, void *data, size_t len, unsigned options) while (addr <= mysetdata->last_ip) { if (test_bit(IPSET_MACIP_ISSET, (void *)&table[addr - mysetdata->first_ip].flags)) { - printf("-A %s %s%%", + printf("-A %s %s:", set->name, ip_tostring(addr, options)); print_mac(table[addr - mysetdata->first_ip]. ethernet); @@ -296,9 +296,9 @@ void usage(void) printf ("-N set macipmap --from IP --to IP [--matchunset]\n" "-N set macipmap --network IP/mask [--matchunset]\n" - "-A set IP%%MAC\n" - "-D set IP[%%MAC]\n" - "-T set IP[%%MAC]\n"); + "-A set IP:MAC\n" + "-D set IP[:MAC]\n" + "-T set IP[:MAC]\n"); } static struct settype settype_macipmap = { |