MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-12-28 00:14:07 +01:00
Code Issues Releases Wiki Activity

ircd::rfc1035: Fix cast-alignments.

Browse source
This commit is contained in:
Jason Volk 2019-06-23 02:57:48 -06:00
parent cd8d070fb6
commit c20e4bccd4
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
ircd/rfc1035.cc
View file

@ -89,8 +89,8 @@ ircd::rfc1035::question::parse(const const_buffer &in)
"Question input buffer is incomplete (%zu bytes)", size(in) "Question input buffer is incomplete (%zu bytes)", size(in)
}; };
qtype = ntoh(*(const uint16_t *)pos); pos += 2; qtype = ntoh(*reinterpret_cast<const uint16_t *>(pos)); pos += 2;
qclass = ntoh(*(const uint16_t *)pos); pos += 2; qclass = ntoh(*reinterpret_cast<const uint16_t *>(pos)); pos += 2;
assert(size_t(pos - data(in)) <= size(in)); assert(size_t(pos - data(in)) <= size(in));
return { data(in), pos }; return { data(in), pos };
@ -120,8 +120,8 @@ const
assert(pos > data(buf)); assert(pos > data(buf));
assert(*(pos - 1) == '\0'); assert(*(pos - 1) == '\0');
*(uint16_t *)pos = hton(qtype); pos += 2; *reinterpret_cast<uint16_t *>(pos) = hton(qtype); pos += 2;
*(uint16_t *)pos = hton(qclass); pos += 2; *reinterpret_cast<uint16_t *>(pos) = hton(qclass); pos += 2;
assert(size_t(std::distance(data(buf), pos)) == required); assert(size_t(std::distance(data(buf), pos)) == required);
return mutable_buffer return mutable_buffer
@ -149,10 +149,10 @@ ircd::rfc1035::answer::parse(const const_buffer &in)
"Answer input buffer is incomplete (%zu bytes)", size(in) "Answer input buffer is incomplete (%zu bytes)", size(in)
}; };
qtype = ntoh(*(const uint16_t *)pos); pos += 2; qtype = ntoh(*reinterpret_cast<const uint16_t *>(pos)); pos += 2;
qclass = ntoh(*(const uint16_t *)pos); pos += 2; qclass = ntoh(*reinterpret_cast<const uint16_t *>(pos)); pos += 2;
ttl = ntoh(*(const uint32_t *)pos); pos += 4; ttl = ntoh(*reinterpret_cast<const uint32_t *>(pos)); pos += 4;
rdlength = ntoh(*(const uint16_t *)pos); pos += 2; rdlength = ntoh(*reinterpret_cast<const uint16_t *>(pos)); pos += 2;
if(unlikely(qclass != 1)) if(unlikely(qclass != 1))
throw error throw error
@ -214,7 +214,7 @@ ircd::rfc1035::record::A::A(const answer &answer)
"A record data underflow" "A record data underflow"
}; };
ip4 = ntoh(*(const uint32_t *)data(rdata)); ip4 = ntoh(*reinterpret_cast<const uint32_t *>(data(rdata)));
} }
void void
@ -264,7 +264,7 @@ ircd::rfc1035::record::AAAA::AAAA(const answer &answer)
"AAAA record data underflow" "AAAA record data underflow"
}; };
ip6 = ntoh(*(const uint128_t *)data(rdata)); ip6 = ntoh(*reinterpret_cast<const uint128_t *>(data(rdata)));
} }
void void
@ -363,9 +363,9 @@ ircd::rfc1035::record::SRV::SRV(const answer &answer)
}; };
const char *pos(data(rdata)); const char *pos(data(rdata));
priority = ntoh(*(const uint16_t *)pos); pos += 2; priority = ntoh(*reinterpret_cast<const uint16_t *>(pos)); pos += 2;
weight = ntoh(*(const uint16_t *)pos); pos += 2; weight = ntoh(*reinterpret_cast<const uint16_t *>(pos)); pos += 2;
port = ntoh(*(const uint16_t *)pos); pos += 2; port = ntoh(*reinterpret_cast<const uint16_t *>(pos)); pos += 2;
const const_buffer tgtbuf{pos, end(rdata)}; const const_buffer tgtbuf{pos, end(rdata)};
const auto len{parse_name(this->tgtbuf, tgtbuf)}; const auto len{parse_name(this->tgtbuf, tgtbuf)};