From bce16467708a050e1c88a010f7dfb370013e5ea6 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 6 May 2006 18:04:35 +0000 Subject: * include/arpa/nameser.h: Also optimize NS_PUT16 and NS_PUT32. * resolv/res_mkquery.c: Use NS_PUT16 and NS_PUT32 instead of __putshort and __putlong respectively. Correct buffer overflow check for NS_NOTIFY_OP. * resolv/res_send.c (send_vc): Use ns_put16 instead of putshort. --- include/arpa/nameser.h | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/arpa/nameser.h b/include/arpa/nameser.h index 09bd504..449f5b4 100644 --- a/include/arpa/nameser.h +++ b/include/arpa/nameser.h @@ -18,10 +18,26 @@ } while (0) # undef NS_GET32 -# define NS_GET32(s, cp) \ +# define NS_GET32(l, cp) \ do { \ uint32_t *t_cp = (uint32_t *) (cp); \ - (s) = ntohl (*t_cp); \ + (l) = ntohl (*t_cp); \ + (cp) += NS_INT32SZ; \ + } while (0) + +# undef NS_PUT16 +# define NS_PUT16(s, cp) \ + do { \ + uint16_t *t_cp = (uint16_t *) (cp); \ + *t_cp = htons (s); \ + (cp) += NS_INT16SZ; \ + } while (0) + +# undef NS_PUT32 +# define NS_PUT32(l, cp) \ + do { \ + uint32_t *t_cp = (uint32_t *) (cp); \ + *t_cp = htonl (l); \ (cp) += NS_INT32SZ; \ } while (0) -- cgit v1.1