diff options
| author | mirabilos <m@mirbsd.org> | 2021-08-09 03:36:58 +0200 |
|---|---|---|
| committer | mirabilos <mirabilos@evolvis.org> | 2021-08-09 03:36:58 +0200 |
| commit | e966cf302aa3b7fc0748d5cdb510d2757bbff4a5 (patch) | |
| tree | 5566789bb135d8202665709a9ebf7724048f2f0c /libc/inet/resolv.c | |
| parent | dc68c2fce026e91f56636dd65b732509f6af29a5 (diff) | |
make __{en,de}code_dotted into macros
they merely call dn_{comp,expand} slightly rearranging the arguments
Signed-off-by: mirabilos <mirabilos@evolvis.org>
Diffstat (limited to 'libc/inet/resolv.c')
| -rw-r--r-- | libc/inet/resolv.c | 41 |
1 files changed, 6 insertions, 35 deletions
diff --git a/libc/inet/resolv.c b/libc/inet/resolv.c index f02781b0b..ced3b6542 100644 --- a/libc/inet/resolv.c +++ b/libc/inet/resolv.c @@ -396,14 +396,6 @@ extern int __dns_lookup(const char *name, int type, unsigned char **outpacket, struct resolv_answer *a) attribute_hidden; -extern int __encode_dotted(const char *dotted, - unsigned char *dest, - int maxlen) attribute_hidden; -extern int __decode_dotted(const unsigned char *packet, - int offset, - int packet_len, - char *dest, - int dest_len) attribute_hidden; extern int __encode_header(struct resolv_header *h, unsigned char *dest, int maxlen) attribute_hidden; @@ -418,6 +410,12 @@ extern int __encode_answer(struct resolv_answer *a, extern void __open_nameservers(void) attribute_hidden; extern void __close_nameservers(void) attribute_hidden; +#define __encode_dotted(dotted,dest,maxlen) \ + dn_comp((dotted), (dest), (maxlen), NULL, NULL) +#define __decode_dotted(packet,offset,packet_len,dest,dest_len) \ + dn_expand((packet), (packet) + (packet_len), (packet) + (offset), \ + (dest), (dest_len)) + /* * Theory of operation. * @@ -553,33 +551,6 @@ void __decode_header(unsigned char *data, #endif /* L_decodeh */ -#ifdef L_encoded - -/* Encode a dotted string into nameserver transport-level encoding. - This routine is fairly dumb, and doesn't attempt to compress - the data */ -int __encode_dotted(const char *dotted, unsigned char *dest, int maxlen) -{ - return (dn_comp(dotted, dest, maxlen, NULL, NULL)); -} -#endif /* L_encoded */ - - -#ifdef L_decoded - -/* Decode a dotted string from nameserver transport-level encoding. - This routine understands compressed data. */ -int __decode_dotted(const unsigned char *packet, - int offset, - int packet_len, - char *dest, - int dest_len) -{ - return (dn_expand(packet, packet + packet_len, packet + offset, dest, dest_len)); -} -#endif /* L_decoded */ - - #ifdef L_encodeq int __encode_question(const struct resolv_question *q, |