Merge authors: Miika Komu (miika-iki) ------------------------------------------------------------ revno: 5136 [merge] committer: Miika Komu <miika@xxxxxx> branch nick: trunk timestamp: Sun 2010-11-07 03:49:38 +0200 message: Fixed problems with "hipconf add map" hipconf add map failed to work when LSI was given. modified: lib/core/conf.c -- lp:hipl https://code.launchpad.net/~hipl-core/hipl/trunk Your team HIPL core team is subscribed to branch lp:hipl. To unsubscribe from this branch go to https://code.launchpad.net/~hipl-core/hipl/trunk/+edit-subscription
=== modified file 'lib/core/conf.c' --- lib/core/conf.c 2010-10-24 17:46:20 +0000 +++ lib/core/conf.c 2010-11-06 15:23:19 +0000 @@ -197,7 +197,7 @@ * for the action. */ const char *hipconf_usage = - "add|del map <hit> <ipv6> [lsi]\n" + "add|del map <hit> <ip> [lsi]\n" "del hi <hit>|all\n" "get hi default|all\n" "new|add hi anon|pub rsa|dsa filebasename\n" @@ -1235,7 +1235,7 @@ "build param hit failed\n"); if (optc == 3) { - HIP_IFEL(inet_pton(AF_INET, opt[2], &lsi) == 1, -1, + HIP_IFEL(inet_pton(AF_INET, opt[2], &lsi) != 1, -1, "string to address conversion failed\n"); HIP_IFEL(!IS_LSI32(lsi.s_addr), -1, "Wrong LSI value\n"); HIP_IFEL(hip_build_param_contents(msg, &lsi,