Deleted Added
sdiff udiff text old ( 168441 ) new ( 170244 )
full compact
res_debug.c (168441) res_debug.c (170244)
1/*
2 * Copyright (c) 1985
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 77 unchanged lines hidden (view full) ---

86 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
87 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
88 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
89 * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
90 */
91
92#if defined(LIBC_SCCS) && !defined(lint)
93static const char sccsid[] = "@(#)res_debug.c 8.1 (Berkeley) 6/4/93";
1/*
2 * Copyright (c) 1985
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 77 unchanged lines hidden (view full) ---

86 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
87 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
88 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
89 * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
90 */
91
92#if defined(LIBC_SCCS) && !defined(lint)
93static const char sccsid[] = "@(#)res_debug.c 8.1 (Berkeley) 6/4/93";
94static const char rcsid[] = "$Id: res_debug.c,v 1.3.2.5.4.6 2005/07/28 07:43:22 marka Exp $";
94static const char rcsid[] = "$Id: res_debug.c,v 1.10.18.5 2005/07/28 07:38:11 marka Exp $";
95#endif /* LIBC_SCCS and not lint */
96#include <sys/cdefs.h>
95#endif /* LIBC_SCCS and not lint */
96#include <sys/cdefs.h>
97__FBSDID("$FreeBSD: head/lib/libc/resolv/res_debug.c 168441 2007-04-06 19:45:17Z kan $");
97__FBSDID("$FreeBSD: head/lib/libc/resolv/res_debug.c 170244 2007-06-03 17:20:27Z ume $");
98
99#include "port_before.h"
100
101#include <sys/types.h>
102#include <sys/param.h>
103#include <sys/socket.h>
104
105#include <netinet/in.h>

--- 17 unchanged lines hidden (view full) ---

123# define SPRINTF(x) strlen(sprintf/**/x)
124#else
125# define SPRINTF(x) sprintf x
126#endif
127
128extern const char *_res_opcodes[];
129extern const char *_res_sectioncodes[];
130
98
99#include "port_before.h"
100
101#include <sys/types.h>
102#include <sys/param.h>
103#include <sys/socket.h>
104
105#include <netinet/in.h>

--- 17 unchanged lines hidden (view full) ---

123# define SPRINTF(x) strlen(sprintf/**/x)
124#else
125# define SPRINTF(x) sprintf x
126#endif
127
128extern const char *_res_opcodes[];
129extern const char *_res_sectioncodes[];
130
131/*
131/*%
132 * Print the current options.
133 */
134void
135fp_resstat(const res_state statp, FILE *file) {
136 u_long mask;
137
138 fprintf(file, ";; res options:");
139 for (mask = 1; mask != 0U; mask <<= 1)

--- 76 unchanged lines hidden (view full) ---

216 }
217 rrnum++;
218 }
219 cleanup:
220 if (buf != NULL)
221 free(buf);
222}
223
132 * Print the current options.
133 */
134void
135fp_resstat(const res_state statp, FILE *file) {
136 u_long mask;
137
138 fprintf(file, ";; res options:");
139 for (mask = 1; mask != 0U; mask <<= 1)

--- 76 unchanged lines hidden (view full) ---

216 }
217 rrnum++;
218 }
219 cleanup:
220 if (buf != NULL)
221 free(buf);
222}
223
224/*
224/*%
225 * Print the contents of a query.
226 * This is intended to be primarily a debugging routine.
227 */
228void
229res_pquery(const res_state statp, const u_char *msg, int len, FILE *file) {
230 ns_msg handle;
231 int qdcount, ancount, nscount, arcount;
232 u_int opcode, rcode, id;

--- 78 unchanged lines hidden (view full) ---

311 return (cp + n);
312}
313
314const u_char *
315p_cdname(const u_char *cp, const u_char *msg, FILE *file) {
316 return (p_cdnname(cp, msg, PACKETSZ, file));
317}
318
225 * Print the contents of a query.
226 * This is intended to be primarily a debugging routine.
227 */
228void
229res_pquery(const res_state statp, const u_char *msg, int len, FILE *file) {
230 ns_msg handle;
231 int qdcount, ancount, nscount, arcount;
232 u_int opcode, rcode, id;

--- 78 unchanged lines hidden (view full) ---

311 return (cp + n);
312}
313
314const u_char *
315p_cdname(const u_char *cp, const u_char *msg, FILE *file) {
316 return (p_cdnname(cp, msg, PACKETSZ, file));
317}
318
319/* Return a fully-qualified domain name from a compressed name (with
319/*%
320 * Return a fully-qualified domain name from a compressed name (with
320 length supplied). */
321
322const u_char *
323p_fqnname(cp, msg, msglen, name, namelen)
324 const u_char *cp, *msg;
325 int msglen;
326 char *name;
327 int namelen;
328{
329 int n, newlen;
330
331 if ((n = dn_expand(msg, cp + msglen, cp, name, namelen)) < 0)
332 return (NULL);
333 newlen = strlen(name);
334 if (newlen == 0 || name[newlen - 1] != '.') {
321 length supplied). */
322
323const u_char *
324p_fqnname(cp, msg, msglen, name, namelen)
325 const u_char *cp, *msg;
326 int msglen;
327 char *name;
328 int namelen;
329{
330 int n, newlen;
331
332 if ((n = dn_expand(msg, cp + msglen, cp, name, namelen)) < 0)
333 return (NULL);
334 newlen = strlen(name);
335 if (newlen == 0 || name[newlen - 1] != '.') {
335 if (newlen + 1 >= namelen) /* Lack space for final dot */
336 if (newlen + 1 >= namelen) /*%< Lack space for final dot */
336 return (NULL);
337 else
338 strcpy(name + newlen, ".");
339 }
340 return (cp + n);
341}
342
343/* XXX: the rest of these functions need to become length-limited, too. */

--- 5 unchanged lines hidden (view full) ---

349
350 n = p_fqnname(cp, msg, MAXCDNAME, name, sizeof name);
351 if (n == NULL)
352 return (NULL);
353 fputs(name, file);
354 return (n);
355}
356
337 return (NULL);
338 else
339 strcpy(name + newlen, ".");
340 }
341 return (cp + n);
342}
343
344/* XXX: the rest of these functions need to become length-limited, too. */

