summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/core/network.c34
-rw-r--r--src/core/network.h2
2 files changed, 0 insertions, 36 deletions
diff --git a/src/core/network.c b/src/core/network.c
index 38f4e65a..52619e4f 100644
--- a/src/core/network.c
+++ b/src/core/network.c
@@ -98,40 +98,6 @@ static int sin_get_port(union sockaddr_union *so)
so->sin.sin_port);
}
-/* Connect to socket */
-GIOChannel *net_connect(const char *addr, int port, IPADDR *my_ip)
-{
- IPADDR ip4, ip6, *ip;
-
- g_return_val_if_fail(addr != NULL, NULL);
-
- if (net_gethostbyname(addr, &ip4, &ip6) == -1)
- return NULL;
-
- if (my_ip == NULL) {
- /* prefer IPv4 addresses */
- ip = ip4.family != 0 ? &ip4 : &ip6;
- } else if (IPADDR_IS_V6(my_ip)) {
- /* my_ip is IPv6 address, use it if possible */
- if (ip6.family != 0)
- ip = &ip6;
- else {
- my_ip = NULL;
- ip = &ip4;
- }
- } else {
- /* my_ip is IPv4 address, use it if possible */
- if (ip4.family != 0)
- ip = &ip4;
- else {
- my_ip = NULL;
- ip = &ip6;
- }
- }
-
- return net_connect_ip(ip, port, my_ip);
-}
-
int net_connect_ip_handle(const IPADDR *ip, int port, const IPADDR *my_ip)
{
union sockaddr_union so;
diff --git a/src/core/network.h b/src/core/network.h
index 471ab2d8..a02f0db9 100644
--- a/src/core/network.h
+++ b/src/core/network.h
@@ -35,8 +35,6 @@ GIOChannel *g_io_channel_new(int handle);
int net_connect_ip_handle(const IPADDR *ip, int port, const IPADDR *my_ip);
-/* Connect to socket */
-GIOChannel *net_connect(const char *addr, int port, IPADDR *my_ip) G_GNUC_DEPRECATED;
/* Connect to socket with ip address and SSL*/
GIOChannel *net_connect_ip_ssl(IPADDR *ip, int port, IPADDR *my_ip, SERVER_REC *server);
/* Start TLS */