Mercurial > pidgin
comparison libpurple/network.c @ 32368:ca4714f51bb1
propagate from branch 'im.pidgin.pidgin.2.x.y' (head 0c3ef8388ce0f274d695767f513518b859889979)
to branch 'im.pidgin.pidgin' (head 8ee87bdc7a99e5d58bf700eaf08abe409ae4ede8)
| author | Ethan Blanton <elb@pidgin.im> |
|---|---|
| date | Tue, 29 Nov 2011 03:59:09 +0000 |
| parents | d2ef8926b960 |
| children | 490ad537b77f |
comparison
equal
deleted
inserted
replaced
| 32367:00ea5f8ef509 | 32368:ca4714f51bb1 |
|---|---|
| 389 purple_network_listen_cancel(listen_data); | 389 purple_network_listen_cancel(listen_data); |
| 390 | 390 |
| 391 return FALSE; | 391 return FALSE; |
| 392 } | 392 } |
| 393 | 393 |
| 394 static gboolean listen_map_external = TRUE; | |
| 395 void purple_network_listen_map_external(gboolean map_external) | |
| 396 { | |
| 397 listen_map_external = map_external; | |
| 398 } | |
| 399 | |
| 400 static PurpleNetworkListenData * | 394 static PurpleNetworkListenData * |
| 401 purple_network_do_listen(unsigned short port, int socket_family, int socket_type, PurpleNetworkListenCallback cb, gpointer cb_data) | 395 purple_network_do_listen(unsigned short port, int socket_family, int socket_type, gboolean map_external, |
| 396 PurpleNetworkListenCallback cb, gpointer cb_data) | |
| 402 { | 397 { |
| 403 int listenfd = -1; | 398 int listenfd = -1; |
| 404 int flags; | 399 int flags; |
| 405 const int on = 1; | 400 const int on = 1; |
| 406 PurpleNetworkListenData *listen_data; | 401 PurpleNetworkListenData *listen_data; |
| 501 listen_data->retry = TRUE; | 496 listen_data->retry = TRUE; |
| 502 listen_data->cb = cb; | 497 listen_data->cb = cb; |
| 503 listen_data->cb_data = cb_data; | 498 listen_data->cb_data = cb_data; |
| 504 listen_data->socket_type = socket_type; | 499 listen_data->socket_type = socket_type; |
| 505 | 500 |
| 506 if (!purple_socket_speaks_ipv4(listenfd) || !listen_map_external || | 501 if (!purple_socket_speaks_ipv4(listenfd) || !map_external || |
| 507 !purple_prefs_get_bool("/purple/network/map_ports")) | 502 !purple_prefs_get_bool("/purple/network/map_ports")) |
| 508 { | 503 { |
| 509 purple_debug_info("network", "Skipping external port mapping.\n"); | 504 purple_debug_info("network", "Skipping external port mapping.\n"); |
| 510 /* The pmp_map_cb does what we want to do */ | 505 /* The pmp_map_cb does what we want to do */ |
| 511 listen_data->timer = purple_timeout_add(0, purple_network_finish_pmp_map_cb, listen_data); | 506 listen_data->timer = purple_timeout_add(0, purple_network_finish_pmp_map_cb, listen_data); |
| 529 | 524 |
| 530 return listen_data; | 525 return listen_data; |
| 531 } | 526 } |
| 532 | 527 |
| 533 PurpleNetworkListenData * | 528 PurpleNetworkListenData * |
| 534 purple_network_listen_family(unsigned short port, int socket_family, | 529 purple_network_listen(unsigned short port, int socket_family, int socket_type, |
| 535 int socket_type, PurpleNetworkListenCallback cb, | 530 gboolean map_external, PurpleNetworkListenCallback cb, |
| 536 gpointer cb_data) | 531 gpointer cb_data) |
| 537 { | 532 { |
| 538 g_return_val_if_fail(port != 0, NULL); | 533 g_return_val_if_fail(port != 0, NULL); |
| 539 | 534 |
| 540 return purple_network_do_listen(port, socket_family, socket_type, | 535 return purple_network_do_listen(port, socket_family, socket_type, map_external, |
| 541 cb, cb_data); | 536 cb, cb_data); |
| 542 } | 537 } |
| 543 | 538 |
| 544 PurpleNetworkListenData * | 539 PurpleNetworkListenData * |
| 545 purple_network_listen(unsigned short port, int socket_type, | 540 purple_network_listen_range(unsigned short start, unsigned short end, |
| 546 PurpleNetworkListenCallback cb, gpointer cb_data) | 541 int socket_family, int socket_type, gboolean map_external, |
| 547 { | |
| 548 return purple_network_listen_family(port, AF_UNSPEC, socket_type, | |
| 549 cb, cb_data); | |
| 550 } | |
| 551 | |
| 552 PurpleNetworkListenData * | |
| 553 purple_network_listen_range_family(unsigned short start, unsigned short end, | |
| 554 int socket_family, int socket_type, | |
| 555 PurpleNetworkListenCallback cb, | 542 PurpleNetworkListenCallback cb, |
| 556 gpointer cb_data) | 543 gpointer cb_data) |
| 557 { | 544 { |
| 558 PurpleNetworkListenData *ret = NULL; | 545 PurpleNetworkListenData *ret = NULL; |
| 559 | 546 |
| 564 if (end < start) | 551 if (end < start) |
| 565 end = start; | 552 end = start; |
| 566 } | 553 } |
| 567 | 554 |
| 568 for (; start <= end; start++) { | 555 for (; start <= end; start++) { |
| 569 ret = purple_network_do_listen(start, AF_UNSPEC, socket_type, cb, cb_data); | 556 ret = purple_network_do_listen(start, AF_UNSPEC, socket_type, map_external, cb, cb_data); |
| 570 if (ret != NULL) | 557 if (ret != NULL) |
| 571 break; | 558 break; |
| 572 } | 559 } |
| 573 | 560 |
| 574 return ret; | 561 return ret; |
| 575 } | |
| 576 | |
| 577 PurpleNetworkListenData * | |
| 578 purple_network_listen_range(unsigned short start, unsigned short end, | |
| 579 int socket_type, PurpleNetworkListenCallback cb, | |
| 580 gpointer cb_data) | |
| 581 { | |
| 582 return purple_network_listen_range_family(start, end, AF_UNSPEC, | |
| 583 socket_type, cb, cb_data); | |
| 584 } | 562 } |
| 585 | 563 |
| 586 void purple_network_listen_cancel(PurpleNetworkListenData *listen_data) | 564 void purple_network_listen_cancel(PurpleNetworkListenData *listen_data) |
| 587 { | 565 { |
| 588 if (listen_data->mapping_data != NULL) | 566 if (listen_data->mapping_data != NULL) |
| 989 purple_network_set_stun_server(const gchar *stun_server) | 967 purple_network_set_stun_server(const gchar *stun_server) |
| 990 { | 968 { |
| 991 if (stun_server && stun_server[0] != '\0') { | 969 if (stun_server && stun_server[0] != '\0') { |
| 992 if (purple_network_is_available()) { | 970 if (purple_network_is_available()) { |
| 993 purple_debug_info("network", "running DNS query for STUN server\n"); | 971 purple_debug_info("network", "running DNS query for STUN server\n"); |
| 994 purple_dnsquery_a_account(NULL, stun_server, 3478, purple_network_ip_lookup_cb, | 972 purple_dnsquery_a(NULL, stun_server, 3478, purple_network_ip_lookup_cb, |
| 995 &stun_ip); | 973 &stun_ip); |
| 996 } else { | 974 } else { |
| 997 purple_debug_info("network", | 975 purple_debug_info("network", |
| 998 "network is unavailable, don't try to update STUN IP"); | 976 "network is unavailable, don't try to update STUN IP"); |
| 999 } | 977 } |
| 1007 purple_network_set_turn_server(const gchar *turn_server) | 985 purple_network_set_turn_server(const gchar *turn_server) |
| 1008 { | 986 { |
| 1009 if (turn_server && turn_server[0] != '\0') { | 987 if (turn_server && turn_server[0] != '\0') { |
| 1010 if (purple_network_is_available()) { | 988 if (purple_network_is_available()) { |
| 1011 purple_debug_info("network", "running DNS query for TURN server\n"); | 989 purple_debug_info("network", "running DNS query for TURN server\n"); |
| 1012 purple_dnsquery_a_account(NULL, turn_server, | 990 purple_dnsquery_a(NULL, turn_server, |
| 1013 purple_prefs_get_int("/purple/network/turn_port"), | 991 purple_prefs_get_int("/purple/network/turn_port"), |
| 1014 purple_network_ip_lookup_cb, &turn_ip); | 992 purple_network_ip_lookup_cb, &turn_ip); |
| 1015 } else { | 993 } else { |
| 1016 purple_debug_info("network", | 994 purple_debug_info("network", |
| 1017 "network is unavailable, don't try to update TURN IP"); | 995 "network is unavailable, don't try to update TURN IP"); |