--- 5 unchanged lines hidden (view full) ---

350
351 n = p_fqnname(cp, msg, MAXCDNAME, name, sizeof name);
352 if (n == NULL)
353 return (NULL);
354 fputs(name, file);
355 return (n);
356}
357
357/*
358/*%
358 * Names of RR classes and qclasses. Classes and qclasses are the same, except
359 * that C_ANY is a qclass but not a class. (You can ask for records of class
360 * C_ANY, but you can't have any records of that class in the database.)
361 */
362const struct res_sym __p_class_syms[] = {
363 {C_IN, "IN", (char *)0},
364 {C_CHAOS, "CH", (char *)0},
365 {C_CHAOS, "CHAOS", (char *)0},
366 {C_HS, "HS", (char *)0},
367 {C_HS, "HESIOD", (char *)0},
368 {C_ANY, "ANY", (char *)0},
369 {C_NONE, "NONE", (char *)0},
370 {C_IN, (char *)0, (char *)0}
371};
372
359 * Names of RR classes and qclasses. Classes and qclasses are the same, except
360 * that C_ANY is a qclass but not a class. (You can ask for records of class
361 * C_ANY, but you can't have any records of that class in the database.)
362 */
363const struct res_sym __p_class_syms[] = {
364 {C_IN, "IN", (char *)0},
365 {C_CHAOS, "CH", (char *)0},
366 {C_CHAOS, "CHAOS", (char *)0},
367 {C_HS, "HS", (char *)0},
368 {C_HS, "HESIOD", (char *)0},
369 {C_ANY, "ANY", (char *)0},
370 {C_NONE, "NONE", (char *)0},
371 {C_IN, (char *)0, (char *)0}
372};
373
373/*
374/*%
374 * Names of message sections.
375 */
376static const struct res_sym __p_default_section_syms[] = {
377 {ns_s_qd, "QUERY", (char *)0},
378 {ns_s_an, "ANSWER", (char *)0},
379 {ns_s_ns, "AUTHORITY", (char *)0},
380 {ns_s_ar, "ADDITIONAL", (char *)0},
381 {0, (char *)0, (char *)0}

--- 20 unchanged lines hidden (view full) ---

402 {cert_t_pkix, "PKIX", "PKIX (X.509v3) Certificate"},
403 {cert_t_spki, "SPKI", "SPKI certificate"},
404 {cert_t_pgp, "PGP", "PGP certificate"},
405 {cert_t_url, "URL", "URL Private"},
406 {cert_t_oid, "OID", "OID Private"},
407 {0, NULL, NULL}
408};
409
375 * Names of message sections.
376 */
377static const struct res_sym __p_default_section_syms[] = {
378 {ns_s_qd, "QUERY", (char *)0},
379 {ns_s_an, "ANSWER", (char *)0},
380 {ns_s_ns, "AUTHORITY", (char *)0},
381 {ns_s_ar, "ADDITIONAL", (char *)0},
382 {0, (char *)0, (char *)0}

--- 20 unchanged lines hidden (view full) ---

403 {cert_t_pkix, "PKIX", "PKIX (X.509v3) Certificate"},
404 {cert_t_spki, "SPKI", "SPKI certificate"},
405 {cert_t_pgp, "PGP", "PGP certificate"},
406 {cert_t_url, "URL", "URL Private"},
407 {cert_t_oid, "OID", "OID Private"},
408 {0, NULL, NULL}
409};
410
410/*
411/*%
411 * Names of RR types and qtypes. Types and qtypes are the same, except
412 * that T_ANY is a qtype but not a type. (You can ask for records of type
413 * T_ANY, but you can't have any records of that type in the database.)
414 */
415const struct res_sym __p_type_syms[] = {
416 {ns_t_a, "A", "address"},
417 {ns_t_ns, "NS", "name server"},
418 {ns_t_md, "MD", "mail destination (deprecated)"},

--- 41 unchanged lines hidden (view full) ---

460 {ns_t_a6, "A6", "IPv6 Address"},
461 {ns_t_dname, "DNAME", "dname"},
462 {ns_t_sink, "SINK", "Kitchen Sink (experimental)"},
463 {ns_t_opt, "OPT", "EDNS Options"},
464 {ns_t_any, "ANY", "\"any\""},
465 {0, NULL, NULL}
466};
467
412 * Names of RR types and qtypes. Types and qtypes are the same, except
413 * that T_ANY is a qtype but not a type. (You can ask for records of type
414 * T_ANY, but you can't have any records of that type in the database.)
415 */
416const struct res_sym __p_type_syms[] = {
417 {ns_t_a, "A", "address"},
418 {ns_t_ns, "NS", "name server"},
419 {ns_t_md, "MD", "mail destination (deprecated)"},

--- 41 unchanged lines hidden (view full) ---

461 {ns_t_a6, "A6", "IPv6 Address"},
462 {ns_t_dname, "DNAME", "dname"},
463 {ns_t_sink, "SINK", "Kitchen Sink (experimental)"},
464 {ns_t_opt, "OPT", "EDNS Options"},
465 {ns_t_any, "ANY", "\"any\""},
466 {0, NULL, NULL}
467};
468
468/*
469/*%
469 * Names of DNS rcodes.
470 */
471const struct res_sym __p_rcode_syms[] = {
472 {ns_r_noerror, "NOERROR", "no error"},
473 {ns_r_formerr, "FORMERR", "format error"},
474 {ns_r_servfail, "SERVFAIL", "server failed"},
475 {ns_r_nxdomain, "NXDOMAIN", "no such domain name"},
476 {ns_r_notimpl, "NOTIMP", "not implemented"},

--- 16 unchanged lines hidden (view full) ---

493 if (strcasecmp (name, syms->name) == 0) {
494 if (success)
495 *success = 1;
496 return (syms->number);
497 }
498 }
499 if (success)
500 *success = 0;
470 * Names of DNS rcodes.
471 */
472const struct res_sym __p_rcode_syms[] = {
473 {ns_r_noerror, "NOERROR", "no error"},
474 {ns_r_formerr, "FORMERR", "format error"},
475 {ns_r_servfail, "SERVFAIL", "server failed"},
476 {ns_r_nxdomain, "NXDOMAIN", "no such domain name"},
477 {ns_r_notimpl, "NOTIMP", "not implemented"},

--- 16 unchanged lines hidden (view full) ---

494 if (strcasecmp (name, syms->name) == 0) {
495 if (success)
496 *success = 1;
497 return (syms->number);
498 }
499 }
500 if (success)
501 *success = 0;
501 return (syms->number); /* The default value. */
502 return (syms->number); /*%< The default value. */
502}
503
504const char *
505sym_ntos(const struct res_sym *syms, int number, int *success) {
506 char *unname = sym_ntos_unname;
507
508 for ((void)NULL; syms->name != 0; syms++) {
509 if (number == syms->number) {
510 if (success)
511 *success = 1;
512 return (syms->name);
513 }
514 }
515
503}
504
505const char *
506sym_ntos(const struct res_sym *syms, int number, int *success) {
507 char *unname = sym_ntos_unname;
508
509 for ((void)NULL; syms->name != 0; syms++) {
510 if (number == syms->number) {
511 if (success)
512 *success = 1;
513 return (syms->name);
514 }
515 }
516
516 sprintf(unname, "%d", number); /* XXX nonreentrant */
517 sprintf(unname, "%d", number); /*%< XXX nonreentrant */
517 if (success)
518 *success = 0;
519 return (unname);
520}
521
522const char *
523sym_ntop(const struct res_sym *syms, int number, int *success) {
524 char *unname = sym_ntop_unname;
525
526 for ((void)NULL; syms->name != 0; syms++) {
527 if (number == syms->number) {
528 if (success)
529 *success = 1;
530 return (syms->humanname);
531 }
532 }
518 if (success)
519 *success = 0;
520 return (unname);
521}
522
523const char *
524sym_ntop(const struct res_sym *syms, int number, int *success) {
525 char *unname = sym_ntop_unname;
526
527 for ((void)NULL; syms->name != 0; syms++) {
528 if (number == syms->number) {
529 if (success)
530 *success = 1;
531 return (syms->humanname);
532 }
533 }
533 sprintf(unname, "%d", number); /* XXX nonreentrant */
534 sprintf(unname, "%d", number); /*%< XXX nonreentrant */
534 if (success)
535 *success = 0;
536 return (unname);
537}
538
535 if (success)
536 *success = 0;
537 return (unname);
538}
539
539/*
540/*%
540 * Return a string for the type.
541 */
542const char *
543p_type(int type) {
544 int success;
545 const char *result;
546 static char typebuf[20];
547
548 result = sym_ntos(__p_type_syms, type, &success);
549 if (success)
550 return (result);
551 if (type < 0 || type > 0xffff)
552 return ("BADTYPE");
553 sprintf(typebuf, "TYPE%d", type);
554 return (typebuf);
555}
556
541 * Return a string for the type.
542 */
543const char *
544p_type(int type) {
545 int success;
546 const char *result;
547 static char typebuf[20];
548
549 result = sym_ntos(__p_type_syms, type, &success);
550 if (success)
551 return (result);
552 if (type < 0 || type > 0xffff)
553 return ("BADTYPE");
554 sprintf(typebuf, "TYPE%d", type);
555 return (typebuf);
556}
557
557/*
558/*%
558 * Return a string for the type.
559 */
560const char *
561p_section(int section, int opcode) {
562 const struct res_sym *symbols;
563
564 switch (opcode) {
565 case ns_o_update:
566 symbols = __p_update_section_syms;
567 break;
568 default:
569 symbols = __p_default_section_syms;
570 break;
571 }
572 return (sym_ntos(symbols, section, (int *)0));
573}
574
559 * Return a string for the type.
560 */
561const char *
562p_section(int section, int opcode) {
563 const struct res_sym *symbols;
564
565 switch (opcode) {
566 case ns_o_update:
567 symbols = __p_update_section_syms;
568 break;
569 default:
570 symbols = __p_default_section_syms;
571 break;
572 }
573 return (sym_ntos(symbols, section, (int *)0));
574}
575
575/*
576/*%
576 * Return a mnemonic for class.
577 */
578const char *
579p_class(int class) {
580 int success;
581 const char *result;
582 static char classbuf[20];
583
584 result = sym_ntos(__p_class_syms, class, &success);
585 if (success)
586 return (result);
587 if (class < 0 || class > 0xffff)
588 return ("BADCLASS");
589 sprintf(classbuf, "CLASS%d", class);
590 return (classbuf);
591}
592
577 * Return a mnemonic for class.
578 */
579const char *
580p_class(int class) {
581 int success;
582 const char *result;
583 static char classbuf[20];
584
585 result = sym_ntos(__p_class_syms, class, &success);
586 if (success)
587 return (result);
588 if (class < 0 || class > 0xffff)
589 return ("BADCLASS");
590 sprintf(classbuf, "CLASS%d", class);
591 return (classbuf);
592}
593
593/*
594/*%
594 * Return a mnemonic for an option
595 */
596const char *
597p_option(u_long option) {
598 char *nbuf = p_option_nbuf;
599
600 switch (option) {
601 case RES_INIT: return "init";

--- 5 unchanged lines hidden (view full) ---

607 case RES_RECURSE: return "recurs";
608 case RES_DEFNAMES: return "defnam";
609 case RES_STAYOPEN: return "styopn";
610 case RES_DNSRCH: return "dnsrch";
611 case RES_INSECURE1: return "insecure1";
612 case RES_INSECURE2: return "insecure2";
613 case RES_NOALIASES: return "noaliases";
614 case RES_USE_INET6: return "inet6";
595 * Return a mnemonic for an option
596 */
597const char *
598p_option(u_long option) {
599 char *nbuf = p_option_nbuf;
600
601 switch (option) {
602 case RES_INIT: return "init";

--- 5 unchanged lines hidden (view full) ---

608 case RES_RECURSE: return "recurs";
609 case RES_DEFNAMES: return "defnam";
610 case RES_STAYOPEN: return "styopn";
611 case RES_DNSRCH: return "dnsrch";
612 case RES_INSECURE1: return "insecure1";
613 case RES_INSECURE2: return "insecure2";
614 case RES_NOALIASES: return "noaliases";
615 case RES_USE_INET6: return "inet6";
615#ifdef RES_USE_EDNS0 /* KAME extension */
616#ifdef RES_USE_EDNS0 /*%< KAME extension */
616 case RES_USE_EDNS0: return "edns0";
617#endif
618#ifdef RES_USE_DNAME
619 case RES_USE_DNAME: return "dname";
620#endif
621#ifdef RES_USE_DNSSEC
622 case RES_USE_DNSSEC: return "dnssec";
623#endif

--- 4 unchanged lines hidden (view full) ---

628 case RES_NO_NIBBLE2: return "no-nibble2";
629#endif
630 /* XXX nonreentrant */
631 default: sprintf(nbuf, "?0x%lx?", (u_long)option);
632 return (nbuf);
633 }
634}
635
617 case RES_USE_EDNS0: return "edns0";
618#endif
619#ifdef RES_USE_DNAME
620 case RES_USE_DNAME: return "dname";
621#endif
622#ifdef RES_USE_DNSSEC
623 case RES_USE_DNSSEC: return "dnssec";
624#endif

--- 4 unchanged lines hidden (view full) ---

629 case RES_NO_NIBBLE2: return "no-nibble2";
630#endif
631 /* XXX nonreentrant */
632 default: sprintf(nbuf, "?0x%lx?", (u_long)option);
633 return (nbuf);
634 }
635}
636
636/*
637/*%
637 * Return a mnemonic for a time to live.
638 */
639const char *
640p_time(u_int32_t value) {
641 char *nbuf = p_time_nbuf;
642
643 if (ns_format_ttl(value, nbuf, sizeof nbuf) < 0)
644 sprintf(nbuf, "%u", value);
645 return (nbuf);
646}
647
638 * Return a mnemonic for a time to live.
639 */
640const char *
641p_time(u_int32_t value) {
642 char *nbuf = p_time_nbuf;
643
644 if (ns_format_ttl(value, nbuf, sizeof nbuf) < 0)
645 sprintf(nbuf, "%u", value);
646 return (nbuf);
647}
648
648/*
649/*%
649 * Return a string for the rcode.
650 */
651const char *
652p_rcode(int rcode) {
653 return (sym_ntos(__p_rcode_syms, rcode, (int *)0));
654}
655
650 * Return a string for the rcode.
651 */
652const char *
653p_rcode(int rcode) {
654 return (sym_ntos(__p_rcode_syms, rcode, (int *)0));
655}
656
656/*
657/*%
657 * Return a string for a res_sockaddr_union.
658 */
659const char *
660p_sockun(union res_sockaddr_union u, char *buf, size_t size) {
661 char ret[sizeof "ffff:ffff:ffff:ffff:ffff:ffff:123.123.123.123"];
662
663 switch (u.sin.sin_family) {
664 case AF_INET:

--- 10 unchanged lines hidden (view full) ---

675 }
676 if (size > 0U) {
677 strncpy(buf, ret, size - 1);
678 buf[size - 1] = '0';
679 }
680 return (buf);
681}
682
658 * Return a string for a res_sockaddr_union.
659 */
660const char *
661p_sockun(union res_sockaddr_union u, char *buf, size_t size) {
662 char ret[sizeof "ffff:ffff:ffff:ffff:ffff:ffff:123.123.123.123"];
663
664 switch (u.sin.sin_family) {
665 case AF_INET:

--- 10 unchanged lines hidden (view full) ---

676 }
677 if (size > 0U) {
678 strncpy(buf, ret, size - 1);
679 buf[size - 1] = '0';
680 }
681 return (buf);
682}
683
683/*
684/*%
684 * routines to convert between on-the-wire RR format and zone file format.
685 * Does not contain conversion to/from decimal degrees; divide or multiply
686 * by 60*60*1000 for that.
687 */
688
689static unsigned int poweroften[10] = {1, 10, 100, 1000, 10000, 100000,
690 1000000,10000000,100000000,1000000000};
691
685 * routines to convert between on-the-wire RR format and zone file format.
686 * Does not contain conversion to/from decimal degrees; divide or multiply
687 * by 60*60*1000 for that.
688 */
689
690static unsigned int poweroften[10] = {1, 10, 100, 1000, 10000, 100000,
691 1000000,10000000,100000000,1000000000};
692
692/* takes an XeY precision/size value, returns a string representation. */
693/*% takes an XeY precision/size value, returns a string representation. */
693static const char *
694precsize_ntoa(prec)
695 u_int8_t prec;
696{
697 char *retbuf = precsize_ntoa_retbuf;
698 unsigned long val;
699 int mantissa, exponent;
700
701 mantissa = (int)((prec >> 4) & 0x0f) % 10;
702 exponent = (int)((prec >> 0) & 0x0f) % 10;
703
704 val = mantissa * poweroften[exponent];
705
706 (void) sprintf(retbuf, "%lu.%.2lu", val/100, val%100);
707 return (retbuf);
708}
709
694static const char *
695precsize_ntoa(prec)
696 u_int8_t prec;
697{
698 char *retbuf = precsize_ntoa_retbuf;
699 unsigned long val;
700 int mantissa, exponent;
701
702 mantissa = (int)((prec >> 4) & 0x0f) % 10;
703 exponent = (int)((prec >> 0) & 0x0f) % 10;
704
705 val = mantissa * poweroften[exponent];
706
707 (void) sprintf(retbuf, "%lu.%.2lu", val/100, val%100);
708 return (retbuf);
709}
710
710/* converts ascii size/precision X * 10**Y(cm) to 0xXY. moves pointer. */
711/*% converts ascii size/precision X * 10**Y(cm) to 0xXY. moves pointer. */
711static u_int8_t
712precsize_aton(const char **strptr) {
713 unsigned int mval = 0, cmval = 0;
714 u_int8_t retval = 0;
715 const char *cp;
716 int exponent;
717 int mantissa;
718
719 cp = *strptr;
720
721 while (isdigit((unsigned char)*cp))
722 mval = mval * 10 + (*cp++ - '0');
723
712static u_int8_t
713precsize_aton(const char **strptr) {
714 unsigned int mval = 0, cmval = 0;
715 u_int8_t retval = 0;
716 const char *cp;
717 int exponent;
718 int mantissa;
719
720 cp = *strptr;
721
722 while (isdigit((unsigned char)*cp))
723 mval = mval * 10 + (*cp++ - '0');
724
724 if (*cp == '.') { /* centimeters */
725 if (*cp == '.') { /*%< centimeters */
725 cp++;
726 if (isdigit((unsigned char)*cp)) {
727 cmval = (*cp++ - '0') * 10;
728 if (isdigit((unsigned char)*cp)) {
729 cmval += (*cp++ - '0');
730 }
731 }
732 }

--- 9 unchanged lines hidden (view full) ---

742
743 retval = (mantissa << 4) | exponent;
744
745 *strptr = cp;
746
747 return (retval);
748}
749
726 cp++;
727 if (isdigit((unsigned char)*cp)) {
728 cmval = (*cp++ - '0') * 10;
729 if (isdigit((unsigned char)*cp)) {
730 cmval += (*cp++ - '0');
731 }
732 }
733 }

--- 9 unchanged lines hidden (view full) ---

743
744 retval = (mantissa << 4) | exponent;
745
746 *strptr = cp;
747
748 return (retval);
749}
750
750/* converts ascii lat/lon to unsigned encoded 32-bit number. moves pointer. */
751/*% converts ascii lat/lon to unsigned encoded 32-bit number. moves pointer. */
751static u_int32_t
752latlon2ul(const char **latlonstrptr, int *which) {
753 const char *cp;
754 u_int32_t retval;
755 int deg = 0, min = 0, secs = 0, secsfrac = 0;
756
757 cp = *latlonstrptr;
758

--- 13 unchanged lines hidden (view full) ---

772 cp++;
773
774 if (!(isdigit((unsigned char)*cp)))
775 goto fndhemi;
776
777 while (isdigit((unsigned char)*cp))
778 secs = secs * 10 + (*cp++ - '0');
779
752static u_int32_t
753latlon2ul(const char **latlonstrptr, int *which) {
754 const char *cp;
755 u_int32_t retval;
756 int deg = 0, min = 0, secs = 0, secsfrac = 0;
757
758 cp = *latlonstrptr;
759

--- 13 unchanged lines hidden (view full) ---

773 cp++;
774
775 if (!(isdigit((unsigned char)*cp)))
776 goto fndhemi;
777
778 while (isdigit((unsigned char)*cp))
779 secs = secs * 10 + (*cp++ - '0');
780
780 if (*cp == '.') { /* decimal seconds */
781 if (*cp == '.') { /*%< decimal seconds */
781 cp++;
782 if (isdigit((unsigned char)*cp)) {
783 secsfrac = (*cp++ - '0') * 100;
784 if (isdigit((unsigned char)*cp)) {
785 secsfrac += (*cp++ - '0') * 10;
786 if (isdigit((unsigned char)*cp)) {
787 secsfrac += (*cp++ - '0');
788 }
789 }
790 }
791 }
792
782 cp++;
783 if (isdigit((unsigned char)*cp)) {
784 secsfrac = (*cp++ - '0') * 100;
785 if (isdigit((unsigned char)*cp)) {
786 secsfrac += (*cp++ - '0') * 10;
787 if (isdigit((unsigned char)*cp)) {
788 secsfrac += (*cp++ - '0');
789 }
790 }
791 }
792 }
793
793 while (!isspace((unsigned char)*cp)) /* if any trailing garbage */
794 while (!isspace((unsigned char)*cp)) /*%< if any trailing garbage */
794 cp++;
795
796 while (isspace((unsigned char)*cp))
797 cp++;
798
799 fndhemi:
800 switch (*cp) {
801 case 'N': case 'n':

--- 4 unchanged lines hidden (view full) ---

806 break;
807 case 'S': case 's':
808 case 'W': case 'w':
809 retval = ((unsigned)1<<31)
810 - (((((deg * 60) + min) * 60) + secs) * 1000)
811 - secsfrac;
812 break;
813 default:
795 cp++;
796
797 while (isspace((unsigned char)*cp))
798 cp++;
799
800 fndhemi:
801 switch (*cp) {
802 case 'N': case 'n':

--- 4 unchanged lines hidden (view full) ---

807 break;
808 case 'S': case 's':
809 case 'W': case 'w':
810 retval = ((unsigned)1<<31)
811 - (((((deg * 60) + min) * 60) + secs) * 1000)
812 - secsfrac;
813 break;
814 default:
814 retval = 0; /* invalid value -- indicates error */
815 retval = 0; /*%< invalid value -- indicates error */
815 break;
816 }
817
818 switch (*cp) {
819 case 'N': case 'n':
820 case 'S': case 's':
816 break;
817 }
818
819 switch (*cp) {
820 case 'N': case 'n':
821 case 'S': case 's':
821 *which = 1; /* latitude */
822 *which = 1; /*%< latitude */
822 break;
823 case 'E': case 'e':
824 case 'W': case 'w':
823 break;
824 case 'E': case 'e':
825 case 'W': case 'w':
825 *which = 2; /* longitude */
826 *which = 2; /*%< longitude */
826 break;
827 default:
827 break;
828 default:
828 *which = 0; /* error */
829 *which = 0; /*%< error */
829 break;
830 }
831
830 break;
831 }
832
832 cp++; /* skip the hemisphere */
833
834 while (!isspace((unsigned char)*cp)) /* if any trailing garbage */
833 cp++; /*%< skip the hemisphere */
834 while (!isspace((unsigned char)*cp)) /*%< if any trailing garbage */
835 cp++;
836
835 cp++;
836
837 while (isspace((unsigned char)*cp)) /* move to next field */
837 while (isspace((unsigned char)*cp)) /*%< move to next field */
838 cp++;
839
840 *latlonstrptr = cp;
841
842 return (retval);
843}
844
838 cp++;
839
840 *latlonstrptr = cp;
841
842 return (retval);
843}
844
845/* converts a zone file representation in a string to an RDATA on-the-wire
845/*%
846 * converts a zone file representation in a string to an RDATA on-the-wire
846 * representation. */
847int
848loc_aton(ascii, binary)
849 const char *ascii;
850 u_char *binary;
851{
852 const char *cp, *maxcp;
853 u_char *bcp;
854
855 u_int32_t latit = 0, longit = 0, alt = 0;
856 u_int32_t lltemp1 = 0, lltemp2 = 0;
857 int altmeters = 0, altfrac = 0, altsign = 1;
847 * representation. */
848int
849loc_aton(ascii, binary)
850 const char *ascii;
851 u_char *binary;
852{
853 const char *cp, *maxcp;
854 u_char *bcp;
855
856 u_int32_t latit = 0, longit = 0, alt = 0;
857 u_int32_t lltemp1 = 0, lltemp2 = 0;
858 int altmeters = 0, altfrac = 0, altsign = 1;
858 u_int8_t hp = 0x16; /* default = 1e6 cm = 10000.00m = 10km */
859 u_int8_t vp = 0x13; /* default = 1e3 cm = 10.00m */
860 u_int8_t siz = 0x12; /* default = 1e2 cm = 1.00m */
859 u_int8_t hp = 0x16; /*%< default = 1e6 cm = 10000.00m = 10km */
860 u_int8_t vp = 0x13; /*%< default = 1e3 cm = 10.00m */
861 u_int8_t siz = 0x12; /*%< default = 1e2 cm = 1.00m */
861 int which1 = 0, which2 = 0;
862
863 cp = ascii;
864 maxcp = cp + strlen(ascii);
865
866 lltemp1 = latlon2ul(&cp, &which1);
867
868 lltemp2 = latlon2ul(&cp, &which2);
869
870 switch (which1 + which2) {
862 int which1 = 0, which2 = 0;
863
864 cp = ascii;
865 maxcp = cp + strlen(ascii);
866
867 lltemp1 = latlon2ul(&cp, &which1);
868
869 lltemp2 = latlon2ul(&cp, &which2);
870
871 switch (which1 + which2) {
871 case 3: /* 1 + 2, the only valid combination */
872 if ((which1 == 1) && (which2 == 2)) { /* normal case */
872 case 3: /*%< 1 + 2, the only valid combination */
873 if ((which1 == 1) && (which2 == 2)) { /*%< normal case */
873 latit = lltemp1;
874 longit = lltemp2;
874 latit = lltemp1;
875 longit = lltemp2;
875 } else if ((which1 == 2) && (which2 == 1)) { /* reversed */
876 } else if ((which1 == 2) && (which2 == 1)) { /*%< reversed */
876 longit = lltemp1;
877 latit = lltemp2;
877 longit = lltemp1;
878 latit = lltemp2;
878 } else { /* some kind of brokenness */
879 } else { /*%< some kind of brokenness */
879 return (0);
880 }
881 break;
880 return (0);
881 }
882 break;
882 default: /* we didn't get one of each */
883 default: /*%< we didn't get one of each */
883 return (0);
884 }
885
886 /* altitude */
887 if (*cp == '-') {
888 altsign = -1;
889 cp++;
890 }
891
892 if (*cp == '+')
893 cp++;
894
895 while (isdigit((unsigned char)*cp))
896 altmeters = altmeters * 10 + (*cp++ - '0');
897
884 return (0);
885 }
886
887 /* altitude */
888 if (*cp == '-') {
889 altsign = -1;
890 cp++;
891 }
892
893 if (*cp == '+')
894 cp++;
895
896 while (isdigit((unsigned char)*cp))
897 altmeters = altmeters * 10 + (*cp++ - '0');
898
898 if (*cp == '.') { /* decimal meters */
899 if (*cp == '.') { /*%< decimal meters */
899 cp++;
900 if (isdigit((unsigned char)*cp)) {
901 altfrac = (*cp++ - '0') * 10;
902 if (isdigit((unsigned char)*cp)) {
903 altfrac += (*cp++ - '0');
904 }
905 }
906 }
907
908 alt = (10000000 + (altsign * (altmeters * 100 + altfrac)));
909
900 cp++;
901 if (isdigit((unsigned char)*cp)) {
902 altfrac = (*cp++ - '0') * 10;
903 if (isdigit((unsigned char)*cp)) {
904 altfrac += (*cp++ - '0');
905 }
906 }
907 }
908
909 alt = (10000000 + (altsign * (altmeters * 100 + altfrac)));
910
910 while (!isspace((unsigned char)*cp) && (cp < maxcp)) /* if trailing garbage or m */
911 while (!isspace((unsigned char)*cp) && (cp < maxcp)) /*%< if trailing garbage or m */
911 cp++;
912
913 while (isspace((unsigned char)*cp) && (cp < maxcp))
914 cp++;
915
916 if (cp >= maxcp)
917 goto defaults;
918
919 siz = precsize_aton(&cp);
920
912 cp++;
913
914 while (isspace((unsigned char)*cp) && (cp < maxcp))
915 cp++;
916
917 if (cp >= maxcp)
918 goto defaults;
919
920 siz = precsize_aton(&cp);
921
921 while (!isspace((unsigned char)*cp) && (cp < maxcp)) /* if trailing garbage or m */
922 while (!isspace((unsigned char)*cp) && (cp < maxcp)) /*%< if trailing garbage or m */
922 cp++;
923
924 while (isspace((unsigned char)*cp) && (cp < maxcp))
925 cp++;
926
927 if (cp >= maxcp)
928 goto defaults;
929
930 hp = precsize_aton(&cp);
931
923 cp++;
924
925 while (isspace((unsigned char)*cp) && (cp < maxcp))
926 cp++;
927
928 if (cp >= maxcp)
929 goto defaults;
930
931 hp = precsize_aton(&cp);
932
932 while (!isspace((unsigned char)*cp) && (cp < maxcp)) /* if trailing garbage or m */
933 while (!isspace((unsigned char)*cp) && (cp < maxcp)) /*%< if trailing garbage or m */
933 cp++;
934
935 while (isspace((unsigned char)*cp) && (cp < maxcp))
936 cp++;
937
938 if (cp >= maxcp)
939 goto defaults;
940
941 vp = precsize_aton(&cp);
942
943 defaults:
944
945 bcp = binary;
934 cp++;
935
936 while (isspace((unsigned char)*cp) && (cp < maxcp))
937 cp++;
938
939 if (cp >= maxcp)
940 goto defaults;
941
942 vp = precsize_aton(&cp);
943
944 defaults:
945
946 bcp = binary;
946 *bcp++ = (u_int8_t) 0; /* version byte */
947 *bcp++ = (u_int8_t) 0; /*%< version byte */
947 *bcp++ = siz;
948 *bcp++ = hp;
949 *bcp++ = vp;
950 PUTLONG(latit,bcp);
951 PUTLONG(longit,bcp);
952 PUTLONG(alt,bcp);
953
948 *bcp++ = siz;
949 *bcp++ = hp;
950 *bcp++ = vp;
951 PUTLONG(latit,bcp);
952 PUTLONG(longit,bcp);
953 PUTLONG(alt,bcp);
954
954 return (16); /* size of RR in octets */
955 return (16); /*%< size of RR in octets */
955}
956
956}
957
957/* takes an on-the-wire LOC RR and formats it in a human readable format. */
958/*% takes an on-the-wire LOC RR and formats it in a human readable format. */
958const char *
959loc_ntoa(binary, ascii)
960 const u_char *binary;
961 char *ascii;
962{
963 static const char *error = "?";
964 static char tmpbuf[sizeof
965"1000 60 60.000 N 1000 60 60.000 W -12345678.00m 90000000.00m 90000000.00m 90000000.00m"];

--- 30 unchanged lines hidden (view full) ---

996
997 GETLONG(templ, cp);
998 latval = (templ - ((unsigned)1<<31));
999
1000 GETLONG(templ, cp);
1001 longval = (templ - ((unsigned)1<<31));
1002
1003 GETLONG(templ, cp);
959const char *
960loc_ntoa(binary, ascii)
961 const u_char *binary;
962 char *ascii;
963{
964 static const char *error = "?";
965 static char tmpbuf[sizeof
966"1000 60 60.000 N 1000 60 60.000 W -12345678.00m 90000000.00m 90000000.00m 90000000.00m"];

--- 30 unchanged lines hidden (view full) ---

997
998 GETLONG(templ, cp);
999 latval = (templ - ((unsigned)1<<31));
1000
1001 GETLONG(templ, cp);
1002 longval = (templ - ((unsigned)1<<31));
1003
1004 GETLONG(templ, cp);
1004 if (templ < referencealt) { /* below WGS 84 spheroid */
1005 if (templ < referencealt) { /*%< below WGS 84 spheroid */
1005 altval = referencealt - templ;
1006 altsign = "-";
1007 } else {
1008 altval = templ - referencealt;
1009 altsign = "";
1010 }
1011
1012 if (latval < 0) {

--- 46 unchanged lines hidden (view full) ---

1059 free(hpstr);
1060 if (vpstr != NULL)
1061 free(vpstr);
1062
1063 return (ascii);
1064}
1065
1066
1006 altval = referencealt - templ;
1007 altsign = "-";
1008 } else {
1009 altval = templ - referencealt;
1010 altsign = "";
1011 }
1012
1013 if (latval < 0) {

--- 46 unchanged lines hidden (view full) ---

1060 free(hpstr);
1061 if (vpstr != NULL)
1062 free(vpstr);
1063
1064 return (ascii);
1065}
1066
1067
1067/* Return the number of DNS hierarchy levels in the name. */
1068/*% Return the number of DNS hierarchy levels in the name. */
1068int
1069dn_count_labels(const char *name) {
1070 int i, len, count;
1071
1072 len = strlen(name);
1073 for (i = 0, count = 0; i < len; i++) {
1074 /* XXX need to check for \. or use named's nlabels(). */
1075 if (name[i] == '.')

--- 8 unchanged lines hidden (view full) ---

1084 /* don't count the null label for root. */
1085 /* if terminating '.' not found, must adjust */
1086 /* count to include last label */
1087 if (len > 0 && name[len-1] != '.')
1088 count++;
1089 return (count);
1090}
1091
1069int
1070dn_count_labels(const char *name) {
1071 int i, len, count;
1072
1073 len = strlen(name);
1074 for (i = 0, count = 0; i < len; i++) {
1075 /* XXX need to check for \. or use named's nlabels(). */
1076 if (name[i] == '.')

--- 8 unchanged lines hidden (view full) ---

1085 /* don't count the null label for root. */
1086 /* if terminating '.' not found, must adjust */
1087 /* count to include last label */
1088 if (len > 0 && name[len-1] != '.')
1089 count++;
1090 return (count);
1091}
1092
1092
1093/*
1093/*%
1094 * Make dates expressed in seconds-since-Jan-1-1970 easy to read.
1095 * SIG records are required to be printed like this, by the Secure DNS RFC.
1096 */
1097char *
1098p_secstodate (u_long secs) {
1099 char *output = p_secstodate_output;
1100 time_t clock = secs;
1101 struct tm *time;

--- 71 unchanged lines hidden (view full) ---

1173#undef sym_ntos
1174__weak_reference(__sym_ntos, sym_ntos);
1175#undef sym_ntop
1176__weak_reference(__sym_ntop, sym_ntop);
1177#undef dn_count_labels
1178__weak_reference(__dn_count_labels, dn_count_labels);
1179#undef p_secstodate
1180__weak_reference(__p_secstodate, p_secstodate);
1094 * Make dates expressed in seconds-since-Jan-1-1970 easy to read.
1095 * SIG records are required to be printed like this, by the Secure DNS RFC.
1096 */
1097char *
1098p_secstodate (u_long secs) {
1099 char *output = p_secstodate_output;
1100 time_t clock = secs;
1101 struct tm *time;

--- 71 unchanged lines hidden (view full) ---

1173#undef sym_ntos
1174__weak_reference(__sym_ntos, sym_ntos);
1175#undef sym_ntop
1176__weak_reference(__sym_ntop, sym_ntop);
1177#undef dn_count_labels
1178__weak_reference(__dn_count_labels, dn_count_labels);
1179#undef p_secstodate
1180__weak_reference(__p_secstodate, p_secstodate);
1181
1182/*! \file */