zynk/irssi
2
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2026-08-23 02:22:36 +02:00
Code Issues Projects Releases Packages Wiki Activity

Move new stuff at the end of IRC_SERVER_REC to attempt to unbreak ABI

Browse source 
This normally wouldn't matter at all but I just spent a couple of hours
figuring out a bug that turned out to be Server->isupport() from a
0.8.17 ABI Irc.so reading from the splits hash table instead of the
isupport hash table, and both happen to be 32 bytes away from each
other, which is the same size of the newly added struct items. So it
failed in a very elegant and subtle way (it would probably crash and
burn in 32bit architectures, though)

This commit is just an attempt to get something useful out of that time.

It also moves the cap_complete flag to the bitfield above so it can be
properly packed (taking one bit instead of 4 bytes like it did in the
other position). That's 4 bytes less per network! 60 bytes total for me!
Amazing.
This commit is contained in:
dequis 2015-09-21 03:38:00 -03:00
commit 3ca8f61219
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/irc/core/irc-servers.h
View file

@ -63,19 +63,13 @@ struct _IRC_SERVER_REC {
unsigned int nick_collision:1; /* We're just now being killed because of nick collision */ unsigned int nick_collision:1; /* We're just now being killed because of nick collision */
unsigned int motd_got:1; /* We've received MOTD */ unsigned int motd_got:1; /* We've received MOTD */
unsigned int isupport_sent:1; /* Server has sent us an isupport reply */ unsigned int isupport_sent:1; /* Server has sent us an isupport reply */
unsigned int cap_complete:1; /* We've done the initial CAP negotiation */
int max_kicks_in_cmd; /* max. number of people to kick with one /KICK command */ int max_kicks_in_cmd; /* max. number of people to kick with one /KICK command */
int max_modes_in_cmd; /* max. number of mode changes in one /MODE command */ int max_modes_in_cmd; /* max. number of mode changes in one /MODE command */
int max_whois_in_cmd; /* max. number of nicks in one /WHOIS command */ int max_whois_in_cmd; /* max. number of nicks in one /WHOIS command */
int max_msgs_in_cmd; /* max. number of targets in one /MSG */ int max_msgs_in_cmd; /* max. number of targets in one /MSG */
GSList *cap_supported; /* A list of caps supported by the server */
GSList *cap_active; /* A list of caps active for this session */
GSList *cap_queue; /* A list of caps to request on connection */
int cap_complete:1; /* We've done the initial CAP negotiation */
guint sasl_timeout; /* Holds the source id of the running timeout */
/* Command sending queue */ /* Command sending queue */
int cmdcount; /* number of commands in `cmdqueue'. Can be more than int cmdcount; /* number of commands in `cmdqueue'. Can be more than
there actually is, to make flood control remember there actually is, to make flood control remember
@ -111,6 +105,12 @@ struct _IRC_SERVER_REC {
char prefix[256]; char prefix[256];
int (*nick_comp_func)(const char *, const char *); /* Function for comparing nicknames on this server */ int (*nick_comp_func)(const char *, const char *); /* Function for comparing nicknames on this server */
GSList *cap_supported; /* A list of caps supported by the server */
GSList *cap_active; /* A list of caps active for this session */
GSList *cap_queue; /* A list of caps to request on connection */
guint sasl_timeout; /* Holds the source id of the running timeout */
}; };
SERVER_REC *irc_server_init_connect(SERVER_CONNECT_REC *conn); SERVER_REC *irc_server_init_connect(SERVER_CONNECT_REC *conn);