comparison src/stun.c @ 11429:835dbb1b3337

[gaim-migrate @ 13666] use async dns committer: Tailor Script <[e-mail]>

11428:c39a48818f66

#include "internal.h"

#include "debug.h"
#include "account.h"
#include "dnssrv.h"
#include "stun.h"
#include "prefs.h"

struct stun_nattype nattype = {-1, 0, "\0"};

		gaim_timeout_remove(timeout);
		nattype.type = 2;
	}
}

static void do_test1(struct srv_response *resp, int results, gpointer sdata) {
	char *servername = (char*)sdata;
	static struct stun_header data;
	int port = 3478;
	int ret;
	struct hostent *host;
	
	if(results) {
		servername = resp[0].hostname;
		port = resp[0].port;
	}
	gaim_debug_info("stun", "got %d SRV responses, server: %s, port: %d\n", results, servername, port);

	host = gethostbyname(servername);
	if(!host->h_addr_list) {
		return;
	}

	if((fd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
		nattype.status = 0;
		do_callbacks();
		return;

		nattype.status = 0;
                do_callbacks();
		return;
	}
	incb = gaim_input_add(fd, GAIM_INPUT_READ, reply_cb, NULL);
	
	addr.sin_family = AF_INET;
	addr.sin_port = htons(port);
	memcpy(&addr.sin_addr.s_addr,*(host->h_addr_list),4);

	data.type = htons(0x0001);
	data.len = 0;
	data.transid[0] = rand();
	data.transid[1] = ntohl(((int)'g' << 24) + ((int)'a' << 16) + ((int)'i' << 8) + (int)'m');
	data.transid[2] = rand();

	}
	test = 1;
	packet = &data;
	packetsize = sizeof(struct stun_header);
	timeout = gaim_timeout_add(500, (GSourceFunc)timeoutfunc, NULL);
	g_free(resp);
}

struct stun_nattype *gaim_stun_discover(StunCallback cb) {
	const char *servername = gaim_prefs_get_string("/core/network/stun_server");

	gaim_debug_info("stun", "using server %s\n", servername);
	if(nattype.status == 1) { /* currently discovering */
		if(cb) callbacks = g_slist_append(callbacks, cb);
		return NULL;

11429:835dbb1b3337

#include "internal.h"

#include "debug.h"
#include "account.h"
#include "dnssrv.h"
#include "proxy.h"
#include "stun.h"
#include "prefs.h"

struct stun_nattype nattype = {-1, 0, "\0"};

		gaim_timeout_remove(timeout);
		nattype.type = 2;
	}
}

static void hbn_cb(GSList *hosts, gpointer edata, const char *error_message) {
	static struct stun_header data;
	int ret;

	if(!hosts) return;
	if(!hosts->data) return;

	if((fd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
		nattype.status = 0;
		do_callbacks();
		return;

		nattype.status = 0;
                do_callbacks();
		return;
	}
	incb = gaim_input_add(fd, GAIM_INPUT_READ, reply_cb, NULL);

	ret = GPOINTER_TO_INT(hosts->data);
	hosts = g_slist_remove(hosts, hosts->data);
	memcpy(&addr, hosts->data, sizeof(struct sockaddr_in));
	g_free(hosts->data);
	hosts = g_slist_remove(hosts, hosts->data);
	while(hosts) {
		hosts = g_slist_remove(hosts, hosts->data);
		g_free(hosts->data);
		hosts = g_slist_remove(hosts, hosts->data);
	}
		
	data.type = htons(0x0001);
	data.len = 0;
	data.transid[0] = rand();
	data.transid[1] = ntohl(((int)'g' << 24) + ((int)'a' << 16) + ((int)'i' << 8) + (int)'m');
	data.transid[2] = rand();

	}
	test = 1;
	packet = &data;
	packetsize = sizeof(struct stun_header);
	timeout = gaim_timeout_add(500, (GSourceFunc)timeoutfunc, NULL);
}

static void do_test1(struct srv_response *resp, int results, gpointer sdata) {
	char *servername = (char*)sdata;
	int port = 3478;
	
	if(results) {
		servername = resp[0].hostname;
		port = resp[0].port;
	}
	gaim_debug_info("stun", "got %d SRV responses, server: %s, port: %d\n", results, servername, port);

	gaim_gethostbyname_async(servername, port, hbn_cb, NULL);
	g_free(resp);
}

struct stun_nattype *gaim_stun_discover(StunCallback cb) {
	char *servername = (char*)gaim_prefs_get_string("/core/network/stun_server");

	gaim_debug_info("stun", "using server %s\n", servername);
	if(nattype.status == 1) { /* currently discovering */
		if(cb) callbacks = g_slist_append(callbacks, cb);
		return NULL;