#include "platform.h"
#include "gnunet_util_lib.h"
+#include "gnunet_tun_lib.h"
#include "gnunet_vpn_service.h"
* 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
{
int dst_af;
int req_af;
- struct GNUNET_PeerIdentity peer;
+ struct GNUNET_PeerIdentity peer;
struct GNUNET_HashCode sd;
const void *addr;
struct in_addr v4;
}
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,
{
dst_af = AF_INET6;
addr = &v6;
- }
+ }
request = GNUNET_VPN_redirect_to_ip (handle,
req_af,
dst_af,