From 117b8e096997061af00e803f258b1275ae34821c Mon Sep 17 00:00:00 2001 From: Michael Poole Date: Wed, 23 Mar 2005 03:16:38 +0000 Subject: [PATCH] Fix previous DNS fix; make BURST lines shorter again. git-svn-id: file:///home/klmitch/undernet-ircu/undernet-ircu-svn/ircu2/trunk@1338 c9e4aea6-c8fd-4c43-8297-357d70d61c8c --- ChangeLog | 7 +++++++ ircd/channel.c | 4 ++-- ircd/ircd_res.c | 5 +---- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index bfe8d20..0a609ff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-03-22 Michael Poole + + * ircd/channel.c (send_channel_modes): Fix test for when to send + membership mode suffix, to avoid sending it more than once. + 2005-03-22 Michael Poole (Many thanks to nex and Reed for helping hunt this down and doing the testing of various patches.) @@ -7,6 +12,8 @@ * ircd/ircd_res.c (check_resolver_timeout): Simplify the test for whether to use timer_chg() or timer_add(). + On second thought, use timer_add() unconditionally; the server + connection loop does. (timeout_resolver): Do not try to re-schedule the DNS timeout unless it is the expiration event. (do_query_number): Properly initialize request->state. diff --git a/ircd/channel.c b/ircd/channel.c index 0d39101..3b9818b 100644 --- a/ircd/channel.c +++ b/ircd/channel.c @@ -939,7 +939,7 @@ void send_channel_modes(struct Client *cptr, struct Channel *chptr) * Do we have a nick with a new mode ? * Or are we starting a new BURST line? */ - if (new_mode || !feat_oplevels) + if (new_mode) { /* * This means we are at the _first_ member that has only @@ -967,7 +967,7 @@ void send_channel_modes(struct Client *cptr, struct Channel *chptr) msgq_append(&me, mb, tbuf); new_mode = 0; } - else if (flag_cnt > 1 && last_oplevel != member->oplevel) + else if (feat_oplevels && flag_cnt > 1 && last_oplevel != member->oplevel) { /* * This can't be the first member of a (continued) BURST diff --git a/ircd/ircd_res.c b/ircd/ircd_res.c index 8e9f33c..e0a9d51 100644 --- a/ircd/ircd_res.c +++ b/ircd/ircd_res.c @@ -278,10 +278,7 @@ check_resolver_timeout(time_t when) { if (when > CurrentTime + AR_TTL) when = CurrentTime + AR_TTL; - if (t_onqueue(&res_timeout)) - timer_chg(&res_timeout, TT_ABSOLUTE, when); - else - timer_add(&res_timeout, timeout_resolver, NULL, TT_ABSOLUTE, when); + timer_add(&res_timeout, timeout_resolver, NULL, TT_ABSOLUTE, when); } /** Drop pending DNS lookups which have timed out. -- 2.20.1