iiiypuk/hexchat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make dcc_ip being a per-server value.

Browse Source 
Moved dcc_ip from prefs to sess->server.
This commit is contained in:
Stepan Broz 2019-05-21 16:02:30 +02:00 committed by Patrick
parent 468ce821fe
commit ed1d5061a4
5 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/dcc.c
View File

@ -1618,13 +1618,13 @@ dcc_accept (GIOChannel *source, GIOCondition condition, struct DCC *dcc)
} }
guint32 guint32
dcc_get_my_address (void) /* the address we'll tell the other person */ dcc_get_my_address (session *sess) /* the address we'll tell the other person */
{ {
struct hostent *dns_query; struct hostent *dns_query;
guint32 addr = 0; guint32 addr = 0;
if (prefs.hex_dcc_ip_from_server && prefs.dcc_ip) if (prefs.hex_dcc_ip_from_server && sess->server->dcc_ip)
addr = prefs.dcc_ip; addr = sess->server->dcc_ip;
else if (prefs.hex_dcc_ip[0]) else if (prefs.hex_dcc_ip[0])
{ {
dns_query = gethostbyname ((const char *) prefs.hex_dcc_ip); dns_query = gethostbyname ((const char *) prefs.hex_dcc_ip);
@ -1710,7 +1710,7 @@ dcc_listen_init (struct DCC *dcc, session *sess)
/*if we have a dcc_ip, we use that, so the remote client can connect*/ /*if we have a dcc_ip, we use that, so the remote client can connect*/
/*else we try to take an address from hex_dcc_ip*/ /*else we try to take an address from hex_dcc_ip*/
/*if something goes wrong we tell the client to connect to our LAN ip*/ /*if something goes wrong we tell the client to connect to our LAN ip*/
dcc->addr = dcc_get_my_address (); dcc->addr = dcc_get_my_address (sess);
/*if nothing else worked we use the address we bound to*/ /*if nothing else worked we use the address we bound to*/
if (dcc->addr == 0) if (dcc->addr == 0)

2
src/common/dcc.h
View File

@ -124,7 +124,7 @@ void dcc_chat (session *sess, char *nick, int passive);
void handle_dcc (session *sess, char *nick, char *word[], char *word_eol[], void handle_dcc (session *sess, char *nick, char *word[], char *word_eol[],
const message_tags_data *tags_data); const message_tags_data *tags_data);
void dcc_show_list (session *sess); void dcc_show_list (session *sess);
guint32 dcc_get_my_address (void); guint32 dcc_get_my_address (session *sess);
void dcc_get_with_destfile (struct DCC *dcc, char *utf8file); void dcc_get_with_destfile (struct DCC *dcc, char *utf8file);
#endif #endif

5
src/common/hexchat.h
View File

@ -313,7 +313,6 @@ struct hexchatprefs
/* these are the private variables */ /* these are the private variables */
guint32 local_ip; guint32 local_ip;
guint32 dcc_ip;
unsigned int wait_on_exit; /* wait for logs to be flushed to disk IF we're connected */ unsigned int wait_on_exit; /* wait for logs to be flushed to disk IF we're connected */
@ -482,6 +481,10 @@ typedef struct server
int proxy_sok4; int proxy_sok4;
int proxy_sok6; int proxy_sok6;
int id; /* unique ID number (for plugin API) */ int id; /* unique ID number (for plugin API) */
/* dcc_ip moved from haxchatprefs to make it per-server */
guint32 dcc_ip;
#ifdef USE_OPENSSL #ifdef USE_OPENSSL
SSL_CTX *ctx; SSL_CTX *ctx;
SSL *ssl; SSL *ssl;

2
src/common/inbound.c
View File

@ -1420,7 +1420,7 @@ inbound_foundip (session *sess, char *ip, const message_tags_data *tags_data)
HostAddr = gethostbyname (ip); HostAddr = gethostbyname (ip);
if (HostAddr) if (HostAddr)
{ {
prefs.dcc_ip = ((struct in_addr *) HostAddr->h_addr)->s_addr; sess->server->dcc_ip = ((struct in_addr *) HostAddr->h_addr)->s_addr;
EMIT_SIGNAL_TIMESTAMP (XP_TE_FOUNDIP, sess->server->server_session, EMIT_SIGNAL_TIMESTAMP (XP_TE_FOUNDIP, sess->server->server_session,
inet_ntoa (*((struct in_addr *) HostAddr->h_addr)), inet_ntoa (*((struct in_addr *) HostAddr->h_addr)),
NULL, NULL, NULL, 0, tags_data->timestamp); NULL, NULL, NULL, 0, tags_data->timestamp);

2
src/common/outbound.c
View File

@ -3287,7 +3287,7 @@ cmd_send (struct session *sess, char *tbuf, char *word[], char *word_eol[])
if (!word[2][0]) if (!word[2][0])
return FALSE; return FALSE;
addr = dcc_get_my_address (); addr = dcc_get_my_address (sess);
if (addr == 0) if (addr == 0)
{ {
/* use the one from our connected server socket */ /* use the one from our connected server socket */