This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Undernet IRC Server Source Code.".
The branch, u2_10_12_branch has been updated
via 27eb19203da9b2c149431f8616f0f15bf847bc37 (commit)
via 62c604b90202ea67a70148e3d227707608bf4f8f (commit)
from c46f3e0e9cbaa42c3704e38240f37371cf3391ce (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 27eb19203da9b2c149431f8616f0f15bf847bc37
Author: Michael Poole <[email protected]>
Date: Wed Jul 25 21:06:37 2018 -0400
channel.h: MODE_REGISTERED uses +R, it is no longer for future expansion.
diff --git a/include/channel.h b/include/channel.h
index 38650992..fc4916fe 100644
--- a/include/channel.h
+++ b/include/channel.h
@@ -101,8 +101,7 @@ struct Client;
#define MODE_LIMIT 0x0400 /**< +l Limit */
#define MODE_REGONLY 0x0800 /**< Only +r users may join */
#define MODE_DELJOINS 0x1000 /**< New join messages are delayed */
-#define MODE_REGISTERED 0x2000 /**< Channel marked as registered
- * (for future semantic expansion) */
+#define MODE_REGISTERED 0x2000 /**< +R registered with services */
#define MODE_NOCOLOR 0x4000 /**< +c No colors */
#define MODE_NOCTCP 0x8000 /**< +C No CTCPs except ACTION */
#define MODE_SAVE 0x20000 /**< save this mode-with-arg 'til
commit 62c604b90202ea67a70148e3d227707608bf4f8f
Author: Michael Poole <[email protected]>
Date: Wed Jul 25 21:06:11 2018 -0400
s_bsd: Fix the dolen comparison bugfix, and clean up nearby code.
Fixes: 48c15bd1cf3a9a2057924a0a1e4a0aca4db4a6c4
diff --git a/ircd/s_bsd.c b/ircd/s_bsd.c
index 0a92c7cf..8d021a9f 100644
--- a/ircd/s_bsd.c
+++ b/ircd/s_bsd.c
@@ -667,16 +667,10 @@ static int read_packet(struct Client *cptr, int
socket_ready)
{
dolen = dbuf_get(&(cli_recvQ(cptr)), readbuf, sizeof(readbuf));
if (dolen == 0)
- {
- if (DBufLength(&(cli_recvQ(cptr))) < 510)
- SetFlag(cptr, FLAG_NONL);
- else
- DBufClear(&(cli_recvQ(cptr)));
- }
- else if ((IsServer(cptr) &&
- server_dopacket(cptr, readbuf, dolen) == CPTR_KILLED) ||
- (!IsServer(cptr) &&
- connect_dopacket(cptr, readbuf, dolen) == CPTR_KILLED))
+ return 1;
+ if ((IsServer(cptr)
+ ? server_dopacket(cptr, readbuf, dolen)
+ : connect_dopacket(cptr, readbuf, dolen)) == CPTR_KILLED)
return CPTR_KILLED;
}
}
-----------------------------------------------------------------------
Summary of changes:
include/channel.h | 3 +--
ircd/s_bsd.c | 14 ++++----------
2 files changed, 5 insertions(+), 12 deletions(-)
hooks/post-receive
--
Undernet IRC Server Source Code.
_______________________________________________
Patches mailing list
[email protected]
http://undernet.sbg.org/mailman/listinfo/patches
