comparison libpurple/stun.c @ 32010:ce968e115c95

propagate from branch 'im.pidgin.cpw.masca.p2p' (head 33ca865dacb9e5bcf763d06f6a42cbaca337cc64) to branch 'im.pidgin.pidgin' (head 92f47f4e8b0cbb107fd97e1ab814d1cedbf109ad)
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Fri, 06 May 2011 06:25:14 +0000
parents b671728e6ee9
children 0d94c49f9545
comparison
equal deleted inserted replaced
32009:f021d93a1f9b 32010:ce968e115c95
363 port = resp[0].port; 363 port = resp[0].port;
364 } 364 }
365 purple_debug_info("stun", "got %d SRV responses, server: %s, port: %d\n", 365 purple_debug_info("stun", "got %d SRV responses, server: %s, port: %d\n",
366 results, servername, port); 366 results, servername, port);
367 367
368 purple_dnsquery_a(servername, port, hbn_cb, NULL); 368 purple_dnsquery_a_account(NULL, servername, port, hbn_cb, NULL);
369 g_free(resp); 369 g_free(resp);
370 } 370 }
371 371
372 static gboolean call_callback(gpointer data) { 372 static gboolean call_callback(gpointer data) {
373 StunCallback cb = data; 373 StunCallback cb = data;
422 nattype.publicip[0] = '\0'; 422 nattype.publicip[0] = '\0';
423 g_free(nattype.servername); 423 g_free(nattype.servername);
424 nattype.servername = g_strdup(servername); 424 nattype.servername = g_strdup(servername);
425 425
426 callbacks = g_slist_append(callbacks, cb); 426 callbacks = g_slist_append(callbacks, cb);
427 purple_srv_resolve("stun", "udp", servername, do_test1, 427 purple_srv_resolve_account(NULL, "stun", "udp", servername, do_test1,
428 (gpointer) servername); 428 (gpointer) servername);
429 429
430 return &nattype; 430 return &nattype;
431 } 431 }
432 432