Mercurial > pidgin
comparison libpurple/protocols/jabber/google.c @ 28039:ed30bc20442c
jabber: Simplify; js is the callback data and can't be NULL.
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Fri, 21 Aug 2009 20:47:47 +0000 |
| parents | 76c0969e3ea7 |
| children | 98d8c11e4937 |
comparison
equal
deleted
inserted
replaced
| 28038:76c0969e3ea7 | 28039:ed30bc20442c |
|---|---|
| 1333 inet_ntop(addr->sa_family, &((struct sockaddr_in *) addr)->sin_addr, | 1333 inet_ntop(addr->sa_family, &((struct sockaddr_in *) addr)->sin_addr, |
| 1334 dst, sizeof(dst)); | 1334 dst, sizeof(dst)); |
| 1335 port = ntohs(((struct sockaddr_in *) addr)->sin_port); | 1335 port = ntohs(((struct sockaddr_in *) addr)->sin_port); |
| 1336 } | 1336 } |
| 1337 | 1337 |
| 1338 if (js) { | 1338 if (js->stun_ip) |
| 1339 if (js->stun_ip) { | 1339 g_free(js->stun_ip); |
| 1340 g_free(js->stun_ip); | 1340 js->stun_ip = g_strdup(dst); |
| 1341 } | 1341 js->stun_port = port; |
| 1342 js->stun_ip = g_strdup(dst); | 1342 |
| 1343 purple_debug_info("jabber", "set Google STUN IP address: %s\n", dst); | 1343 purple_debug_info("jabber", "set Google STUN IP/port address: " |
| 1344 js->stun_port = port; | 1344 "%s:%d\n", dst, port); |
| 1345 purple_debug_info("jabber", "set Google STUN port: %d\n", port); | 1345 |
| 1346 purple_debug_info("jabber", "set Google STUN port: %d\n", port); | 1346 /* unmark ongoing query */ |
| 1347 /* unmark ongoing query */ | 1347 js->stun_query = NULL; |
| 1348 js->stun_query = NULL; | |
| 1349 } | |
| 1350 } | 1348 } |
| 1351 | 1349 |
| 1352 while (hosts != NULL) { | 1350 while (hosts != NULL) { |
| 1353 hosts = g_slist_delete_link(hosts, hosts); | 1351 hosts = g_slist_delete_link(hosts, hosts); |
| 1354 /* Free the address */ | 1352 /* Free the address */ |