MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-09-28 11:48:54 +02:00
Code Issues Releases Wiki Activity

ircd::rfc1035: Use string_view of namebuf rather than namelen.

Browse source
This commit is contained in:
Jason Volk 2018-03-01 21:15:54 -08:00
parent b0730143d1
commit b10d3498e3
2 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/ircd/rfc1035.h
View file

@ -91,8 +91,8 @@ struct ircd::rfc1035::question
{
uint16_t qtype;
uint16_t qclass {0x01};
size_t namelen {0};
char name[256];
string_view name;
char namebuf[256];
/// Composes the question into buffer, returns used portion
mutable_buffer print(const mutable_buffer &) const;

21
ircd/rfc1035.cc
View file

@ -59,9 +59,15 @@ ircd::rfc1035::make_query(const mutable_buffer &out,
ircd::rfc1035::question::question(const string_view &fqdn,
const uint16_t &qtype)
:qtype{qtype}
,namelen
,name
{
size(make_name(mutable_buffer{name}, fqdn))
// The name string_view is reduced to not view the null terminator
// making it easier for external users. We'll account for this
// internally. If this->name was a const_buffer it would have the
// null, but doing it this way with the string_view covention prevents
// the null from leaking into the rest of the system when users want
// to know the question.
namebuf, size(make_name(namebuf, fqdn)) - 1
}
{
}
@ -75,7 +81,8 @@ ircd::rfc1035::question::parse(const const_buffer &in)
"Answer input buffer underflow"
};
namelen = parse_name(name, in);
const auto namelen(parse_name(namebuf, in));
name = string_view{namebuf, namelen - 1};
const char *pos(data(in) + namelen);
if(unlikely(pos + 2 + 2 > end(in)))
throw error
@ -96,7 +103,7 @@ const
{
const size_t required
{
namelen + 2 + 2
size(name) + 1 + 2 + 2
};
if(unlikely(size(buf) < required))
@ -107,7 +114,9 @@ const
char *pos
{
data(buf) + copy(buf, const_buffer{name, namelen})
// const_buffer must cover the null terminator which the name
// string_view does not cover ... but it's there.
data(buf) + copy(buf, const_buffer{namebuf, size(name) + 1})
};
assert(pos > data(buf));
@ -269,7 +278,7 @@ ircd::rfc1035::make_name(const mutable_buffer &out,
assert(*pos == '\0');
++pos;
return { data(out), size_t(pos - begin(out)) };
return { data(out), pos };
}
size_t