From 7782693e2b06cdb818d95ec9e019bead1b8fa58a Mon Sep 17 00:00:00 2001 From: Erik Ekman Date: Thu, 8 Jun 2006 18:58:15 +0000 Subject: [PATCH] Move readname() and READ macros out of dns[d].c --- read.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ read.h | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 89 insertions(+) create mode 100644 read.c create mode 100644 read.h diff --git a/read.c b/read.c new file mode 100644 index 0000000..4007cf9 --- /dev/null +++ b/read.c @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2006 Bjorn Andersson , Erik Ekman + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +#include + +int +readname(char *packet, char *dst, char *src) +{ + char l; + int len; + int offset; + + len = 0; + + while(*src) { + l = *src++; + len++; + + if(l & 0x80 && l & 0x40) { + offset = ((src[-1] & 0x3f) << 8) | src[0]; + readname(packet, dst, packet + offset); + dst += strlen(dst); + break; + } + + while(l) { + *dst++ = *src++; + l--; + len++; + } + + *dst++ = '.'; + } + + *dst = '\0'; + src++; + len++; + + return len; +} + diff --git a/read.h b/read.h new file mode 100644 index 0000000..a4075ec --- /dev/null +++ b/read.h @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2006 Bjorn Andersson , Erik Ekman + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +#ifndef _READ_H_ +#define _READ_H_ + +int readname(char *, char *, char *); + +#define READNAME(packet, dst, src) (src) += readname((packet), (dst), (src)); + +#define READSHORT(dst, src) \ + memcpy(&dst, src, 2); \ + (dst) = ntohs(dst); (src)+=2; + +#define READLONG(dst, src) \ + memcpy(&dst, src, 2); \ + (dst) = ntohl(dst); (src)+=4; + +#define READDATA(dst, src, len) \ + memcpy((dst), (src), (len)); (src)+=(len); + +#endif