/*
This file is part of GNUnet.
- (C) 2012 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2012 GNUnet e.V.
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
You should have received a copy of the GNU General Public License
along with GNUnet; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
*/
/**
#include "platform.h"
#include "gnunet_util_lib.h"
+#include "gnunet_tun_lib.h"
#include "gnunet_vpn_service.h"
*/
static int verbosity;
-/**
- * Option '-a': Notify only once the tunnel is connected?
- */
-static int nac;
-
/**
* Global return value.
*/
/**
* Option '-d': duration of the mapping
*/
-static unsigned long long duration = 5 * 60;
+static struct GNUNET_TIME_Relative duration = { 5 * 60 * 1000} ;
/**
* Shutdown.
*/
static void
-do_disconnect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+do_disconnect (void *cls)
{
if (NULL != request)
{
* will match 'result_af' from the request
* @param address IP address (struct in_addr or struct in_addr6, depending on 'af')
* that the VPN allocated for the redirection;
- * traffic to this IP will now be redirected to the
+ * traffic to this IP will now be redirected to the
* specified target peer; NULL on error
*/
static void
* @param cfg configuration
*/
static void
-run (void *cls, char *const *args, const char *cfgfile,
+run (void *cls,
+ char *const *args,
+ const char *cfgfile,
const struct GNUNET_CONFIGURATION_Handle *cfg)
{
int dst_af;
int req_af;
- struct GNUNET_PeerIdentity peer;
- GNUNET_HashCode sd;
+ struct GNUNET_PeerIdentity peer;
+ struct GNUNET_HashCode sd;
const void *addr;
struct in_addr v4;
struct in6_addr v6;
uint8_t protocol;
struct GNUNET_TIME_Absolute etime;
- etime = GNUNET_TIME_relative_to_absolute (GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS,
- (unsigned int) duration));
- GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
- &do_disconnect, NULL);
+ etime = GNUNET_TIME_relative_to_absolute (duration);
+ GNUNET_SCHEDULER_add_shutdown (&do_disconnect, NULL);
handle = GNUNET_VPN_connect (cfg);
if (NULL == handle)
goto error;
}
if (ipv6)
req_af = AF_INET6;
-
+
if (NULL == target_ip)
{
if (NULL == service_name)
if (udp)
protocol = IPPROTO_UDP;
if (GNUNET_OK !=
- GNUNET_CRYPTO_hash_from_string (peer_id,
- &peer.hashPubKey))
+ GNUNET_CRYPTO_eddsa_public_key_from_string (peer_id,
+ strlen (peer_id),
+ &peer.public_key))
{
- FPRINTF (stderr, _("`%s' is not a valid peer identifier.\n"),
+ FPRINTF (stderr,
+ _("`%s' is not a valid peer identifier.\n"),
peer_id);
goto error;
- }
- GNUNET_CRYPTO_hash (service_name,
- strlen (service_name),
- &sd);
+ }
+ GNUNET_TUN_service_name_to_hash (service_name,
+ &sd);
request = GNUNET_VPN_redirect_to_peer (handle,
req_af,
protocol,
&peer,
&sd,
- nac,
etime,
&allocation_cb, NULL);
}
{
dst_af = AF_INET6;
addr = &v6;
- }
+ }
request = GNUNET_VPN_redirect_to_ip (handle,
req_af,
dst_af,
addr,
- nac,
etime,
&allocation_cb, NULL);
}
{'6', "ipv6", NULL,
gettext_noop ("request that result should be an IPv6 address"),
0, &GNUNET_GETOPT_set_one, &ipv6},
- {'a', "after-connect", NULL,
- gettext_noop ("print IP address only after mesh tunnel has been created"),
- 0, &GNUNET_GETOPT_set_one, &ipv6},
- {'d', "duration", "SECONDS",
+ {'d', "duration", "TIME",
gettext_noop ("how long should the mapping be valid for new tunnels?"),
- 1, &GNUNET_GETOPT_set_ulong, &duration},
+ 1, &GNUNET_GETOPT_set_relative_time, &duration},
{'i', "ip", "IP",
gettext_noop ("destination IP for the tunnel"),
1, &GNUNET_GETOPT_set_string, &target_ip},
1, &GNUNET_GETOPT_set_string, &peer_id},
{'s', "service", "NAME",
gettext_noop ("name of the service we would like to access"),
- 1, &GNUNET_GETOPT_set_string, &peer_id},
+ 1, &GNUNET_GETOPT_set_string, &service_name},
{'t', "tcp", NULL,
gettext_noop ("service is offered via TCP"),
0, &GNUNET_GETOPT_set_one, &tcp},
GNUNET_GETOPT_OPTION_VERBOSE (&verbosity),
GNUNET_GETOPT_OPTION_END
};
- return (GNUNET_OK ==
- GNUNET_PROGRAM_run (argc, argv, "gnunet-vpn",
- gettext_noop
- ("Setup tunnels via VPN."), options,
+ if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv))
+ return 2;
+
+ ret = (GNUNET_OK ==
+ GNUNET_PROGRAM_run (argc, argv, "gnunet-vpn",
+ gettext_noop
+ ("Setup tunnels via VPN."), options,
&run, NULL)) ? ret : 1;
+ GNUNET_free ((void *) argv);
+ return ret;
}