aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-12-04 14:46:39 -05:00
Code

Merge pull request #770 from horgh/horgh/rm-unused-function

Browse Source 
Remove a couple unused functions
This commit is contained in:
ailin-nemui 2017-10-23 14:29:34 +02:00 committed by GitHub
commit cfa51c5ae2
2 changed files with 3 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/core/network.c
View File

@ -48,9 +48,6 @@ GIOChannel *g_io_channel_new(int handle)
return chan; return chan;
} }
/* Cygwin need this, don't know others.. */
/*#define BLOCKING_SOCKETS 1*/
IPADDR ip4_any = { IPADDR ip4_any = {
AF_INET, AF_INET,
#if defined(IN6ADDR_ANY_INIT) #if defined(IN6ADDR_ANY_INIT)
@ -113,40 +110,6 @@ static int sin_get_port(union sockaddr_union *so)
so->sin.sin_port); 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) int net_connect_ip_handle(const IPADDR *ip, int port, const IPADDR *my_ip)
{ {
union sockaddr_union so; union sockaddr_union so;

7
src/core/network.h
View File

@ -33,13 +33,12 @@ extern IPADDR ip4_any;
GIOChannel *g_io_channel_new(int handle); GIOChannel *g_io_channel_new(int handle);
/* returns 1 if IPADDRs are the same */ /* Returns 1 if IPADDRs are the same. */
int net_ip_compare(IPADDR *ip1, IPADDR *ip2); /* Deprecated since it is unused. It will be deleted in a later release. */
int net_ip_compare(IPADDR *ip1, IPADDR *ip2) G_GNUC_DEPRECATED;
int net_connect_ip_handle(const IPADDR *ip, int port, const IPADDR *my_ip); 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*/ /* Connect to socket with ip address and SSL*/
GIOChannel *net_connect_ip_ssl(IPADDR *ip, int port, IPADDR *my_ip, SERVER_REC *server); GIOChannel *net_connect_ip_ssl(IPADDR *ip, int port, IPADDR *my_ip, SERVER_REC *server);
/* Start TLS */ /* Start TLS */