diff options
| author |  Sadie Powell | 2022-08-10 19:36:33 +0100 |
|---|---|---|
| committer | Sadie Powell | 2022-08-10 19:36:33 +0100 |
| commit | 8f5993e0ec187fb4bd5c044eb67e555d173e0b00 (patch) | |
| tree | ecc6a5807b02fcfa0abcb63bfc61b026e68685b9 /src/modules/m_spanningtree/uid.cpp | |
| parent | Fix some harmless debug messages when initializing remote users. (diff) | |
Fix remote users with UNIX socket paths as their sockaddr.
Diffstat (limited to 'src/modules/m_spanningtree/uid.cpp')
| -rw-r--r-- | src/modules/m_spanningtree/uid.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/modules/m_spanningtree/uid.cpp b/src/modules/m_spanningtree/uid.cpp index f9aeaa09f..c31395b3d 100644 --- a/src/modules/m_spanningtree/uid.cpp +++ b/src/modules/m_spanningtree/uid.cpp @@ -71,6 +71,14 @@ CmdResult CommandUID::HandleServer(TreeServer* remoteserver, CommandBase::Params } } + irc::sockets::sockaddrs sa; + if (params[6].find('/') != std::string::npos) + irc::sockets::untosa(params[6], sa); + else + irc::sockets::aptosa(params[6], 0, sa); + if (sa.family() == AF_UNSPEC) + throw ProtocolException("Invalid IP address or UNIX socket path"); + /* For remote users, we pass the UUID they sent to the constructor. * If the UUID already exists User::User() throws an exception which causes this connection to be closed. */ @@ -80,14 +88,13 @@ CmdResult CommandUID::HandleServer(TreeServer* remoteserver, CommandBase::Params _new->ChangeRealHost(params[3], false); _new->ChangeDisplayedHost(params[4]); _new->ident = params[5]; - _new->SetClientIP(params[6]); + _new->SetClientIP(sa); _new->ChangeRealName(params.back()); _new->registered = REG_ALL; _new->signon = signon; _new->age = age_t; unsigned int paramptr = 9; - for (std::string::const_iterator v = modestr.begin(); v != modestr.end(); ++v) { // Accept more '+' chars, for now |