chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f089257
)
resolved: dns-packet - use unaligned read/write helpers
author
Tom Gundersen
<teg@jklm.no>
Sat, 1 Nov 2014 13:07:42 +0000
(14:07 +0100)
committer
Tom Gundersen
<teg@jklm.no>
Sat, 1 Nov 2014 14:36:29 +0000
(15:36 +0100)
src/resolve/resolved-dns-packet.c
patch
|
blob
|
history
diff --git
a/src/resolve/resolved-dns-packet.c
b/src/resolve/resolved-dns-packet.c
index 7375f77481d427cb4769da98372eb67a96e3291b..e5d07b3b1ff06666e4be428fd4f78ac31ec62b48 100644
(file)
--- a/
src/resolve/resolved-dns-packet.c
+++ b/
src/resolve/resolved-dns-packet.c
@@
-22,6
+22,7
@@
#include "utf8.h"
#include "util.h"
#include "strv.h"
#include "utf8.h"
#include "util.h"
#include "strv.h"
+#include "unaligned.h"
#include "resolved-dns-domain.h"
#include "resolved-dns-packet.h"
#include "resolved-dns-domain.h"
#include "resolved-dns-packet.h"
@@
-311,8
+312,7
@@
int dns_packet_append_uint16(DnsPacket *p, uint16_t v, size_t *start) {
if (r < 0)
return r;
if (r < 0)
return r;
- ((uint8_t*) d)[0] = (uint8_t) (v >> 8);
- ((uint8_t*) d)[1] = (uint8_t) v;
+ unaligned_write_be16(d, v);
return 0;
}
return 0;
}
@@
-327,10
+327,7
@@
int dns_packet_append_uint32(DnsPacket *p, uint32_t v, size_t *start) {
if (r < 0)
return r;
if (r < 0)
return r;
- ((uint8_t*) d)[0] = (uint8_t) (v >> 24);
- ((uint8_t*) d)[1] = (uint8_t) (v >> 16);
- ((uint8_t*) d)[2] = (uint8_t) (v >> 8);
- ((uint8_t*) d)[3] = (uint8_t) v;
+ unaligned_write_be32(d, v);
return 0;
}
return 0;
}
@@
-793,8
+790,8
@@
int dns_packet_read_uint16(DnsPacket *p, uint16_t *ret, size_t *start) {
if (r < 0)
return r;
if (r < 0)
return r;
- *ret =
(((uint16_t) ((uint8_t*) d)[0]) << 8) |
- ((uint16_t) ((uint8_t*) d)[1]);
+ *ret =
unaligned_read_be16(d);
+
return 0;
}
return 0;
}
@@
-808,10
+805,7
@@
int dns_packet_read_uint32(DnsPacket *p, uint32_t *ret, size_t *start) {
if (r < 0)
return r;
if (r < 0)
return r;
- *ret = (((uint32_t) ((uint8_t*) d)[0]) << 24) |
- (((uint32_t) ((uint8_t*) d)[1]) << 16) |
- (((uint32_t) ((uint8_t*) d)[2]) << 8) |
- ((uint32_t) ((uint8_t*) d)[3]);
+ *ret = unaligned_read_be32(d);
return 0;
}
return 0;
}