/*
This file is part of GNUnet.
- Copyright (C) 2007-2016 GNUnet e.V.
+ Copyright (C) 2007-2017 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
*/
struct AddrEntry *prev;
+ /**
+ * Address class of the address.
+ */
+ enum GNUNET_NAT_AddressClass ac;
+
/**
* Number of bytes that follow.
*/
* Configuration we use.
*/
const struct GNUNET_CONFIGURATION_Handle *cfg;
-
+
/**
* Message queue for communicating with the NAT service.
*/
* Our registration message.
*/
struct GNUNET_MessageHeader *reg;
-
+
/**
* Head of address DLL.
*/
* Function to call when our addresses change.
*/
GNUNET_NAT_AddressCallback address_callback;
-
+
/**
* Function to call when another peer requests connection reversal.
*/
GNUNET_NAT_ReversalCallback reversal_callback;
-
+
/**
* Closure for the various callbacks.
*/
static void
reconnect (struct GNUNET_NAT_Handle *nh)
{
+ struct AddrEntry *ae;
+
if (NULL != nh->mq)
{
GNUNET_MQ_destroy (nh->mq);
nh->mq = NULL;
}
+ while (NULL != (ae = nh->ae_head))
+ {
+ GNUNET_CONTAINER_DLL_remove (nh->ae_head,
+ nh->ae_tail,
+ ae);
+ nh->address_callback (nh->callback_cls,
+ GNUNET_NO,
+ ae->ac,
+ (const struct sockaddr *) &ae[1],
+ ae->addrlen);
+ GNUNET_free (ae);
+ }
nh->reconnect_delay
= GNUNET_TIME_STD_BACKOFF (nh->reconnect_delay);
nh->reconnect_task
check_connection_reversal_request (void *cls,
const struct GNUNET_NAT_ConnectionReversalRequestedMessage *crm)
{
- GNUNET_break (0);
- return GNUNET_SYSERR;
+ if (ntohs (crm->header.size) !=
+ sizeof (*crm) +
+ sizeof (struct sockaddr_in) )
+ {
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
+ }
+ return GNUNET_OK;
}
-
+
/**
* Handle connection reversal request.
*
handle_connection_reversal_request (void *cls,
const struct GNUNET_NAT_ConnectionReversalRequestedMessage *crm)
{
- // FIXME: parse
- // FIXME: call callback!
- GNUNET_break (0);
+ struct GNUNET_NAT_Handle *nh = cls;
+
+ nh->reversal_callback (nh->callback_cls,
+ (const struct sockaddr *) &crm[1],
+ sizeof (struct sockaddr_in));
}
check_address_change_notification (void *cls,
const struct GNUNET_NAT_AddressChangeNotificationMessage *acn)
{
- GNUNET_break (0);
- return GNUNET_SYSERR;
+ size_t alen = ntohs (acn->header.size) - sizeof (*acn);
+
+ switch (alen)
+ {
+ case sizeof (struct sockaddr_in):
+ {
+ const struct sockaddr_in *s4
+ = (const struct sockaddr_in *) &acn[1];
+ if (AF_INET != s4->sin_family)
+ {
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
+ }
+ }
+ break;
+ case sizeof (struct sockaddr_in6):
+ {
+ const struct sockaddr_in6 *s6
+ = (const struct sockaddr_in6 *) &acn[1];
+ if (AF_INET6 != s6->sin6_family)
+ {
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
+ }
+ }
+ break;
+ default:
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
+ }
+ return GNUNET_OK;
}
-
+
/**
* Handle connection reversal request.
*
handle_address_change_notification (void *cls,
const struct GNUNET_NAT_AddressChangeNotificationMessage *acn)
{
- // FIXME: parse
- // FIXME: update ae-DLL
- // FIXME: call callback!
- GNUNET_break (0);
+ struct GNUNET_NAT_Handle *nh = cls;
+ size_t alen = ntohs (acn->header.size) - sizeof (*acn);
+ const struct sockaddr *sa = (const struct sockaddr *) &acn[1];
+ enum GNUNET_NAT_AddressClass ac;
+ struct AddrEntry *ae;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Received address change notification\n");
+ ac = (enum GNUNET_NAT_AddressClass) ntohl (acn->addr_class);
+ if (GNUNET_YES == ntohl (acn->add_remove))
+ {
+ ae = GNUNET_malloc (sizeof (*ae) + alen);
+ ae->ac = ac;
+ ae->addrlen = alen;
+ GNUNET_memcpy (&ae[1],
+ sa,
+ alen);
+ GNUNET_CONTAINER_DLL_insert (nh->ae_head,
+ nh->ae_tail,
+ ae);
+ }
+ else
+ {
+ for (ae = nh->ae_head; NULL != ae; ae = ae->next)
+ if ( (ae->addrlen == alen) &&
+ (0 == memcmp (&ae[1],
+ sa,
+ alen)) )
+ break;
+ if (NULL == ae)
+ {
+ GNUNET_break (0);
+ reconnect (nh);
+ return;
+ }
+ GNUNET_CONTAINER_DLL_remove (nh->ae_head,
+ nh->ae_tail,
+ ae);
+ GNUNET_free (ae);
+ }
+ nh->address_callback (nh->callback_cls,
+ ntohl (acn->add_remove),
+ ac,
+ sa,
+ alen);
}
nh),
GNUNET_MQ_handler_end ()
};
+ struct GNUNET_MQ_Envelope *env;
nh->reconnect_task = NULL;
- nh->mq = GNUNET_CLIENT_connecT (nh->cfg,
+ nh->mq = GNUNET_CLIENT_connect (nh->cfg,
"nat",
handlers,
&mq_error_handler,
nh);
if (NULL == nh->mq)
+ {
reconnect (nh);
+ return;
+ }
+ env = GNUNET_MQ_msg_copy (nh->reg);
+ GNUNET_MQ_send (nh->mq,
+ env);
}
* address_callback for any 'plausible' external address.
*
* @param cfg configuration to use
+ * @param config_section name of the configuration section for optionsx
* @param proto protocol this is about, IPPROTO_TCP or IPPROTO_UDP
- * @param adv_port advertised port (port we are either bound to or that our OS
- * locally performs redirection from to our bound port).
* @param num_addrs number of addresses in @a addrs
* @param addrs list of local addresses packets should be redirected to
* @param addrlens actual lengths of the addresses in @a addrs
*/
struct GNUNET_NAT_Handle *
GNUNET_NAT_register (const struct GNUNET_CONFIGURATION_Handle *cfg,
+ const char *config_section,
uint8_t proto,
- uint16_t adv_port,
unsigned int num_addrs,
const struct sockaddr **addrs,
const socklen_t *addrlens,
struct GNUNET_NAT_Handle *nh;
struct GNUNET_NAT_RegisterMessage *rm;
size_t len;
+ size_t str_len;
char *off;
-
+
len = 0;
for (unsigned int i=0;i<num_addrs;i++)
len += addrlens[i];
- if ( (len > GNUNET_SERVER_MAX_MESSAGE_SIZE - sizeof (*rm)) ||
+ str_len = strlen (config_section) + 1;
+ len += str_len;
+ if ( (len > GNUNET_MAX_MESSAGE_SIZE - sizeof (*rm)) ||
(num_addrs > UINT16_MAX) )
{
GNUNET_break (0);
if (NULL != reversal_callback)
rm->flags |= GNUNET_NAT_RF_REVERSAL;
rm->proto = proto;
- rm->adv_port = htons (adv_port);
+ rm->str_len = htons (str_len);
rm->num_addrs = htons ((uint16_t) num_addrs);
off = (char *) &rm[1];
for (unsigned int i=0;i<num_addrs;i++)
{
+ switch (addrs[i]->sa_family)
+ {
+ case AF_INET:
+ if (sizeof (struct sockaddr_in) != addrlens[i])
+ {
+ GNUNET_break (0);
+ GNUNET_free (rm);
+ return NULL;
+ }
+ break;
+ case AF_INET6:
+ if (sizeof (struct sockaddr_in6) != addrlens[i])
+ {
+ GNUNET_break (0);
+ GNUNET_free (rm);
+ return NULL;
+ }
+ break;
+#if AF_UNIX
+ case AF_UNIX:
+ if (sizeof (struct sockaddr_un) != addrlens[i])
+ {
+ GNUNET_break (0);
+ GNUNET_free (rm);
+ return NULL;
+ }
+ break;
+#endif
+ default:
+ GNUNET_break (0);
+ GNUNET_free (rm);
+ return NULL;
+ }
GNUNET_memcpy (off,
addrs[i],
addrlens[i]);
off += addrlens[i];
}
+ GNUNET_memcpy (off,
+ config_section,
+ str_len);
nh = GNUNET_new (struct GNUNET_NAT_Handle);
nh->reg = &rm->header;
nh->reversal_callback = reversal_callback;
nh->callback_cls = callback_cls;
do_connect (nh);
- GNUNET_break (0);
return nh;
}
* Handle an incoming STUN message. This function is useful as
* some GNUnet service may be listening on a UDP port and might
* thus receive STUN messages while trying to receive other data.
- * In this case, this function can be used to act as a proper
- * STUN server (if desired).
+ * In this case, this function can be used to process replies
+ * to STUN requests.
*
* The function does some basic sanity checks on packet size and
- * content, try to extract a bit of information, and possibly replies
- * if this is an actual STUN message.
- *
+ * content, try to extract a bit of information.
+ *
* At the moment this only processes BIND requests, and returns the
- * externally visible address of the request.
+ * externally visible address of the request to the rest of the
+ * NAT logic.
*
* @param nh handle to the NAT service
* @param sender_addr address from which we got @a data
* @param nh handle (used for configuration)
* @param local_sa our local address of the peer (IPv4-only)
* @param remote_sa the remote address of the peer (IPv4-only)
- * @return #GNUNET_SYSERR on error,
+ * @return #GNUNET_SYSERR on error,
* #GNUNET_NO if connection reversal is unavailable,
* #GNUNET_OK otherwise (presumably in progress)
*/
if (NULL == nh->mq)
return GNUNET_SYSERR;
+ GNUNET_break (AF_INET == local_sa->sin_family);
+ GNUNET_break (AF_INET == remote_sa->sin_family);
env = GNUNET_MQ_msg_extra (req,
2 * sizeof (struct sockaddr_in),
GNUNET_MESSAGE_TYPE_NAT_REQUEST_CONNECTION_REVERSAL);
void
GNUNET_NAT_unregister (struct GNUNET_NAT_Handle *nh)
{
- GNUNET_MQ_destroy (nh->mq);
- GNUNET_free (nh->reg);
- GNUNET_free (nh);
-}
-
-
-/**
- * Handle to a NAT test.
- */
-struct GNUNET_NAT_Test
-{
-
- /**
- * Configuration we use.
- */
- const struct GNUNET_CONFIGURATION_Handle *cfg;
-
- /**
- * Message queue for communicating with the NAT service.
- */
- struct GNUNET_MQ_Handle *mq;
-
- /**
- * Function called to report success or failure for
- * NAT configuration test.
- */
- GNUNET_NAT_TestCallback cb;
-
- /**
- * Closure for @e cb.
- */
- void *cb_cls;
-
-};
-
-
-/**
- * Handle result for a NAT test from the service.
- *
- * @param cls our `struct GNUNET_NAT_Test *`
- * @param rm message with the result of the test
- */
-static void
-handle_test_result (void *cls,
- const struct GNUNET_NAT_TestResultMessage *rm)
-{
- struct GNUNET_NAT_Test *tst = cls;
- enum GNUNET_NAT_StatusCode sc;
-
- sc = (enum GNUNET_NAT_StatusCode) ntohl (rm->status_code);
- tst->cb (tst->cb_cls,
- sc);
- GNUNET_NAT_test_stop (tst);
-}
-
-
-/**
- * Handle queue errors by reconnecting to NAT.
- *
- * @param cls the `struct GNUNET_NAT_Test *`
- * @param error details about the error
- */
-static void
-tst_error_handler (void *cls,
- enum GNUNET_MQ_Error error)
-{
- struct GNUNET_NAT_Test *tst = cls;
-
- tst->cb (tst->cb_cls,
- GNUNET_NAT_ERROR_IPC_FAILURE);
- GNUNET_NAT_test_stop (tst);
-}
-
-
-/**
- * Start testing if NAT traversal works using the given configuration
- * (IPv4-only). The transport adapters should be down while using
- * this function.
- *
- * @param cfg configuration for the NAT traversal
- * @param proto protocol to test, i.e. IPPROTO_TCP or IPPROTO_UDP
- * @param bind_ip IPv4 address to bind to
- * @param bnd_port port to bind to, 0 to test connection reversal
- * @param extern_ip IPv4 address to externally advertise
- * @param extern_port externally advertised port to use
- * @param report function to call with the result of the test
- * @param report_cls closure for @a report
- * @return handle to cancel NAT test
- */
-struct GNUNET_NAT_Test *
-GNUNET_NAT_test_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
- uint8_t proto,
- struct in_addr bind_ip,
- uint16_t bnd_port,
- struct in_addr extern_ip,
- uint16_t extern_port,
- GNUNET_NAT_TestCallback report,
- void *report_cls)
-{
- struct GNUNET_NAT_Test *tst = GNUNET_new (struct GNUNET_NAT_Test);
- struct GNUNET_MQ_MessageHandler handlers[] = {
- GNUNET_MQ_hd_fixed_size (test_result,
- GNUNET_MESSAGE_TYPE_NAT_TEST_RESULT,
- struct GNUNET_NAT_TestResultMessage,
- tst),
- GNUNET_MQ_handler_end ()
- };
- struct GNUNET_MQ_Envelope *env;
- struct GNUNET_NAT_RequestTestMessage *req;
-
- tst->cb = report;
- tst->cb_cls = report_cls;
- tst->mq = GNUNET_CLIENT_connecT (cfg,
- "nat",
- handlers,
- &tst_error_handler,
- tst);
- if (NULL == tst->mq)
+ if (NULL != nh->mq)
{
- GNUNET_break (0);
- GNUNET_free (tst);
- return NULL;
+ GNUNET_MQ_destroy (nh->mq);
+ nh->mq = NULL;
}
- env = GNUNET_MQ_msg (req,
- GNUNET_MESSAGE_TYPE_NAT_REQUEST_TEST);
- req->bind_port = htons (bnd_port);
- req->extern_port = htons (extern_port);
- req->bind_ip = bind_ip;
- req->extern_ip = extern_ip;
- req->proto = proto;
- GNUNET_MQ_send (tst->mq,
- env);
- return tst;
-}
-
-
-/**
- * Stop an active NAT test.
- *
- * @param tst test to stop.
- */
-void
-GNUNET_NAT_test_stop (struct GNUNET_NAT_Test *tst)
-{
- GNUNET_MQ_destroy (tst->mq);
- GNUNET_free (tst);
-}
-
-
-/**
- * Handle to auto-configuration in progress.
- */
-struct GNUNET_NAT_AutoHandle
-{
-
- /**
- * Configuration we use.
- */
- const struct GNUNET_CONFIGURATION_Handle *cfg;
-
- /**
- * Message queue for communicating with the NAT service.
- */
- struct GNUNET_MQ_Handle *mq;
-
- /**
- * Function called with the result from the autoconfiguration.
- */
- GNUNET_NAT_AutoResultCallback arc;
-
- /**
- * Closure for @e arc.
- */
- void *arc_cls;
-
-};
-
-
-/**
- * Converts `enum GNUNET_NAT_StatusCode` to string
- *
- * @param err error code to resolve to a string
- * @return point to a static string containing the error code
- */
-const char *
-GNUNET_NAT_status2string (enum GNUNET_NAT_StatusCode err)
-{
- GNUNET_break (0);
- return NULL;
-}
-
-
-/**
- * Start auto-configuration routine. The transport adapters should
- * be stopped while this function is called.
- *
- * @param cfg initial configuration
- * @param cb function to call with autoconfiguration result
- * @param cb_cls closure for @a cb
- * @return handle to cancel operation
- */
-struct GNUNET_NAT_AutoHandle *
-GNUNET_NAT_autoconfig_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
- GNUNET_NAT_AutoResultCallback cb,
- void *cb_cls)
-{
- struct GNUNET_NAT_AutoHandle *ah = GNUNET_new (struct GNUNET_NAT_AutoHandle);
-
- ah->cfg = cfg;
- ah->arc = cb;
- ah->arc_cls = cb_cls;
- GNUNET_break (0);
- return ah;
+ if (NULL != nh->reconnect_task)
+ {
+ GNUNET_SCHEDULER_cancel (nh->reconnect_task);
+ nh->reconnect_task = NULL;
+ }
+ GNUNET_free (nh->reg);
+ GNUNET_free (nh);
}
-/**
- * Abort autoconfiguration.
- *
- * @param ah handle for operation to abort
- */
-void
-GNUNET_NAT_autoconfig_cancel (struct GNUNET_NAT_AutoHandle *ah)
-{
- GNUNET_break (0);
- GNUNET_MQ_destroy (ah->mq);
- GNUNET_free (ah);
-}
-
/* end of nat_api.c */