MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-11-25 08:12:37 +01:00
Code Issues Releases Wiki Activity

ircd::net: Improve ipport/ep to_string related.

Browse source
This commit is contained in:
Jason Volk 2019-03-25 12:15:07 -07:00
parent 46346f504e
commit 9d552cd88a
1 changed files with 22 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
ircd/net.cc
View file

@ -3656,10 +3656,27 @@ ircd::net::string(const mutable_buffer &buf,
const ipport &ipp)
{
mutable_buffer out{buf};
const bool has_port(port(ipp));
const bool need_bracket(has_port && is_v6(ipp));
if(need_bracket)
consume(out, copy(out, "["_sv));
consume(out, size(string(out, std::get<ipp.IP>(ipp))));
consume(out, copy(out, ":"_sv));
consume(out, size(lex_cast(port(ipp), out)));
return { data(buf), data(out) };
if(need_bracket)
consume(out, copy(out, "]"_sv));
if(has_port)
{
consume(out, copy(out, ":"_sv));
consume(out, size(lex_cast(port(ipp), out)));
}
return
{
data(buf), data(out)
};
}
ircd::net::ipport
@ -3985,22 +4002,14 @@ ircd::net::string(const mutable_buffer &buf,
std::string
ircd::net::string(const ip::tcp::endpoint &ep)
{
return util::string(64, [&ep]
(const mutable_buffer &out)
{
return string(out, ep);
});
return string(make_ipport(ep));
}
ircd::string_view
ircd::net::string(const mutable_buffer &buf,
const ip::tcp::endpoint &ep)
{
mutable_buffer out{buf};
consume(out, size(string(out, net::addr(ep))));
consume(out, copy(out, ":"_sv));
consume(out, size(lex_cast(port(ep), out)));
return {data(buf), data(out)};
return string(buf, make_ipport(ep));
}
std::string