summaryrefslogtreecommitdiff
path: root/src/nat/nat_stun.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/nat/nat_stun.c')
-rw-r--r--src/nat/nat_stun.c553
1 files changed, 305 insertions, 248 deletions
diff --git a/src/nat/nat_stun.c b/src/nat/nat_stun.c
index 9419074a7..5e502c29e 100644
--- a/src/nat/nat_stun.c
+++ b/src/nat/nat_stun.c
@@ -48,6 +48,7 @@
#define LOG(kind,...) GNUNET_log_from (kind, "stun", __VA_ARGS__)
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 15)
/**
@@ -55,28 +56,44 @@
* the request prior to the timeout or successful execution. Also
* used to track our internal state for the request.
*/
-struct GNUNET_NAT_StunRequestHandle {
+struct GNUNET_NAT_STUN_Handle {
- /**
- * Handle to a pending DNS lookup request.
- */
- struct GNUNET_RESOLVER_RequestHandle *dns_active;
+ /**
+ * Handle to a pending DNS lookup request.
+ */
+ struct GNUNET_RESOLVER_RequestHandle *dns_active;
- /**
- * Handle to the listen socket
- */
- struct GNUNET_NETWORK_Handle * sock;
+ /**
+ * Handle to the listen socket
+ */
+ struct GNUNET_NETWORK_Handle * sock;
+
+ /**
+ * Stun server address
+ */
+ char *stun_server ;
+
+ /**
+ * STUN port
+ */
+ int stun_port;
- /**
- * Stun server address
+ /**
+ * Function to call when a error occours
+ */
+ GNUNET_NAT_stun_RequestCallback cb;
+
+ /**
+ * Closure for @e cb.
*/
- char *stun_server ;
+ void *cb_cls;
- /**
- * STUN port
+ /**
+ * Do we got a DNS resolution successfully ?
*/
- int stun_port;
+ int dns_success;
+
};
@@ -84,7 +101,7 @@ struct GNUNET_NAT_StunRequestHandle {
/* here we store credentials extracted from a message */
struct StunState {
- uint16_t attr;
+ uint16_t attr;
};
@@ -96,7 +113,7 @@ struct StunState {
*/
static int decode_class(int msg)
{
- return ((msg & 0x0010) >> 4) | ((msg & 0x0100) >> 7);
+ return ((msg & 0x0010) >> 4) | ((msg & 0x0100) >> 7);
}
/**
@@ -107,7 +124,7 @@ static int decode_class(int msg)
*/
static int decode_method(int msg)
{
- return (msg & 0x000f) | ((msg & 0x00e0) >> 1) | ((msg & 0x3e00) >> 2);
+ return (msg & 0x000f) | ((msg & 0x00e0) >> 1) | ((msg & 0x3e00) >> 2);
}
/**
@@ -119,8 +136,8 @@ static int decode_method(int msg)
*/
static int encode_message(StunClasses msg_class, StunMethods method)
{
- return ((msg_class & 1) << 4) | ((msg_class & 2) << 7) |
- (method & 0x000f) | ((method & 0x0070) << 1) | ((method & 0x0f800) << 2);
+ return ((msg_class & 1) << 4) | ((msg_class & 2) << 7) |
+ (method & 0x000f) | ((method & 0x0070) << 1) | ((method & 0x0f800) << 2);
}
/**
@@ -132,41 +149,41 @@ static int encode_message(StunClasses msg_class, StunMethods method)
static const char *stun_msg2str(int msg)
{
- const struct { enum StunClasses value; const char *name; } classes[] = {
- { STUN_REQUEST, "Request" },
- { STUN_INDICATION, "Indication" },
- { STUN_RESPONSE, "Response" },
- { STUN_ERROR_RESPONSE, "Error Response" },
- { 0, NULL }
- };
-
- const struct { enum StunMethods value; const char *name; } methods[] = {
- { STUN_BINDING, "Binding" },
- { 0, NULL }
- };
-
- static char result[32];
- const char *msg_class = NULL;
- const char *method = NULL;
- int i;
- int value;
-
- value = decode_class(msg);
- for (i = 0; classes[i].name; i++) {
- msg_class = classes[i].name;
- if (classes[i].value == value)
- break;
- }
- value = decode_method(msg);
- for (i = 0; methods[i].name; i++) {
- method = methods[i].name;
- if (methods[i].value == value)
- break;
- }
- snprintf(result, sizeof(result), "%s %s",
- method ? : "Unknown Method",
- msg_class ? : "Unknown Class Message");
- return result;
+ const struct { enum StunClasses value; const char *name; } classes[] = {
+ { STUN_REQUEST, "Request" },
+ { STUN_INDICATION, "Indication" },
+ { STUN_RESPONSE, "Response" },
+ { STUN_ERROR_RESPONSE, "Error Response" },
+ { 0, NULL }
+ };
+
+ const struct { enum StunMethods value; const char *name; } methods[] = {
+ { STUN_BINDING, "Binding" },
+ { 0, NULL }
+ };
+
+ static char result[32];
+ const char *msg_class = NULL;
+ const char *method = NULL;
+ int i;
+ int value;
+
+ value = decode_class(msg);
+ for (i = 0; classes[i].name; i++) {
+ msg_class = classes[i].name;
+ if (classes[i].value == value)
+ break;
+ }
+ value = decode_method(msg);
+ for (i = 0; methods[i].name; i++) {
+ method = methods[i].name;
+ if (methods[i].value == value)
+ break;
+ }
+ snprintf(result, sizeof(result), "%s %s",
+ method ? : "Unknown Method",
+ msg_class ? : "Unknown Class Message");
+ return result;
}
/**
@@ -177,35 +194,35 @@ static const char *stun_msg2str(int msg)
*/
static const char *stun_attr2str(int msg)
{
- const struct { enum StunAttributes value; const char *name; } attrs[] = {
- { STUN_MAPPED_ADDRESS, "Mapped Address" },
- { STUN_RESPONSE_ADDRESS, "Response Address" },
- { STUN_CHANGE_ADDRESS, "Change Address" },
- { STUN_SOURCE_ADDRESS, "Source Address" },
- { STUN_CHANGED_ADDRESS, "Changed Address" },
- { STUN_USERNAME, "Username" },
- { STUN_PASSWORD, "Password" },
- { STUN_MESSAGE_INTEGRITY, "Message Integrity" },
- { STUN_ERROR_CODE, "Error Code" },
- { STUN_UNKNOWN_ATTRIBUTES, "Unknown Attributes" },
- { STUN_REFLECTED_FROM, "Reflected From" },
- { STUN_REALM, "Realm" },
- { STUN_NONCE, "Nonce" },
- { STUN_XOR_MAPPED_ADDRESS, "XOR Mapped Address" },
- { STUN_MS_VERSION, "MS Version" },
- { STUN_MS_XOR_MAPPED_ADDRESS, "MS XOR Mapped Address" },
- { STUN_SOFTWARE, "Software" },
- { STUN_ALTERNATE_SERVER, "Alternate Server" },
- { STUN_FINGERPRINT, "Fingerprint" },
- { 0, NULL }
- };
- int i;
-
- for (i = 0; attrs[i].name; i++) {
- if (attrs[i].value == msg)
- return attrs[i].name;
- }
- return "Unknown Attribute";
+ const struct { enum StunAttributes value; const char *name; } attrs[] = {
+ { STUN_MAPPED_ADDRESS, "Mapped Address" },
+ { STUN_RESPONSE_ADDRESS, "Response Address" },
+ { STUN_CHANGE_ADDRESS, "Change Address" },
+ { STUN_SOURCE_ADDRESS, "Source Address" },
+ { STUN_CHANGED_ADDRESS, "Changed Address" },
+ { STUN_USERNAME, "Username" },
+ { STUN_PASSWORD, "Password" },
+ { STUN_MESSAGE_INTEGRITY, "Message Integrity" },
+ { STUN_ERROR_CODE, "Error Code" },
+ { STUN_UNKNOWN_ATTRIBUTES, "Unknown Attributes" },
+ { STUN_REFLECTED_FROM, "Reflected From" },
+ { STUN_REALM, "Realm" },
+ { STUN_NONCE, "Nonce" },
+ { STUN_XOR_MAPPED_ADDRESS, "XOR Mapped Address" },
+ { STUN_MS_VERSION, "MS Version" },
+ { STUN_MS_XOR_MAPPED_ADDRESS, "MS XOR Mapped Address" },
+ { STUN_SOFTWARE, "Software" },
+ { STUN_ALTERNATE_SERVER, "Alternate Server" },
+ { STUN_FINGERPRINT, "Fingerprint" },
+ { 0, NULL }
+ };
+ int i;
+
+ for (i = 0; attrs[i].name; i++) {
+ if (attrs[i].value == msg)
+ return attrs[i].name;
+ }
+ return "Unknown Attribute";
}
@@ -219,22 +236,22 @@ static const char *stun_attr2str(int msg)
*/
static int stun_process_attr(struct StunState *state, struct stun_attr *attr)
{
- LOG (GNUNET_ERROR_TYPE_INFO,
- "Found STUN Attribute %s (%04x), length %d\n",
- stun_attr2str(ntohs(attr->attr)), ntohs(attr->attr), ntohs(attr->len));
-
- switch (ntohs(attr->attr)) {
- case STUN_MAPPED_ADDRESS:
- case STUN_XOR_MAPPED_ADDRESS:
- case STUN_MS_XOR_MAPPED_ADDRESS:
- break;
- default:
- LOG (GNUNET_ERROR_TYPE_INFO,
- "Ignoring STUN Attribute %s (%04x), length %d\n",
- stun_attr2str(ntohs(attr->attr)), ntohs(attr->attr), ntohs(attr->len));
-
- }
- return 0;
+ LOG (GNUNET_ERROR_TYPE_INFO,
+ "Found STUN Attribute %s (%04x), length %d\n",
+ stun_attr2str(ntohs(attr->attr)), ntohs(attr->attr), ntohs(attr->len));
+
+ switch (ntohs(attr->attr)) {
+ case STUN_MAPPED_ADDRESS:
+ case STUN_XOR_MAPPED_ADDRESS:
+ case STUN_MS_XOR_MAPPED_ADDRESS:
+ break;
+ default:
+ LOG (GNUNET_ERROR_TYPE_INFO,
+ "Ignoring STUN Attribute %s (%04x), length %d\n",
+ stun_attr2str(ntohs(attr->attr)), ntohs(attr->attr), ntohs(attr->len));
+
+ }
+ return 0;
}
@@ -247,11 +264,11 @@ static int stun_process_attr(struct StunState *state, struct stun_attr *attr)
static void
generate_request_id(struct stun_header *req)
{
- int x;
- req->magic = htonl(STUN_MAGIC_COOKIE);
- for (x = 0; x < 3; x++)
- req->id.id[x] = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_NONCE,
- UINT32_MAX);
+ int x;
+ req->magic = htonl(STUN_MAGIC_COOKIE);
+ for (x = 0; x < 3; x++)
+ req->id.id[x] = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_NONCE,
+ UINT32_MAX);
}
@@ -295,6 +312,8 @@ stun_get_mapped(struct StunState *st, struct stun_attr *attr,struct sockaddr_in
}
st->attr = type;
+ /*TODO: Detect Family*/
+ sa->sin_family = AF_INET;
sa->sin_port = returned_addr->port ^ htons(ntohl(magic) >> 16);
sa->sin_addr.s_addr = returned_addr->addr ^ magic;
return 0;
@@ -312,94 +331,109 @@ stun_get_mapped(struct StunState *st, struct stun_attr *attr,struct sockaddr_in
* @param len, the length of the packet
* @param arg, sockaddr_in where we will set our discovered packet
*
- * @return, 0 on OK, -1 if the packet is invalid ( not a stun packet)
+ * @return, GNUNET_OK on OK, GNUNET_NO if the packet is invalid ( not a stun packet)
*/
int
GNUNET_NAT_stun_handle_packet(const uint8_t *data, size_t len,struct sockaddr_in *arg)
{
- struct stun_header *hdr = (struct stun_header *)data;
- struct stun_attr *attr;
- struct StunState st;
- int ret = STUN_IGNORE;
-
- uint32_t advertised_message_size;
- uint32_t message_magic_cookie;
-
-
- /* On entry, 'len' is the length of the udp payload. After the
- * initial checks it becomes the size of unprocessed options,
- * while 'data' is advanced accordingly.
- */
- if (len < sizeof(struct stun_header)) {
- LOG (GNUNET_ERROR_TYPE_INFO,
- "STUN packet too short (only %d, wanting at least %d)\n", (int) len, (int) sizeof(struct stun_header));
- GNUNET_break_op (0);
- return -1;
- }
- /* Skip header as it is already in hdr */
- len -= sizeof(struct stun_header);
- data += sizeof(struct stun_header);
-
- /* len as advertised in the message */
- advertised_message_size = ntohs(hdr->msglen);
-
- message_magic_cookie = ntohl(hdr->magic);
- /* Compare if the cookie match */
- if(STUN_MAGIC_COOKIE != message_magic_cookie){
- LOG (GNUNET_ERROR_TYPE_INFO,
- "Invalid magic cookie \n");
- GNUNET_break_op (0);
- return -1;
- }
-
-
- LOG (GNUNET_ERROR_TYPE_INFO, "STUN Packet, msg %s (%04x), length: %d\n", stun_msg2str(ntohs(hdr->msgtype)), ntohs(hdr->msgtype), advertised_message_size);
-
-
- if (advertised_message_size > len) {
- LOG (GNUNET_ERROR_TYPE_INFO, "Scrambled STUN packet length (got %d, expecting %d)\n", advertised_message_size, (int)len);
- GNUNET_break_op (0);
- return -1;
- } else {
- len = advertised_message_size;
- }
- /* Zero the struct */
- memset(&st,0, sizeof(st));
-
- while (len > 0) {
- if (len < sizeof(struct stun_attr)) {
- LOG (GNUNET_ERROR_TYPE_INFO, "Attribute too short (got %d, expecting %d)\n", (int)len, (int) sizeof(struct stun_attr));
- GNUNET_break_op (0);
- break;
- }
- attr = (struct stun_attr *)data;
-
- /* compute total attribute length */
- advertised_message_size = ntohs(attr->len) + sizeof(struct stun_attr);
-
- /* Check if we still have space in our buffer */
- if (advertised_message_size > len ) {
- LOG (GNUNET_ERROR_TYPE_INFO, "Inconsistent Attribute (length %d exceeds remaining msg len %d)\n", advertised_message_size, (int)len);
- GNUNET_break_op (0);
- break;
- }
-
-
- stun_get_mapped(&st, attr, arg, hdr->magic);
-
- if (stun_process_attr(&st, attr)) {
- LOG (GNUNET_ERROR_TYPE_INFO, "Failed to handle attribute %s (%04x)\n", stun_attr2str(ntohs(attr->attr)), ntohs(attr->attr));
- break;
- }
- /* Clear attribute id: in case previous entry was a string,
- * this will act as the terminator for the string.
- */
- attr->attr = 0;
- data += advertised_message_size;
- len -= advertised_message_size;
- }
-
- return ret;
+ struct stun_header *hdr = (struct stun_header *)data;
+ struct stun_attr *attr;
+ struct StunState st;
+ int ret = GNUNET_OK;
+
+ uint32_t advertised_message_size;
+ uint32_t message_magic_cookie;
+
+
+ /* On entry, 'len' is the length of the udp payload. After the
+ * initial checks it becomes the size of unprocessed options,
+ * while 'data' is advanced accordingly.
+ */
+ if (len < sizeof(struct stun_header)) {
+ LOG (GNUNET_ERROR_TYPE_INFO,
+ "STUN packet too short (only %d, wanting at least %d)\n", (int) len, (int) sizeof(struct stun_header));
+ GNUNET_break_op (0);
+ return GNUNET_NO;
+ }
+ /* Skip header as it is already in hdr */
+ len -= sizeof(struct stun_header);
+ data += sizeof(struct stun_header);
+
+ /* len as advertised in the message */
+ advertised_message_size = ntohs(hdr->msglen);
+
+ message_magic_cookie = ntohl(hdr->magic);
+ /* Compare if the cookie match */
+ if(STUN_MAGIC_COOKIE != message_magic_cookie){
+ LOG (GNUNET_ERROR_TYPE_INFO,
+ "Invalid magic cookie \n");
+ GNUNET_break_op (0);
+ return GNUNET_NO;
+ }
+
+
+ LOG (GNUNET_ERROR_TYPE_INFO, "STUN Packet, msg %s (%04x), length: %d\n", stun_msg2str(ntohs(hdr->msgtype)), ntohs(hdr->msgtype), advertised_message_size);
+
+
+ if (advertised_message_size > len) {
+ LOG (GNUNET_ERROR_TYPE_INFO, "Scrambled STUN packet length (got %d, expecting %d)\n", advertised_message_size, (int)len);
+ GNUNET_break_op (0);
+ return GNUNET_NO;
+ } else {
+ len = advertised_message_size;
+ }
+ /* Zero the struct */
+ memset(&st,0, sizeof(st));
+
+ while (len > 0) {
+ if (len < sizeof(struct stun_attr)) {
+ LOG (GNUNET_ERROR_TYPE_INFO, "Attribute too short (got %d, expecting %d)\n", (int)len, (int) sizeof(struct stun_attr));
+ GNUNET_break_op (0);
+ break;
+ }
+ attr = (struct stun_attr *)data;
+
+ /* compute total attribute length */
+ advertised_message_size = ntohs(attr->len) + sizeof(struct stun_attr);
+
+ /* Check if we still have space in our buffer */
+ if (advertised_message_size > len ) {
+ LOG (GNUNET_ERROR_TYPE_INFO, "Inconsistent Attribute (length %d exceeds remaining msg len %d)\n", advertised_message_size, (int)len);
+ GNUNET_break_op (0);
+ break;
+ }
+
+
+ stun_get_mapped(&st, attr, arg, hdr->magic);
+
+ if (stun_process_attr(&st, attr)) {
+ LOG (GNUNET_ERROR_TYPE_INFO, "Failed to handle attribute %s (%04x)\n", stun_attr2str(ntohs(attr->attr)), ntohs(attr->attr));
+ break;
+ }
+ /** Clear attribute id: in case previous entry was a string,
+ * this will act as the terminator for the string.
+ **/
+ attr->attr = 0;
+ data += advertised_message_size;
+ len -= advertised_message_size;
+ ret = GNUNET_OK;
+ }
+
+ return ret;
+}
+
+
+
+/**
+ * Clean-up used memory
+ *
+ * @param cls our `struct GNUNET_NAT_STUN_Handle *`
+ */
+void clean(struct GNUNET_NAT_STUN_Handle * handle)
+{
+ GNUNET_free(handle->stun_server);
+ GNUNET_free(handle);
+
}
@@ -407,97 +441,120 @@ GNUNET_NAT_stun_handle_packet(const uint8_t *data, size_t len,struct sockaddr_in
/**
* Try to establish a connection given the specified address.
*
- * @param cls our `struct GNUNET_NAT_StunRequestHandle *`
+ * @param cls our `struct GNUNET_NAT_STUN_Handle *`
* @param addr address to try, NULL for "last call"
* @param addrlen length of @a addr
*/
static void
stun_dns_callback (void *cls,
- const struct sockaddr *addr,
- socklen_t addrlen) {
+ const struct sockaddr *addr,
+ socklen_t addrlen) {
+
+
+ struct GNUNET_NAT_STUN_Handle *request = cls;
+ struct stun_header *req;
+ uint8_t reqdata[1024];
+ int reqlen;
+ struct sockaddr_in server;
- struct GNUNET_NAT_StunRequestHandle *request = cls;
- struct stun_header *req;
- uint8_t reqdata[1024];
- int reqlen;
- struct sockaddr_in server;
+ if(NULL == request) {
- if(NULL == request) {
- LOG (GNUNET_ERROR_TYPE_INFO, "Empty request\n");
- /* FIXME clean up ? */
- return;
- }
+ if( GNUNET_NO == request->dns_success){
+ LOG (GNUNET_ERROR_TYPE_INFO, "Empty request\n");
+ clean(request);
+ request->cb(request->cb_cls, GNUNET_NAT_ERROR_INTERNAL_NETWORK_ERROR);
+ }
+ return;
+ }
- if (NULL == addr) {
- request->dns_active = NULL;
- LOG (GNUNET_ERROR_TYPE_INFO, "Error resolving host %s\n", request->stun_server);
- /* FIXME clean up? */
- return;
- }
+ if (NULL == addr) {
+ request->dns_active = NULL;
+ if( GNUNET_NO == request->dns_success){
+ LOG (GNUNET_ERROR_TYPE_INFO, "Error resolving host %s\n", request->stun_server);
+ clean(request);
+ request->cb(request->cb_cls, GNUNET_NAT_ERROR_INTERNAL_NETWORK_ERROR);
+ }
- memset(&server,0, sizeof(server));
- server.sin_family = AF_INET;
- server.sin_addr = ((struct sockaddr_in *)addr)->sin_addr;
- server.sin_port = htons(request->stun_port);
+ return;
+ }
- /*Craft the simplest possible STUN packet. A request binding*/
- req = (struct stun_header *)reqdata;
- generate_request_id(req);
- reqlen = 0;
- req->msgtype = 0;
- req->msglen = 0;
- req->msglen = htons(reqlen);
- req->msgtype = htons(encode_message(STUN_REQUEST, STUN_BINDING));
+ request->dns_success= GNUNET_YES;
+ memset(&server,0, sizeof(server));
+ server.sin_family = AF_INET;
+ server.sin_addr = ((struct sockaddr_in *)addr)->sin_addr;
+ server.sin_port = htons(request->stun_port);
+
+
+ /*Craft the simplest possible STUN packet. A request binding*/
+ req = (struct stun_header *)reqdata;
+ generate_request_id(req);
+ reqlen = 0;
+ req->msgtype = 0;
+ req->msglen = 0;
+ req->msglen = htons(reqlen);
+ req->msgtype = htons(encode_message(STUN_REQUEST, STUN_BINDING));
+
+ /* Send the packet */
+ if (-1 == GNUNET_NETWORK_socket_sendto (request->sock, req, ntohs(req->msglen) + sizeof(*req),
+ (const struct sockaddr *) &server, sizeof (server)))
+ {
+ GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "Fail to sendto");
+ clean(request);
+ request->cb(request->cb_cls, GNUNET_NAT_ERROR_INTERNAL_NETWORK_ERROR);
+ return;
+ }
- /* Send the packet */
- if (-1 == GNUNET_NETWORK_socket_sendto (request->sock, req, ntohs(req->msglen) + sizeof(*req),
- (const struct sockaddr *) &server, sizeof (server)))
- {
- GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "Fail to sendto");
- }
}
+
+
+
/**
* Make Generic STUN request and
* Send a generic stun request to the server specified using the specified socket.
* possibly waiting for a reply and filling the 'reply' field with
* the externally visible address.
- *c
+ *
* @param server, the address of the stun server
* @param port, port of the stun server
* @param sock the socket used to send the request
- * @return GNUNET_NAT_StunRequestHandle on success, NULL on error.
+ * @return GNUNET_NAT_STUN_Handle on success, NULL on error.
*/
-struct GNUNET_NAT_StunRequestHandle *
-GNUNET_NAT_stun_make_request(char * server, int port, struct GNUNET_NETWORK_Handle * sock)
+struct GNUNET_NAT_STUN_Handle *
+GNUNET_NAT_stun_make_request(char * server, int port,
+ struct GNUNET_NETWORK_Handle * sock,GNUNET_NAT_stun_RequestCallback cb,
+ void *cb_cls)
{
- struct GNUNET_NAT_StunRequestHandle *rh;
+ struct GNUNET_NAT_STUN_Handle *rh;
+
+ rh = GNUNET_malloc (sizeof (struct GNUNET_NAT_STUN_Handle));
+ rh->sock = sock;
- rh = GNUNET_malloc (sizeof (struct GNUNET_NAT_StunRequestHandle));
- rh->sock = sock;
+ char * server_copy = GNUNET_strdup (server);
- char * server_copy = GNUNET_malloc (1 + strlen (server));
- if (server_copy) {
- strcpy (server_copy, server);
- }else{
- GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "Failed to allocate string");
- /* FIXME: cleanup rh? */
- return NULL;
- }
+ rh->cb = cb;
+ rh->cb_cls = cb_cls;
+ rh->stun_server = server_copy;
+ rh->stun_port = port;
+ rh->dns_success = GNUNET_NO;
+
+ rh->dns_active = GNUNET_RESOLVER_ip_get (server_copy, AF_INET,
+ TIMEOUT,
+ &stun_dns_callback, rh);
+
+ if(rh->dns_active == NULL)
+ {
+ GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "Failed DNS");
+ return NULL;
+ }
- rh->stun_server = server_copy;
- rh->stun_port = port;
- rh->dns_active = GNUNET_RESOLVER_ip_get (rh->stun_server, AF_INET,
- GNUNET_CONNECTION_CONNECT_RETRY_TIMEOUT,
- &stun_dns_callback, rh);
- /* FIXME: error handling NULL==dns_active, callback function? */
- return rh;
+ return rh;
}