Skip to content

Added support for the userhost-in-names capab #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MrIron-no wants to merge 1 commit into
base: u2_10_12_branch
Choose a base branch
from
Open

Added support for the userhost-in-names capab #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions doc/example.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -922,6 +922,7 @@ features
# "CAP_ECHOMESSAGE" = "TRUE";
# "CAP_EXTJOIN" = "TRUE";
# "CAP_INVITENOTIFY" = "TRUE";
# "CAP_UHNAMES" = "TRUE";
# These were introduced by Undernet CFV-165 to add "Head-In-Sand" (HIS)
# behavior to hide most network topology from users.
# "HIS_SNOTICES" = "TRUE";
Expand Down
3 changes: 2 additions & 1 deletion include/capab.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@
_CAP(CHGHOST, FEAT_CAP_CHGHOST, 0, "chghost"), \
_CAP(ECHOMESSAGE, FEAT_CAP_ECHOMESSAGE, 0, "echo-message"), \
_CAP(EXTJOIN, FEAT_CAP_EXTJOIN, 0, "extended-join"), \
_CAP(INVITENOTIFY, FEAT_CAP_INVITENOTIFY, 0, "invite-notify")
_CAP(INVITENOTIFY, FEAT_CAP_INVITENOTIFY, 0, "invite-notify"), \
_CAP(UHNAMES, FEAT_CAP_UHNAMES, 0, "userhost-in-names")

/** Client capabilities, counting by index. */
enum Capab {
Expand Down
1 change: 1 addition & 0 deletions include/ircd_features.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ enum Feature {
FEAT_CAP_ECHOMESSAGE,
FEAT_CAP_EXTJOIN,
FEAT_CAP_INVITENOTIFY,
FEAT_CAP_UHNAMES,

/* HEAD_IN_SAND Features */
FEAT_HIS_SNOTICES,
Expand Down
1 change: 1 addition & 0 deletions ircd/ircd_features.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,6 +376,7 @@ static struct FeatureDesc {
F_B(CAP_ECHOMESSAGE, 0, 1, 0),
F_B(CAP_EXTJOIN, 0, 1, 0),
F_B(CAP_INVITENOTIFY, 0, 1, 0),
F_B(CAP_UHNAMES, 0, 1, 0),

/* HEAD_IN_SAND Features */
F_B(HIS_SNOTICES, 0, 1, 0),
Expand Down
13 changes: 12 additions & 1 deletion ircd/m_names.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ void do_names(struct Client* sptr, struct Channel* chptr, int filter)
int flag;
int needs_space;
int len;
int cap_extra = CapHas(cli_active(sptr), CAP_UHNAMES) ? (1 + USERLEN + 1 + HOSTLEN) : 0;
char buf[BUFSIZE];
struct Client *c2ptr;
struct Membership* member;
Expand Down Expand Up @@ -174,8 +175,18 @@ void do_names(struct Client* sptr, struct Channel* chptr, int filter)
buf[idx++] = '+';
strcpy(buf + idx, cli_name(c2ptr));
idx += strlen(cli_name(c2ptr));

if (CapHas(cli_active(sptr), CAP_UHNAMES)) {
buf[idx++] = '!';
strcpy(buf + idx, cli_user(c2ptr)->username);
idx += strlen(cli_user(c2ptr)->username);
buf[idx++] = '@';
strcpy(buf + idx, cli_user(c2ptr)->host);
idx += strlen(cli_user(c2ptr)->host);
}

flag = 1;
if (mlen + idx + NICKLEN + 5 > BUFSIZE)
if (mlen + idx + NICKLEN + 5 + cap_extra > BUFSIZE)
/* space, modifier, nick, \r \n \0 */
{
send_reply(sptr, (filter & NAMES_DEL) ? RPL_DELNAMREPLY : RPL_NAMREPLY, buf);
Expand Down