PsychoticNinja/irssi
1
0
Fork 1
mirror of https://github.com/irssi/irssi.git synced 2025-04-25 04:21:22 -05:00
Code Issues Projects Releases Wiki Activity

add ipaddr and family to connrec and perl SERVER_REC

Browse Source
This commit is contained in:
steering7253 2024-11-02 17:08:32 -06:00
parent ee4471a118
commit 26fd0585cd
No known key found for this signature in database
GPG Key ID: 66B26E9D823D8647
4 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/perl.txt
View File

@ -522,6 +522,8 @@ Connect->{}
address - Address where we connected (irc.blah.org) address - Address where we connected (irc.blah.org)
port - Port where we connected port - Port where we connected
chatnet - Chat network chatnet - Chat network
chosen_family - IP family chosen to connect to
ipaddr - IP address connected to
password - Password we used in connection. password - Password we used in connection.
wanted_nick - Nick which we would prefer to use wanted_nick - Nick which we would prefer to use

1
src/core/server-connect-rec.h
View File

@ -12,6 +12,7 @@ char *proxy_string, *proxy_string_after, *proxy_password;
unsigned short family; /* 0 = don't care, AF_INET or AF_INET6 */ unsigned short family; /* 0 = don't care, AF_INET or AF_INET6 */
unsigned short chosen_family; /* family actually chosen during name resolution */ unsigned short chosen_family; /* family actually chosen during name resolution */
char *ipaddr;
char *tag; /* try to keep this tag when connected to server */ char *tag; /* try to keep this tag when connected to server */
char *address; char *address;
int port; int port;

8
src/core/servers.c
View File

@ -212,13 +212,18 @@ static void server_real_connect(SERVER_REC *server, IPADDR *ip,
g_return_if_fail(ip != NULL || unix_socket != NULL); g_return_if_fail(ip != NULL || unix_socket != NULL);
if (ip != NULL) {
server->connrec->chosen_family = ip->family;
net_ip2host(ip, ipaddr);
server->connrec->ipaddr = g_strdup(ipaddr);
}
signal_emit("server connecting", 2, server, ip); signal_emit("server connecting", 2, server, ip);
if (server->connrec->no_connect) if (server->connrec->no_connect)
return; return;
if (ip != NULL) { if (ip != NULL) {
server->connrec->chosen_family = ip->family;
own_ip = IPADDR_IS_V6(ip) ? server->connrec->own_ip6 : server->connrec->own_ip4; own_ip = IPADDR_IS_V6(ip) ? server->connrec->own_ip6 : server->connrec->own_ip4;
port = server->connrec->proxy != NULL ? port = server->connrec->proxy != NULL ?
server->connrec->proxy_port : server->connrec->port; server->connrec->proxy_port : server->connrec->port;
@ -637,6 +642,7 @@ void server_connect_unref(SERVER_CONNECT_REC *conn)
g_free_not_null(conn->proxy_string_after); g_free_not_null(conn->proxy_string_after);
g_free_not_null(conn->proxy_password); g_free_not_null(conn->proxy_password);
g_free_not_null(conn->ipaddr);
g_free_not_null(conn->tag); g_free_not_null(conn->tag);
g_free_not_null(conn->address); g_free_not_null(conn->address);
g_free_not_null(conn->chatnet); g_free_not_null(conn->chatnet);

2
src/perl/perl-common.c
View File

@ -287,6 +287,8 @@ void perl_connect_fill_hash(HV *hv, SERVER_CONNECT_REC *conn)
(void) hv_store(hv, "type", 4, new_pv(type), 0); (void) hv_store(hv, "type", 4, new_pv(type), 0);
(void) hv_store(hv, "chat_type", 9, new_pv(chat_type), 0); (void) hv_store(hv, "chat_type", 9, new_pv(chat_type), 0);
(void) hv_store(hv, "chosen_family", 13, newSViv(conn->chosen_family), 0);
(void) hv_store(hv, "ipaddr", 6, new_pv(conn->ipaddr), 0);
(void) hv_store(hv, "tag", 3, new_pv(conn->tag), 0); (void) hv_store(hv, "tag", 3, new_pv(conn->tag), 0);
(void) hv_store(hv, "address", 7, new_pv(conn->address), 0); (void) hv_store(hv, "address", 7, new_pv(conn->address), 0);
(void) hv_store(hv, "port", 4, newSViv(conn->port), 0); (void) hv_store(hv, "port", 4, newSViv(conn->port), 0);