Mercurial > pidgin.yaz

comparison libpurple/network.c @ 31534:a8cc50c2279f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove trailing whitespace
author Richard Laager <rlaager@wiktel.com>
date Tue, 04 Jan 2011 06:55:30 +0000
parents 18d56b13fe8b
children f5a18dd894cc
comparison
equal deleted inserted replaced
31533:44f53d3fc54f 31534:a8cc50c2279f
269 if (ifr->ifr_addr.sa_family == AF_INET) { 269 if (ifr->ifr_addr.sa_family == AF_INET) {
270 struct sockaddr_in *sinptr = (struct sockaddr_in *)&ifr->ifr_addr; 270 struct sockaddr_in *sinptr = (struct sockaddr_in *)&ifr->ifr_addr;
271 271
272 inet_ntop(AF_INET, &sinptr->sin_addr, dst, 272 inet_ntop(AF_INET, &sinptr->sin_addr, dst,
273 sizeof(dst)); 273 sizeof(dst));
274 purple_debug_info("network", 274 purple_debug_info("network",
275 "found local i/f with address %s on IPv4\n", dst); 275 "found local i/f with address %s on IPv4\n", dst);
276 if (!purple_strequal(dst, "127.0.0.1")) { 276 if (!purple_strequal(dst, "127.0.0.1")) {
277 result = g_list_append(result, g_strdup(dst)); 277 result = g_list_append(result, g_strdup(dst));
278 } 278 }
279 } 279 }
871 offline */ 871 offline */
872 purple_network_set_stun_server( 872 purple_network_set_stun_server(
873 purple_prefs_get_string("/purple/network/stun_server")); 873 purple_prefs_get_string("/purple/network/stun_server"));
874 purple_network_set_turn_server( 874 purple_network_set_turn_server(
875 purple_prefs_get_string("/purple/network/turn_server")); 875 purple_prefs_get_string("/purple/network/turn_server"));
876 876
877 if (ui_ops != NULL && ui_ops->network_connected != NULL) 877 if (ui_ops != NULL && ui_ops->network_connected != NULL)
878 ui_ops->network_connected(); 878 ui_ops->network_connected();
879 break; 879 break;
880 case NM_STATE_ASLEEP: 880 case NM_STATE_ASLEEP:
881 case NM_STATE_CONNECTING: 881 case NM_STATE_CONNECTING:
934 } 934 }
935 935
936 #endif 936 #endif
937 937
938 static void 938 static void
939 purple_network_ip_lookup_cb(GSList *hosts, gpointer data, 939 purple_network_ip_lookup_cb(GSList *hosts, gpointer data,
940 const char *error_message) 940 const char *error_message)
941 { 941 {
942 const gchar **ip = (const gchar **) data; 942 const gchar **ip = (const gchar **) data;
943 943
944 if (error_message) { 944 if (error_message) {
945 purple_debug_error("network", "lookup of IP address failed: %s\n", 945 purple_debug_error("network", "lookup of IP address failed: %s\n",
946 error_message); 946 error_message);
947 g_slist_free(hosts); 947 g_slist_free(hosts);
948 return; 948 return;
949 } 949 }
950 950
951 if (hosts && g_slist_next(hosts)) { 951 if (hosts && g_slist_next(hosts)) {
952 struct sockaddr *addr = g_slist_next(hosts)->data; 952 struct sockaddr *addr = g_slist_next(hosts)->data;
953 char dst[INET6_ADDRSTRLEN]; 953 char dst[INET6_ADDRSTRLEN];
954 954
955 if (addr->sa_family == AF_INET6) { 955 if (addr->sa_family == AF_INET6) {
956 inet_ntop(addr->sa_family, &((struct sockaddr_in6 *) addr)->sin6_addr, 956 inet_ntop(addr->sa_family, &((struct sockaddr_in6 *) addr)->sin6_addr,
957 dst, sizeof(dst)); 957 dst, sizeof(dst));
958 } else { 958 } else {
959 inet_ntop(addr->sa_family, &((struct sockaddr_in *) addr)->sin_addr, 959 inet_ntop(addr->sa_family, &((struct sockaddr_in *) addr)->sin_addr,
960 dst, sizeof(dst)); 960 dst, sizeof(dst));
961 } 961 }
962 962
963 *ip = g_strdup(dst); 963 *ip = g_strdup(dst);
964 purple_debug_info("network", "set IP address: %s\n", *ip); 964 purple_debug_info("network", "set IP address: %s\n", *ip);
979 if (purple_network_is_available()) { 979 if (purple_network_is_available()) {
980 purple_debug_info("network", "running DNS query for STUN server\n"); 980 purple_debug_info("network", "running DNS query for STUN server\n");
981 purple_dnsquery_a(stun_server, 3478, purple_network_ip_lookup_cb, 981 purple_dnsquery_a(stun_server, 3478, purple_network_ip_lookup_cb,
982 &stun_ip); 982 &stun_ip);
983 } else { 983 } else {
984 purple_debug_info("network", 984 purple_debug_info("network",
985 "network is unavailable, don't try to update STUN IP"); 985 "network is unavailable, don't try to update STUN IP");
986 } 986 }
987 } else if (stun_ip) { 987 } else if (stun_ip) {
988 g_free(stun_ip); 988 g_free(stun_ip);
989 stun_ip = NULL; 989 stun_ip = NULL;
994 purple_network_set_turn_server(const gchar *turn_server) 994 purple_network_set_turn_server(const gchar *turn_server)
995 { 995 {
996 if (turn_server && turn_server[0] != '\0') { 996 if (turn_server && turn_server[0] != '\0') {
997 if (purple_network_is_available()) { 997 if (purple_network_is_available()) {
998 purple_debug_info("network", "running DNS query for TURN server\n"); 998 purple_debug_info("network", "running DNS query for TURN server\n");
999 purple_dnsquery_a(turn_server, 999 purple_dnsquery_a(turn_server,
1000 purple_prefs_get_int("/purple/network/turn_port"), 1000 purple_prefs_get_int("/purple/network/turn_port"),
1001 purple_network_ip_lookup_cb, &turn_ip); 1001 purple_network_ip_lookup_cb, &turn_ip);
1002 } else { 1002 } else {
1003 purple_debug_info("network", 1003 purple_debug_info("network",
1004 "network is unavailable, don't try to update TURN IP"); 1004 "network is unavailable, don't try to update TURN IP");
1005 } 1005 }
1006 } else if (turn_ip) { 1006 } else if (turn_ip) {
1007 g_free(turn_ip); 1007 g_free(turn_ip);
1008 turn_ip = NULL; 1008 turn_ip = NULL;