Deleted Added
sdiff udiff text old ( 118498 ) new ( 121156 )
full compact
ndp.c (118498) ndp.c (121156)
1/* $FreeBSD: head/usr.sbin/ndp/ndp.c 118498 2003-08-05 14:57:11Z ume $ */
1/* $FreeBSD: head/usr.sbin/ndp/ndp.c 121156 2003-10-17 11:46:40Z ume $ */
2/* $KAME: ndp.c,v 1.65 2001/05/08 04:36:34 itojun Exp $ */
3
4/*
5 * Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
6 * All rights reserved.
7 *
8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions

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

108#include <string.h>
109#include <paths.h>
110#include <err.h>
111#include <stdlib.h>
112#include <fcntl.h>
113#include <unistd.h>
114#include "gmt2local.h"
115
2/* $KAME: ndp.c,v 1.65 2001/05/08 04:36:34 itojun Exp $ */
3
4/*
5 * Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
6 * All rights reserved.
7 *
8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions

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

108#include <string.h>
109#include <paths.h>
110#include <err.h>
111#include <stdlib.h>
112#include <fcntl.h>
113#include <unistd.h>
114#include "gmt2local.h"
115
116#ifndef NI_WITHSCOPEID
117#define NI_WITHSCOPEID 0
118#endif
119
120/* packing rule for routing socket */
121#define ROUNDUP(a) \
122 ((a) > 0 ? (1 + (((a) - 1) | (sizeof(long) - 1))) : sizeof(long))
123#define ADVANCE(x, n) (x += ROUNDUP((n)->sa_len))
124
125static pid_t pid;
126static int cflag;
127static int nflag;

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

176{
177 int ch;
178 int aflag = 0, dflag = 0, sflag = 0, Hflag = 0,
179 pflag = 0, rflag = 0, Pflag = 0, Rflag = 0;
180
181 pid = getpid();
182 thiszone = gmt2local(0);
183 while ((ch = getopt(argc, argv, "acndfIilprstA:HPR")) != -1)
116/* packing rule for routing socket */
117#define ROUNDUP(a) \
118 ((a) > 0 ? (1 + (((a) - 1) | (sizeof(long) - 1))) : sizeof(long))
119#define ADVANCE(x, n) (x += ROUNDUP((n)->sa_len))
120
121static pid_t pid;
122static int cflag;
123static int nflag;

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

172{
173 int ch;
174 int aflag = 0, dflag = 0, sflag = 0, Hflag = 0,
175 pflag = 0, rflag = 0, Pflag = 0, Rflag = 0;
176
177 pid = getpid();
178 thiszone = gmt2local(0);
179 while ((ch = getopt(argc, argv, "acndfIilprstA:HPR")) != -1)
184 switch ((char)ch) {
180 switch (ch) {
185 case 'a':
186 aflag = 1;
187 break;
188 case 'c':
189 cflag = 1;
190 break;
191 case 'd':
192 dflag = 1;

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

311 exit(1);
312 }
313 args[0] = &arg[0][0];
314 args[1] = &arg[1][0];
315 args[2] = &arg[2][0];
316 args[3] = &arg[3][0];
317 args[4] = &arg[4][0];
318 retval = 0;
181 case 'a':
182 aflag = 1;
183 break;
184 case 'c':
185 cflag = 1;
186 break;
187 case 'd':
188 dflag = 1;

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

307 exit(1);
308 }
309 args[0] = &arg[0][0];
310 args[1] = &arg[1][0];
311 args[2] = &arg[2][0];
312 args[3] = &arg[3][0];
313 args[4] = &arg[4][0];
314 retval = 0;
319 while(fgets(line, 100, fp) != NULL) {
315 while (fgets(line, 100, fp) != NULL) {
320 i = sscanf(line, "%s %s %s %s %s", arg[0], arg[1], arg[2],
321 arg[3], arg[4]);
322 if (i < 2) {
323 fprintf(stderr, "ndp: bad line: %s\n", line);
324 retval = 1;
325 continue;
326 }
327 if (set(i, args))

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

332}
333
334void
335getsocket()
336{
337 if (s < 0) {
338 s = socket(PF_ROUTE, SOCK_RAW, 0);
339 if (s < 0) {
316 i = sscanf(line, "%s %s %s %s %s", arg[0], arg[1], arg[2],
317 arg[3], arg[4]);
318 if (i < 2) {
319 fprintf(stderr, "ndp: bad line: %s\n", line);
320 retval = 1;
321 continue;
322 }
323 if (set(i, args))

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

328}
329
330void
331getsocket()
332{
333 if (s < 0) {
334 s = socket(PF_ROUTE, SOCK_RAW, 0);
335 if (s < 0) {
340 perror("ndp: socket");
341 exit(1);
336 err(1, "socket");
337 /* NOTREACHED */
342 }
343 }
344}
345
346struct sockaddr_in6 so_mask = {sizeof(so_mask), AF_INET6 };
347struct sockaddr_in6 blank_sin = {sizeof(blank_sin), AF_INET6 }, sin_m;
348struct sockaddr_dl blank_sdl = {sizeof(blank_sdl), AF_LINK }, sdl_m;
349int expire_time, flags, found_entry;

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

381 fprintf(stderr, "ndp: %s: %s\n", host,
382 gai_strerror(gai_error));
383 return 1;
384 }
385 sin->sin6_addr = ((struct sockaddr_in6 *)res->ai_addr)->sin6_addr;
386#ifdef __KAME__
387 if (IN6_IS_ADDR_LINKLOCAL(&sin->sin6_addr)) {
388 *(u_int16_t *)&sin->sin6_addr.s6_addr[2] =
338 }
339 }
340}
341
342struct sockaddr_in6 so_mask = {sizeof(so_mask), AF_INET6 };
343struct sockaddr_in6 blank_sin = {sizeof(blank_sin), AF_INET6 }, sin_m;
344struct sockaddr_dl blank_sdl = {sizeof(blank_sdl), AF_LINK }, sdl_m;
345int expire_time, flags, found_entry;

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

377 fprintf(stderr, "ndp: %s: %s\n", host,
378 gai_strerror(gai_error));
379 return 1;
380 }
381 sin->sin6_addr = ((struct sockaddr_in6 *)res->ai_addr)->sin6_addr;
382#ifdef __KAME__
383 if (IN6_IS_ADDR_LINKLOCAL(&sin->sin6_addr)) {
384 *(u_int16_t *)&sin->sin6_addr.s6_addr[2] =
389 htons(((struct sockaddr_in6 *)res->ai_addr)->sin6_scope_id);
385 htons(((struct sockaddr_in6 *)res->ai_addr)->sin6_scope_id);
390 }
391#endif
392 ea = (u_char *)LLADDR(&sdl_m);
393 if (ndp_ether_aton(eaddr, ea) == 0)
394 sdl_m.sdl_alen = 6;
395 flags = expire_time = 0;
396 while (argc-- > 0) {
397 if (strncmp(argv[0], "temp", 4) == 0) {
398 struct timeval time;
386 }
387#endif
388 ea = (u_char *)LLADDR(&sdl_m);
389 if (ndp_ether_aton(eaddr, ea) == 0)
390 sdl_m.sdl_alen = 6;
391 flags = expire_time = 0;
392 while (argc-- > 0) {
393 if (strncmp(argv[0], "temp", 4) == 0) {
394 struct timeval time;
395
399 gettimeofday(&time, 0);
400 expire_time = time.tv_sec + 20 * 60;
401 } else if (strncmp(argv[0], "proxy", 5) == 0)
402 flags |= RTF_ANNOUNCE;
403 argv++;
404 }
405 if (rtmsg(RTM_GET) < 0) {
396 gettimeofday(&time, 0);
397 expire_time = time.tv_sec + 20 * 60;
398 } else if (strncmp(argv[0], "proxy", 5) == 0)
399 flags |= RTF_ANNOUNCE;
400 argv++;
401 }
402 if (rtmsg(RTM_GET) < 0) {
406 perror(host);
407 return (1);
403 errx(1, "RTM_GET(%s) failed", host);
404 /* NOTREACHED */
408 }
409 sin = (struct sockaddr_in6 *)(rtm + 1);
410 sdl = (struct sockaddr_dl *)(ROUNDUP(sin->sin6_len) + (char *)sin);
411 if (IN6_ARE_ADDR_EQUAL(&sin->sin6_addr, &sin_m.sin6_addr)) {
412 if (sdl->sdl_family == AF_LINK &&
413 (rtm->rtm_flags & RTF_LLINFO) &&
414 !(rtm->rtm_flags & RTF_GATEWAY)) switch (sdl->sdl_type) {
415 case IFT_ETHER: case IFT_FDDI: case IFT_ISO88023:

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

445 int gai_error;
446
447 sin_m = blank_sin;
448 bzero(&hints, sizeof(hints));
449 hints.ai_family = AF_INET6;
450 gai_error = getaddrinfo(host, NULL, &hints, &res);
451 if (gai_error) {
452 fprintf(stderr, "ndp: %s: %s\n", host,
405 }
406 sin = (struct sockaddr_in6 *)(rtm + 1);
407 sdl = (struct sockaddr_dl *)(ROUNDUP(sin->sin6_len) + (char *)sin);
408 if (IN6_ARE_ADDR_EQUAL(&sin->sin6_addr, &sin_m.sin6_addr)) {
409 if (sdl->sdl_family == AF_LINK &&
410 (rtm->rtm_flags & RTF_LLINFO) &&
411 !(rtm->rtm_flags & RTF_GATEWAY)) switch (sdl->sdl_type) {
412 case IFT_ETHER: case IFT_FDDI: case IFT_ISO88023:

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

442 int gai_error;
443
444 sin_m = blank_sin;
445 bzero(&hints, sizeof(hints));
446 hints.ai_family = AF_INET6;
447 gai_error = getaddrinfo(host, NULL, &hints, &res);
448 if (gai_error) {
449 fprintf(stderr, "ndp: %s: %s\n", host,
453 gai_strerror(gai_error));
450 gai_strerror(gai_error));
454 return;
455 }
456 sin->sin6_addr = ((struct sockaddr_in6 *)res->ai_addr)->sin6_addr;
457#ifdef __KAME__
458 if (IN6_IS_ADDR_LINKLOCAL(&sin->sin6_addr)) {
459 *(u_int16_t *)&sin->sin6_addr.s6_addr[2] =
451 return;
452 }
453 sin->sin6_addr = ((struct sockaddr_in6 *)res->ai_addr)->sin6_addr;
454#ifdef __KAME__
455 if (IN6_IS_ADDR_LINKLOCAL(&sin->sin6_addr)) {
456 *(u_int16_t *)&sin->sin6_addr.s6_addr[2] =
460 htons(((struct sockaddr_in6 *)res->ai_addr)->sin6_scope_id);
457 htons(((struct sockaddr_in6 *)res->ai_addr)->sin6_scope_id);
461 }
462#endif
463 dump(&sin->sin6_addr);
464 if (found_entry == 0) {
465 getnameinfo((struct sockaddr *)sin, sin->sin6_len, host_buf,
458 }
459#endif
460 dump(&sin->sin6_addr);
461 if (found_entry == 0) {
462 getnameinfo((struct sockaddr *)sin, sin->sin6_len, host_buf,
466 sizeof(host_buf), NULL ,0,
467 NI_WITHSCOPEID | (nflag ? NI_NUMERICHOST : 0));
463 sizeof(host_buf), NULL ,0,
464 (nflag ? NI_NUMERICHOST : 0));
468 printf("%s (%s) -- no entry\n", host, host_buf);
469 exit(1);
470 }
471}
472
473/*
474 * Delete a neighbor cache entry
475 */

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

486 getsocket();
487 sin_m = blank_sin;
488
489 bzero(&hints, sizeof(hints));
490 hints.ai_family = AF_INET6;
491 gai_error = getaddrinfo(host, NULL, &hints, &res);
492 if (gai_error) {
493 fprintf(stderr, "ndp: %s: %s\n", host,
465 printf("%s (%s) -- no entry\n", host, host_buf);
466 exit(1);
467 }
468}
469
470/*
471 * Delete a neighbor cache entry
472 */

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

483 getsocket();
484 sin_m = blank_sin;
485
486 bzero(&hints, sizeof(hints));
487 hints.ai_family = AF_INET6;
488 gai_error = getaddrinfo(host, NULL, &hints, &res);
489 if (gai_error) {
490 fprintf(stderr, "ndp: %s: %s\n", host,
494 gai_strerror(gai_error));
491 gai_strerror(gai_error));
495 return 1;
496 }
497 sin->sin6_addr = ((struct sockaddr_in6 *)res->ai_addr)->sin6_addr;
498#ifdef __KAME__
499 if (IN6_IS_ADDR_LINKLOCAL(&sin->sin6_addr)) {
500 *(u_int16_t *)&sin->sin6_addr.s6_addr[2] =
492 return 1;
493 }
494 sin->sin6_addr = ((struct sockaddr_in6 *)res->ai_addr)->sin6_addr;
495#ifdef __KAME__
496 if (IN6_IS_ADDR_LINKLOCAL(&sin->sin6_addr)) {
497 *(u_int16_t *)&sin->sin6_addr.s6_addr[2] =
501 htons(((struct sockaddr_in6 *)res->ai_addr)->sin6_scope_id);
498 htons(((struct sockaddr_in6 *)res->ai_addr)->sin6_scope_id);
502 }
503#endif
504 if (rtmsg(RTM_GET) < 0) {
499 }
500#endif
501 if (rtmsg(RTM_GET) < 0) {
505 perror(host);
506 return (1);
502 errx(1, "RTM_GET(%s) failed", host);
503 /* NOTREACHED */
507 }
508 sin = (struct sockaddr_in6 *)(rtm + 1);
509 sdl = (struct sockaddr_dl *)(ROUNDUP(sin->sin6_len) + (char *)sin);
510 if (IN6_ARE_ADDR_EQUAL(&sin->sin6_addr, &sin_m.sin6_addr)) {
511 if (sdl->sdl_family == AF_LINK &&
512 (rtm->rtm_flags & RTF_LLINFO) &&
513 !(rtm->rtm_flags & RTF_GATEWAY)) {
514 goto delete;

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

530
531#ifdef __KAME__
532 if (IN6_IS_ADDR_LINKLOCAL(&s6.sin6_addr)) {
533 s6.sin6_scope_id = ntohs(*(u_int16_t *)&s6.sin6_addr.s6_addr[2]);
534 *(u_int16_t *)&s6.sin6_addr.s6_addr[2] = 0;
535 }
536#endif
537 getnameinfo((struct sockaddr *)&s6,
504 }
505 sin = (struct sockaddr_in6 *)(rtm + 1);
506 sdl = (struct sockaddr_dl *)(ROUNDUP(sin->sin6_len) + (char *)sin);
507 if (IN6_ARE_ADDR_EQUAL(&sin->sin6_addr, &sin_m.sin6_addr)) {
508 if (sdl->sdl_family == AF_LINK &&
509 (rtm->rtm_flags & RTF_LLINFO) &&
510 !(rtm->rtm_flags & RTF_GATEWAY)) {
511 goto delete;

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

527
528#ifdef __KAME__
529 if (IN6_IS_ADDR_LINKLOCAL(&s6.sin6_addr)) {
530 s6.sin6_scope_id = ntohs(*(u_int16_t *)&s6.sin6_addr.s6_addr[2]);
531 *(u_int16_t *)&s6.sin6_addr.s6_addr[2] = 0;
532 }
533#endif
534 getnameinfo((struct sockaddr *)&s6,
538 s6.sin6_len, host_buf,
539 sizeof(host_buf), NULL, 0,
540 NI_WITHSCOPEID | (nflag ? NI_NUMERICHOST : 0));
535 s6.sin6_len, host_buf,
536 sizeof(host_buf), NULL, 0,
537 (nflag ? NI_NUMERICHOST : 0));
541 printf("%s (%s) deleted\n", host, host_buf);
542 }
543
544 return 0;
545}
546
547#define W_ADDR 31
548#define W_LL 17

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

582 mib[2] = 0;
583 mib[3] = AF_INET6;
584 mib[4] = NET_RT_FLAGS;
585 mib[5] = RTF_LLINFO;
586 if (sysctl(mib, 6, NULL, &needed, NULL, 0) < 0)
587 err(1, "sysctl(PF_ROUTE estimate)");
588 if (needed > 0) {
589 if ((buf = malloc(needed)) == NULL)
538 printf("%s (%s) deleted\n", host, host_buf);
539 }
540
541 return 0;
542}
543
544#define W_ADDR 31
545#define W_LL 17

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

579 mib[2] = 0;
580 mib[3] = AF_INET6;
581 mib[4] = NET_RT_FLAGS;
582 mib[5] = RTF_LLINFO;
583 if (sysctl(mib, 6, NULL, &needed, NULL, 0) < 0)
584 err(1, "sysctl(PF_ROUTE estimate)");
585 if (needed > 0) {
586 if ((buf = malloc(needed)) == NULL)
590 errx(1, "malloc");
587 err(1, "malloc");
591 if (sysctl(mib, 6, buf, &needed, NULL, 0) < 0)
592 err(1, "sysctl(PF_ROUTE, NET_RT_FLAGS)");
593 lim = buf + needed;
594 } else
595 buf = lim = NULL;
596
597 for (next = buf; next && next < lim; next += rtm->rtm_msglen) {
598 int isrouter = 0, prbs = 0;

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

603
604 /*
605 * Some OSes can produce a route that has the LINK flag but
606 * has a non-AF_LINK gateway (e.g. fe80::xx%lo0 on FreeBSD
607 * and BSD/OS, where xx is not the interface identifier on
608 * lo0). Such routes entry would annoy getnbrinfo() below,
609 * so we skip them.
610 * XXX: such routes should have the GATEWAY flag, not the
588 if (sysctl(mib, 6, buf, &needed, NULL, 0) < 0)
589 err(1, "sysctl(PF_ROUTE, NET_RT_FLAGS)");
590 lim = buf + needed;
591 } else
592 buf = lim = NULL;
593
594 for (next = buf; next && next < lim; next += rtm->rtm_msglen) {
595 int isrouter = 0, prbs = 0;

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

600
601 /*
602 * Some OSes can produce a route that has the LINK flag but
603 * has a non-AF_LINK gateway (e.g. fe80::xx%lo0 on FreeBSD
604 * and BSD/OS, where xx is not the interface identifier on
605 * lo0). Such routes entry would annoy getnbrinfo() below,
606 * so we skip them.
607 * XXX: such routes should have the GATEWAY flag, not the
611 * LINK flag. However, there are rotten routing software
608 * LINK flag. However, there is rotten routing software
612 * that advertises all routes that have the GATEWAY flag.
613 * Thus, KAME kernel intentionally does not set the LINK flag.
614 * What is to be fixed is not ndp, but such routing software
615 * (and the kernel workaround)...
616 */
617 if (sdl->sdl_family != AF_LINK)
618 continue;
619

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

629 if (sin->sin6_scope_id == 0)
630 sin->sin6_scope_id = sdl->sdl_index;
631#ifdef __KAME__
632 /* KAME specific hack; removed the embedded id */
633 *(u_int16_t *)&sin->sin6_addr.s6_addr[2] = 0;
634#endif
635 }
636 getnameinfo((struct sockaddr *)sin, sin->sin6_len, host_buf,
609 * that advertises all routes that have the GATEWAY flag.
610 * Thus, KAME kernel intentionally does not set the LINK flag.
611 * What is to be fixed is not ndp, but such routing software
612 * (and the kernel workaround)...
613 */
614 if (sdl->sdl_family != AF_LINK)
615 continue;
616

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

626 if (sin->sin6_scope_id == 0)
627 sin->sin6_scope_id = sdl->sdl_index;
628#ifdef __KAME__
629 /* KAME specific hack; removed the embedded id */
630 *(u_int16_t *)&sin->sin6_addr.s6_addr[2] = 0;
631#endif
632 }
633 getnameinfo((struct sockaddr *)sin, sin->sin6_len, host_buf,
637 sizeof(host_buf), NULL, 0,
638 NI_WITHSCOPEID | (nflag ? NI_NUMERICHOST : 0));
634 sizeof(host_buf), NULL, 0, (nflag ? NI_NUMERICHOST : 0));
639 if (cflag == 1) {
640#ifdef RTF_WASCLONED
641 if (rtm->rtm_flags & RTF_WASCLONED)
642 delete(host_buf);
643#else
644 delete(host_buf);
645#endif
646 continue;

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

665 printf("%-*.*s %-*.*s %*.*s", addrwidth, addrwidth, host_buf,
666 llwidth, llwidth, ether_str(sdl), ifwidth, ifwidth, ifname);
667
668 /* Print neighbor discovery specific informations */
669 nbi = getnbrinfo(&sin->sin6_addr, sdl->sdl_index, 1);
670 if (nbi) {
671 if (nbi->expire > time.tv_sec) {
672 printf(" %-9.9s",
635 if (cflag == 1) {
636#ifdef RTF_WASCLONED
637 if (rtm->rtm_flags & RTF_WASCLONED)
638 delete(host_buf);
639#else
640 delete(host_buf);
641#endif
642 continue;

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

661 printf("%-*.*s %-*.*s %*.*s", addrwidth, addrwidth, host_buf,
662 llwidth, llwidth, ether_str(sdl), ifwidth, ifwidth, ifname);
663
664 /* Print neighbor discovery specific informations */
665 nbi = getnbrinfo(&sin->sin6_addr, sdl->sdl_index, 1);
666 if (nbi) {
667 if (nbi->expire > time.tv_sec) {
668 printf(" %-9.9s",
673 sec2str(nbi->expire - time.tv_sec));
669 sec2str(nbi->expire - time.tv_sec));
674 } else if (nbi->expire == 0)
675 printf(" %-9.9s", "permanent");
676 else
677 printf(" %-9.9s", "expired");
678
670 } else if (nbi->expire == 0)
671 printf(" %-9.9s", "permanent");
672 else
673 printf(" %-9.9s", "expired");
674
679 switch(nbi->state) {
680 case ND6_LLINFO_NOSTATE:
675 switch (nbi->state) {
676 case ND6_LLINFO_NOSTATE:
681 printf(" N");
682 break;
683#ifdef ND6_LLINFO_WAITDELETE
677 printf(" N");
678 break;
679#ifdef ND6_LLINFO_WAITDELETE
684 case ND6_LLINFO_WAITDELETE:
680 case ND6_LLINFO_WAITDELETE:
685 printf(" W");
686 break;
687#endif
681 printf(" W");
682 break;
683#endif
688 case ND6_LLINFO_INCOMPLETE:
684 case ND6_LLINFO_INCOMPLETE:
689 printf(" I");
690 break;
685 printf(" I");
686 break;
691 case ND6_LLINFO_REACHABLE:
687 case ND6_LLINFO_REACHABLE:
692 printf(" R");
693 break;
688 printf(" R");
689 break;
694 case ND6_LLINFO_STALE:
690 case ND6_LLINFO_STALE:
695 printf(" S");
696 break;
691 printf(" S");
692 break;
697 case ND6_LLINFO_DELAY:
693 case ND6_LLINFO_DELAY:
698 printf(" D");
699 break;
694 printf(" D");
695 break;
700 case ND6_LLINFO_PROBE:
696 case ND6_LLINFO_PROBE:
701 printf(" P");
702 break;
697 printf(" P");
698 break;
703 default:
699 default:
704 printf(" ?");
705 break;
706 }
707
708 isrouter = nbi->isrouter;
709 prbs = nbi->asked;
710 } else {
711 warnx("failed to get neighbor information");
712 printf(" ");
713 }
714 putchar(' ');
715
716 /*
717 * other flags. R: router, P: proxy, W: ??
718 */
719 if ((rtm->rtm_addrs & RTA_NETMASK) == 0) {
720 snprintf(flgbuf, sizeof(flgbuf), "%s%s",
700 printf(" ?");
701 break;
702 }
703
704 isrouter = nbi->isrouter;
705 prbs = nbi->asked;
706 } else {
707 warnx("failed to get neighbor information");
708 printf(" ");
709 }
710 putchar(' ');
711
712 /*
713 * other flags. R: router, P: proxy, W: ??
714 */
715 if ((rtm->rtm_addrs & RTA_NETMASK) == 0) {
716 snprintf(flgbuf, sizeof(flgbuf), "%s%s",
721 isrouter ? "R" : "",
722 (rtm->rtm_flags & RTF_ANNOUNCE) ? "p" : "");
717 isrouter ? "R" : "",
718 (rtm->rtm_flags & RTF_ANNOUNCE) ? "p" : "");
723 } else {
724 sin = (struct sockaddr_in6 *)
719 } else {
720 sin = (struct sockaddr_in6 *)
725 (sdl->sdl_len + (char *)sdl);
721 (sdl->sdl_len + (char *)sdl);
726 snprintf(flgbuf, sizeof(flgbuf), "%s%s%s%s",
722 snprintf(flgbuf, sizeof(flgbuf), "%s%s%s%s",
727 isrouter ? "R" : "",
728 !IN6_IS_ADDR_UNSPECIFIED(&sin->sin6_addr)
729 ? "P" : "",
730 (sin->sin6_len != sizeof(struct sockaddr_in6))
731 ? "W" : "",
732 (rtm->rtm_flags & RTF_ANNOUNCE) ? "p" : "");
723 isrouter ? "R" : "",
724 !IN6_IS_ADDR_UNSPECIFIED(&sin->sin6_addr) ? "P" : "",
725 (sin->sin6_len != sizeof(struct sockaddr_in6)) ? "W" : "",
726 (rtm->rtm_flags & RTF_ANNOUNCE) ? "p" : "");
733 }
734 printf(" %-4.4s", flgbuf);
735
736 if (prbs)
737 printf(" %4d", prbs);
738
739 printf("\n");
740 }

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

773 close(s);
774 return(&nbi);
775}
776
777static char *
778ether_str(sdl)
779 struct sockaddr_dl *sdl;
780{
727 }
728 printf(" %-4.4s", flgbuf);
729
730 if (prbs)
731 printf(" %4d", prbs);
732
733 printf("\n");
734 }

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

767 close(s);
768 return(&nbi);
769}
770
771static char *
772ether_str(sdl)
773 struct sockaddr_dl *sdl;
774{
781 static char ebuf[32];
775 static char hbuf[NI_MAXHOST];
782 u_char *cp;
783
784 if (sdl->sdl_alen) {
785 cp = (u_char *)LLADDR(sdl);
776 u_char *cp;
777
778 if (sdl->sdl_alen) {
779 cp = (u_char *)LLADDR(sdl);
786 sprintf(ebuf, "%x:%x:%x:%x:%x:%x",
787 cp[0], cp[1], cp[2], cp[3], cp[4], cp[5]);
788 } else {
789 sprintf(ebuf, "(incomplete)");
790 }
780 snprintf(hbuf, sizeof(hbuf), "%x:%x:%x:%x:%x:%x",
781 cp[0], cp[1], cp[2], cp[3], cp[4], cp[5]);
782 } else
783 snprintf(hbuf, sizeof(hbuf), "(incomplete)");
791
784
792 return(ebuf);
785 return(hbuf);
793}
794
795int
796ndp_ether_aton(a, n)
797 char *a;
798 u_char *n;
799{
800 int i, o[6];
801
802 i = sscanf(a, "%x:%x:%x:%x:%x:%x", &o[0], &o[1], &o[2],
786}
787
788int
789ndp_ether_aton(a, n)
790 char *a;
791 u_char *n;
792{
793 int i, o[6];
794
795 i = sscanf(a, "%x:%x:%x:%x:%x:%x", &o[0], &o[1], &o[2],
803 &o[3], &o[4], &o[5]);
796 &o[3], &o[4], &o[5]);
804 if (i != 6) {
805 fprintf(stderr, "ndp: invalid Ethernet address '%s'\n", a);
806 return (1);
807 }
797 if (i != 6) {
798 fprintf(stderr, "ndp: invalid Ethernet address '%s'\n", a);
799 return (1);
800 }
808 for (i=0; i<6; i++)
801 for (i = 0; i < 6; i++)
809 n[i] = o[i];
810 return (0);
811}
812
813void
814usage()
815{
816 printf("usage: ndp hostname\n");

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

877
878 rtm->rtm_msglen = cp - (char *)&m_rtmsg;
879doit:
880 l = rtm->rtm_msglen;
881 rtm->rtm_seq = ++seq;
882 rtm->rtm_type = cmd;
883 if ((rlen = write(s, (char *)&m_rtmsg, l)) < 0) {
884 if (errno != ESRCH || cmd != RTM_DELETE) {
802 n[i] = o[i];
803 return (0);
804}
805
806void
807usage()
808{
809 printf("usage: ndp hostname\n");

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

870
871 rtm->rtm_msglen = cp - (char *)&m_rtmsg;
872doit:
873 l = rtm->rtm_msglen;
874 rtm->rtm_seq = ++seq;
875 rtm->rtm_type = cmd;
876 if ((rlen = write(s, (char *)&m_rtmsg, l)) < 0) {
877 if (errno != ESRCH || cmd != RTM_DELETE) {
885 perror("writing to routing socket");
886 return (-1);
878 err(1, "writing to routing socket");
879 /* NOTREACHED */
887 }
888 }
889 do {
890 l = read(s, (char *)&m_rtmsg, sizeof(m_rtmsg));
891 } while (l > 0 && (rtm->rtm_seq != seq || rtm->rtm_pid != pid));
892 if (l < 0)
893 (void) fprintf(stderr, "ndp: read from routing socket: %s\n",
894 strerror(errno));

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

904 int i, s;
905 char *ifname = argv[0];
906 u_int32_t newflags;
907#ifdef IPV6CTL_USETEMPADDR
908 u_int8_t nullbuf[8];
909#endif
910
911 if ((s = socket(AF_INET6, SOCK_DGRAM, 0)) < 0) {
880 }
881 }
882 do {
883 l = read(s, (char *)&m_rtmsg, sizeof(m_rtmsg));
884 } while (l > 0 && (rtm->rtm_seq != seq || rtm->rtm_pid != pid));
885 if (l < 0)
886 (void) fprintf(stderr, "ndp: read from routing socket: %s\n",
887 strerror(errno));

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

897 int i, s;
898 char *ifname = argv[0];
899 u_int32_t newflags;
900#ifdef IPV6CTL_USETEMPADDR
901 u_int8_t nullbuf[8];
902#endif
903
904 if ((s = socket(AF_INET6, SOCK_DGRAM, 0)) < 0) {
912 perror("ndp: socket");
913 exit(1);
905 err(1, "socket");
906 /* NOTREACHED */
914 }
915 bzero(&nd, sizeof(nd));
907 }
908 bzero(&nd, sizeof(nd));
916 strcpy(nd.ifname, ifname);
909 strlcpy(nd.ifname, ifname, sizeof(nd.ifname));
917 if (ioctl(s, SIOCGIFINFO_IN6, (caddr_t)&nd) < 0) {
910 if (ioctl(s, SIOCGIFINFO_IN6, (caddr_t)&nd) < 0) {
918 perror("ioctl (SIOCGIFINFO_IN6)");
919 exit(1);
911 err(1, "ioctl(SIOCGIFINFO_IN6)");
912 /* NOTREACHED */
920 }
921#define ND nd.ndi
922 newflags = ND.flags;
923 for (i = 1; i < argc; i++) {
924 int clear = 0;
925 char *cp = argv[i];
926
927 if (*cp == '-') {

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

940 } while (0)
941 SETFLAG("nud", ND6_IFF_PERFORMNUD);
942#ifdef ND6_IFF_ACCEPT_RTADV
943 SETFLAG("accept_rtadv", ND6_IFF_ACCEPT_RTADV);
944#endif
945
946 ND.flags = newflags;
947 if (ioctl(s, SIOCSIFINFO_FLAGS, (caddr_t)&nd) < 0) {
913 }
914#define ND nd.ndi
915 newflags = ND.flags;
916 for (i = 1; i < argc; i++) {
917 int clear = 0;
918 char *cp = argv[i];
919
920 if (*cp == '-') {

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

933 } while (0)
934 SETFLAG("nud", ND6_IFF_PERFORMNUD);
935#ifdef ND6_IFF_ACCEPT_RTADV
936 SETFLAG("accept_rtadv", ND6_IFF_ACCEPT_RTADV);
937#endif
938
939 ND.flags = newflags;
940 if (ioctl(s, SIOCSIFINFO_FLAGS, (caddr_t)&nd) < 0) {
948 perror("ioctl(SIOCSIFINFO_FLAGS)");
949 exit(1);
941 err(1, "ioctl(SIOCSIFINFO_FLAGS)");
942 /* NOTREACHED */
950 }
951#undef SETFLAG
952 }
953
954 printf("linkmtu=%d", ND.linkmtu);
955 printf(", curhlim=%d", ND.chlim);
956 printf(", basereachable=%ds%dms",
943 }
944#undef SETFLAG
945 }
946
947 printf("linkmtu=%d", ND.linkmtu);
948 printf(", curhlim=%d", ND.chlim);
949 printf(", basereachable=%ds%dms",
957 ND.basereachable / 1000, ND.basereachable % 1000);
950 ND.basereachable / 1000, ND.basereachable % 1000);
958 printf(", reachable=%ds", ND.reachable);
959 printf(", retrans=%ds%dms", ND.retrans / 1000, ND.retrans % 1000);
960#ifdef IPV6CTL_USETEMPADDR
961 memset(nullbuf, 0, sizeof(nullbuf));
962 if (memcmp(nullbuf, ND.randomid, sizeof(nullbuf)) != 0) {
963 int j;
964 u_int8_t *rbuf;
965
966 for (i = 0; i < 3; i++) {
951 printf(", reachable=%ds", ND.reachable);
952 printf(", retrans=%ds%dms", ND.retrans / 1000, ND.retrans % 1000);
953#ifdef IPV6CTL_USETEMPADDR
954 memset(nullbuf, 0, sizeof(nullbuf));
955 if (memcmp(nullbuf, ND.randomid, sizeof(nullbuf)) != 0) {
956 int j;
957 u_int8_t *rbuf;
958
959 for (i = 0; i < 3; i++) {
967 switch(i) {
960 switch (i) {
968 case 0:
969 printf("\nRandom seed(0): ");
970 rbuf = ND.randomseed0;
971 break;
972 case 1:
973 printf("\nRandom seed(1): ");
974 rbuf = ND.randomseed1;
975 break;

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

989 printf("nud ");
990#ifdef ND6_IFF_ACCEPT_RTADV
991 if ((ND.flags & ND6_IFF_ACCEPT_RTADV))
992 printf("accept_rtadv ");
993#endif
994}
995 putc('\n', stdout);
996#undef ND
961 case 0:
962 printf("\nRandom seed(0): ");
963 rbuf = ND.randomseed0;
964 break;
965 case 1:
966 printf("\nRandom seed(1): ");
967 rbuf = ND.randomseed1;
968 break;

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

982 printf("nud ");
983#ifdef ND6_IFF_ACCEPT_RTADV
984 if ((ND.flags & ND6_IFF_ACCEPT_RTADV))
985 printf("accept_rtadv ");
986#endif
987}
988 putc('\n', stdout);
989#undef ND
997
990
998 close(s);
999}
1000
1001#ifndef ND_RA_FLAG_RTPREF_MASK /* XXX: just for compilation on *BSD release */
1002#define ND_RA_FLAG_RTPREF_MASK 0x18 /* 00011000 */
1003#endif
1004
1005void

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

1013 struct timeval time;
1014
1015 if (sysctl(mib, sizeof(mib) / sizeof(mib[0]), NULL, &l, NULL, 0) < 0) {
1016 err(1, "sysctl(ICMPV6CTL_ND6_DRLIST)");
1017 /*NOTREACHED*/
1018 }
1019 buf = malloc(l);
1020 if (!buf) {
991 close(s);
992}
993
994#ifndef ND_RA_FLAG_RTPREF_MASK /* XXX: just for compilation on *BSD release */
995#define ND_RA_FLAG_RTPREF_MASK 0x18 /* 00011000 */
996#endif
997
998void

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

1006 struct timeval time;
1007
1008 if (sysctl(mib, sizeof(mib) / sizeof(mib[0]), NULL, &l, NULL, 0) < 0) {
1009 err(1, "sysctl(ICMPV6CTL_ND6_DRLIST)");
1010 /*NOTREACHED*/
1011 }
1012 buf = malloc(l);
1013 if (!buf) {
1021 errx(1, "not enough core");
1014 err(1, "malloc");
1022 /*NOTREACHED*/
1023 }
1024 if (sysctl(mib, sizeof(mib) / sizeof(mib[0]), buf, &l, NULL, 0) < 0) {
1025 err(1, "sysctl(ICMPV6CTL_ND6_DRLIST)");
1026 /*NOTREACHED*/
1027 }
1028
1029 ep = (struct in6_defrouter *)(buf + l);
1030 for (p = (struct in6_defrouter *)buf; p < ep; p++) {
1031 int rtpref;
1032
1033 if (getnameinfo((struct sockaddr *)&p->rtaddr,
1034 p->rtaddr.sin6_len, host_buf, sizeof(host_buf), NULL, 0,
1015 /*NOTREACHED*/
1016 }
1017 if (sysctl(mib, sizeof(mib) / sizeof(mib[0]), buf, &l, NULL, 0) < 0) {
1018 err(1, "sysctl(ICMPV6CTL_ND6_DRLIST)");
1019 /*NOTREACHED*/
1020 }
1021
1022 ep = (struct in6_defrouter *)(buf + l);
1023 for (p = (struct in6_defrouter *)buf; p < ep; p++) {
1024 int rtpref;
1025
1026 if (getnameinfo((struct sockaddr *)&p->rtaddr,
1027 p->rtaddr.sin6_len, host_buf, sizeof(host_buf), NULL, 0,
1035 NI_WITHSCOPEID | (nflag ? NI_NUMERICHOST : 0)) != 0)
1028 (nflag ? NI_NUMERICHOST : 0)) != 0)
1036 strlcpy(host_buf, "?", sizeof(host_buf));
1029 strlcpy(host_buf, "?", sizeof(host_buf));
1037
1030
1038 printf("%s if=%s", host_buf,
1031 printf("%s if=%s", host_buf,
1039 if_indextoname(p->if_index, ifix_buf));
1032 if_indextoname(p->if_index, ifix_buf));
1040 printf(", flags=%s%s",
1033 printf(", flags=%s%s",
1041 p->flags & ND_RA_FLAG_MANAGED ? "M" : "",
1042 p->flags & ND_RA_FLAG_OTHER ? "O" : "");
1034 p->flags & ND_RA_FLAG_MANAGED ? "M" : "",
1035 p->flags & ND_RA_FLAG_OTHER ? "O" : "");
1043 rtpref = ((p->flags & ND_RA_FLAG_RTPREF_MASK) >> 3) & 0xff;
1044 printf(", pref=%s", rtpref_str[rtpref]);
1036 rtpref = ((p->flags & ND_RA_FLAG_RTPREF_MASK) >> 3) & 0xff;
1037 printf(", pref=%s", rtpref_str[rtpref]);
1045
1038
1046 gettimeofday(&time, 0);
1047 if (p->expire == 0)
1048 printf(", expire=Never\n");
1049 else
1050 printf(", expire=%s\n",
1039 gettimeofday(&time, 0);
1040 if (p->expire == 0)
1041 printf(", expire=Never\n");
1042 else
1043 printf(", expire=%s\n",
1051 sec2str(p->expire - time.tv_sec));
1044 sec2str(p->expire - time.tv_sec));
1052 }
1053 free(buf);
1054#else
1055 struct in6_drlist dr;
1056 int s, i;
1057 struct timeval time;
1058
1059 if ((s = socket(AF_INET6, SOCK_DGRAM, 0)) < 0) {
1045 }
1046 free(buf);
1047#else
1048 struct in6_drlist dr;
1049 int s, i;
1050 struct timeval time;
1051
1052 if ((s = socket(AF_INET6, SOCK_DGRAM, 0)) < 0) {
1060 perror("ndp: socket");
1061 exit(1);
1053 err(1, "socket");
1054 /* NOTREACHED */
1062 }
1063 bzero(&dr, sizeof(dr));
1055 }
1056 bzero(&dr, sizeof(dr));
1064 strcpy(dr.ifname, "lo0"); /* dummy */
1057 strlcpy(dr.ifname, "lo0", sizeof(dr.ifname)); /* dummy */
1065 if (ioctl(s, SIOCGDRLST_IN6, (caddr_t)&dr) < 0) {
1058 if (ioctl(s, SIOCGDRLST_IN6, (caddr_t)&dr) < 0) {
1066 perror("ioctl (SIOCGDRLST_IN6)");
1067 exit(1);
1068 }
1059 err(1, "ioctl(SIOCGDRLST_IN6)");
1060 /* NOTREACHED */
1061 }
1069#define DR dr.defrouter[i]
1070 for (i = 0 ; DR.if_index && i < DRLSTSIZ ; i++) {
1071 struct sockaddr_in6 sin6;
1072
1073 bzero(&sin6, sizeof(sin6));
1074 sin6.sin6_family = AF_INET6;
1075 sin6.sin6_len = sizeof(sin6);
1076 sin6.sin6_addr = DR.rtaddr;
1077 getnameinfo((struct sockaddr *)&sin6, sin6.sin6_len, host_buf,
1062#define DR dr.defrouter[i]
1063 for (i = 0 ; DR.if_index && i < DRLSTSIZ ; i++) {
1064 struct sockaddr_in6 sin6;
1065
1066 bzero(&sin6, sizeof(sin6));
1067 sin6.sin6_family = AF_INET6;
1068 sin6.sin6_len = sizeof(sin6);
1069 sin6.sin6_addr = DR.rtaddr;
1070 getnameinfo((struct sockaddr *)&sin6, sin6.sin6_len, host_buf,
1078 sizeof(host_buf), NULL, 0,
1079 NI_WITHSCOPEID | (nflag ? NI_NUMERICHOST : 0));
1080
1071 sizeof(host_buf), NULL, 0,
1072 (nflag ? NI_NUMERICHOST : 0));
1073
1081 printf("%s if=%s", host_buf,
1074 printf("%s if=%s", host_buf,
1082 if_indextoname(DR.if_index, ifix_buf));
1075 if_indextoname(DR.if_index, ifix_buf));
1083 printf(", flags=%s%s",
1076 printf(", flags=%s%s",
1084 DR.flags & ND_RA_FLAG_MANAGED ? "M" : "",
1085 DR.flags & ND_RA_FLAG_OTHER ? "O" : "");
1077 DR.flags & ND_RA_FLAG_MANAGED ? "M" : "",
1078 DR.flags & ND_RA_FLAG_OTHER ? "O" : "");
1086 gettimeofday(&time, 0);
1087 if (DR.expire == 0)
1088 printf(", expire=Never\n");
1089 else
1090 printf(", expire=%s\n",
1079 gettimeofday(&time, 0);
1080 if (DR.expire == 0)
1081 printf(", expire=Never\n");
1082 else
1083 printf(", expire=%s\n",
1091 sec2str(DR.expire - time.tv_sec));
1084 sec2str(DR.expire - time.tv_sec));
1092 }
1093#undef DR
1094 close(s);
1095#endif
1096}
1097
1098void
1099plist()
1100{
1101#ifdef ICMPV6CTL_ND6_PRLIST
1102 int mib[] = { CTL_NET, PF_INET6, IPPROTO_ICMPV6, ICMPV6CTL_ND6_PRLIST };
1103 char *buf;
1104 struct in6_prefix *p, *ep, *n;
1105 struct sockaddr_in6 *advrtr;
1106 size_t l;
1107 struct timeval time;
1085 }
1086#undef DR
1087 close(s);
1088#endif
1089}
1090
1091void
1092plist()
1093{
1094#ifdef ICMPV6CTL_ND6_PRLIST
1095 int mib[] = { CTL_NET, PF_INET6, IPPROTO_ICMPV6, ICMPV6CTL_ND6_PRLIST };
1096 char *buf;
1097 struct in6_prefix *p, *ep, *n;
1098 struct sockaddr_in6 *advrtr;
1099 size_t l;
1100 struct timeval time;
1108#ifdef NI_WITHSCOPEID
1109 const int niflags = NI_NUMERICHOST | NI_WITHSCOPEID;
1110 int ninflags = (nflag ? NI_NUMERICHOST : 0) | NI_WITHSCOPEID;
1111#else
1112 const int niflags = NI_NUMERICHOST;
1113 int ninflags = nflag ? NI_NUMERICHOST : 0;
1101 const int niflags = NI_NUMERICHOST;
1102 int ninflags = nflag ? NI_NUMERICHOST : 0;
1114#endif
1115 char namebuf[NI_MAXHOST];
1116
1117 if (sysctl(mib, sizeof(mib) / sizeof(mib[0]), NULL, &l, NULL, 0) < 0) {
1118 err(1, "sysctl(ICMPV6CTL_ND6_PRLIST)");
1119 /*NOTREACHED*/
1120 }
1121 buf = malloc(l);
1122 if (!buf) {
1103 char namebuf[NI_MAXHOST];
1104
1105 if (sysctl(mib, sizeof(mib) / sizeof(mib[0]), NULL, &l, NULL, 0) < 0) {
1106 err(1, "sysctl(ICMPV6CTL_ND6_PRLIST)");
1107 /*NOTREACHED*/
1108 }
1109 buf = malloc(l);
1110 if (!buf) {
1123 errx(1, "not enough core");
1111 err(1, "malloc");
1124 /*NOTREACHED*/
1125 }
1126 if (sysctl(mib, sizeof(mib) / sizeof(mib[0]), buf, &l, NULL, 0) < 0) {
1127 err(1, "sysctl(ICMPV6CTL_ND6_PRLIST)");
1128 /*NOTREACHED*/
1129 }
1130
1131 ep = (struct in6_prefix *)(buf + l);
1132 for (p = (struct in6_prefix *)buf; p < ep; p = n) {
1133 advrtr = (struct sockaddr_in6 *)(p + 1);
1134 n = (struct in6_prefix *)&advrtr[p->advrtrs];
1135
1136 if (getnameinfo((struct sockaddr *)&p->prefix,
1137 p->prefix.sin6_len, namebuf, sizeof(namebuf),
1138 NULL, 0, niflags) != 0)
1139 strlcpy(namebuf, "?", sizeof(namebuf));
1140 printf("%s/%d if=%s\n", namebuf, p->prefixlen,
1112 /*NOTREACHED*/
1113 }
1114 if (sysctl(mib, sizeof(mib) / sizeof(mib[0]), buf, &l, NULL, 0) < 0) {
1115 err(1, "sysctl(ICMPV6CTL_ND6_PRLIST)");
1116 /*NOTREACHED*/
1117 }
1118
1119 ep = (struct in6_prefix *)(buf + l);
1120 for (p = (struct in6_prefix *)buf; p < ep; p = n) {
1121 advrtr = (struct sockaddr_in6 *)(p + 1);
1122 n = (struct in6_prefix *)&advrtr[p->advrtrs];
1123
1124 if (getnameinfo((struct sockaddr *)&p->prefix,
1125 p->prefix.sin6_len, namebuf, sizeof(namebuf),
1126 NULL, 0, niflags) != 0)
1127 strlcpy(namebuf, "?", sizeof(namebuf));
1128 printf("%s/%d if=%s\n", namebuf, p->prefixlen,
1141 if_indextoname(p->if_index, ifix_buf));
1129 if_indextoname(p->if_index, ifix_buf));
1142
1143 gettimeofday(&time, 0);
1144 /*
1145 * meaning of fields, especially flags, is very different
1146 * by origin. notify the difference to the users.
1147 */
1148 printf("flags=%s%s%s%s%s",
1130
1131 gettimeofday(&time, 0);
1132 /*
1133 * meaning of fields, especially flags, is very different
1134 * by origin. notify the difference to the users.
1135 */
1136 printf("flags=%s%s%s%s%s",
1149 p->raflags.onlink ? "L" : "",
1150 p->raflags.autonomous ? "A" : "",
1151 (p->flags & NDPRF_ONLINK) != 0 ? "O" : "",
1152 (p->flags & NDPRF_DETACHED) != 0 ? "D" : "",
1137 p->raflags.onlink ? "L" : "",
1138 p->raflags.autonomous ? "A" : "",
1139 (p->flags & NDPRF_ONLINK) != 0 ? "O" : "",
1140 (p->flags & NDPRF_DETACHED) != 0 ? "D" : "",
1153#ifdef NDPRF_HOME
1141#ifdef NDPRF_HOME
1154 (p->flags & NDPRF_HOME) != 0 ? "H" : ""
1142 (p->flags & NDPRF_HOME) != 0 ? "H" : ""
1155#else
1143#else
1156 ""
1144 ""
1157#endif
1145#endif
1158 );
1146 );
1159 if (p->vltime == ND6_INFINITE_LIFETIME)
1160 printf(" vltime=infinity");
1161 else
1162 printf(" vltime=%ld", (long)p->vltime);
1163 if (p->pltime == ND6_INFINITE_LIFETIME)
1164 printf(", pltime=infinity");
1165 else
1166 printf(", pltime=%ld", (long)p->pltime);
1167 if (p->expire == 0)
1168 printf(", expire=Never");
1169 else if (p->expire >= time.tv_sec)
1170 printf(", expire=%s",
1147 if (p->vltime == ND6_INFINITE_LIFETIME)
1148 printf(" vltime=infinity");
1149 else
1150 printf(" vltime=%ld", (long)p->vltime);
1151 if (p->pltime == ND6_INFINITE_LIFETIME)
1152 printf(", pltime=infinity");
1153 else
1154 printf(", pltime=%ld", (long)p->pltime);
1155 if (p->expire == 0)
1156 printf(", expire=Never");
1157 else if (p->expire >= time.tv_sec)
1158 printf(", expire=%s",
1171 sec2str(p->expire - time.tv_sec));
1159 sec2str(p->expire - time.tv_sec));
1172 else
1173 printf(", expired");
1174 printf(", ref=%d", p->refcnt);
1175 printf("\n");
1176 /*
1177 * "advertising router" list is meaningful only if the prefix
1178 * information is from RA.
1179 */

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

1187 struct in6_nbrinfo *nbi;
1188
1189 if (getnameinfo((struct sockaddr *)sin6,
1190 sin6->sin6_len, namebuf, sizeof(namebuf),
1191 NULL, 0, ninflags) != 0)
1192 strlcpy(namebuf, "?", sizeof(namebuf));
1193 printf(" %s", namebuf);
1194
1160 else
1161 printf(", expired");
1162 printf(", ref=%d", p->refcnt);
1163 printf("\n");
1164 /*
1165 * "advertising router" list is meaningful only if the prefix
1166 * information is from RA.
1167 */

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

1175 struct in6_nbrinfo *nbi;
1176
1177 if (getnameinfo((struct sockaddr *)sin6,
1178 sin6->sin6_len, namebuf, sizeof(namebuf),
1179 NULL, 0, ninflags) != 0)
1180 strlcpy(namebuf, "?", sizeof(namebuf));
1181 printf(" %s", namebuf);
1182
1195 nbi = getnbrinfo(&sin6->sin6_addr, p->if_index,
1196 0);
1183 nbi = getnbrinfo(&sin6->sin6_addr,
1184 p->if_index, 0);
1197 if (nbi) {
1185 if (nbi) {
1198 switch(nbi->state) {
1186 switch (nbi->state) {
1199 case ND6_LLINFO_REACHABLE:
1200 case ND6_LLINFO_STALE:
1201 case ND6_LLINFO_DELAY:
1202 case ND6_LLINFO_PROBE:
1203 printf(" (reachable)\n");
1204 break;
1205 default:
1206 printf(" (unreachable)\n");

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

1216#else
1217 struct in6_prlist pr;
1218 int s, i;
1219 struct timeval time;
1220
1221 gettimeofday(&time, 0);
1222
1223 if ((s = socket(AF_INET6, SOCK_DGRAM, 0)) < 0) {
1187 case ND6_LLINFO_REACHABLE:
1188 case ND6_LLINFO_STALE:
1189 case ND6_LLINFO_DELAY:
1190 case ND6_LLINFO_PROBE:
1191 printf(" (reachable)\n");
1192 break;
1193 default:
1194 printf(" (unreachable)\n");

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

1204#else
1205 struct in6_prlist pr;
1206 int s, i;
1207 struct timeval time;
1208
1209 gettimeofday(&time, 0);
1210
1211 if ((s = socket(AF_INET6, SOCK_DGRAM, 0)) < 0) {
1224 perror("ndp: socket");
1225 exit(1);
1212 err(1, "socket");
1213 /* NOTREACHED */
1226 }
1227 bzero(&pr, sizeof(pr));
1214 }
1215 bzero(&pr, sizeof(pr));
1228 strcpy(pr.ifname, "lo0"); /* dummy */
1216 strlcpy(pr.ifname, "lo0", sizeof(pr.ifname)); /* dummy */
1229 if (ioctl(s, SIOCGPRLST_IN6, (caddr_t)&pr) < 0) {
1217 if (ioctl(s, SIOCGPRLST_IN6, (caddr_t)&pr) < 0) {
1230 perror("ioctl (SIOCGPRLST_IN6)");
1231 exit(1);
1232 }
1218 err(1, "ioctl(SIOCGPRLST_IN6)");
1219 /* NOTREACHED */
1220 }
1233#define PR pr.prefix[i]
1234 for (i = 0; PR.if_index && i < PRLSTSIZ ; i++) {
1235 struct sockaddr_in6 p6;
1236 char namebuf[NI_MAXHOST];
1237 int niflags;
1238
1239#ifdef NDPRF_ONLINK
1240 p6 = PR.prefix;

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

1248 /*
1249 * copy link index to sin6_scope_id field.
1250 * XXX: KAME specific.
1251 */
1252 if (IN6_IS_ADDR_LINKLOCAL(&p6.sin6_addr)) {
1253 u_int16_t linkid;
1254
1255 memcpy(&linkid, &p6.sin6_addr.s6_addr[2],
1221#define PR pr.prefix[i]
1222 for (i = 0; PR.if_index && i < PRLSTSIZ ; i++) {
1223 struct sockaddr_in6 p6;
1224 char namebuf[NI_MAXHOST];
1225 int niflags;
1226
1227#ifdef NDPRF_ONLINK
1228 p6 = PR.prefix;

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

1236 /*
1237 * copy link index to sin6_scope_id field.
1238 * XXX: KAME specific.
1239 */
1240 if (IN6_IS_ADDR_LINKLOCAL(&p6.sin6_addr)) {
1241 u_int16_t linkid;
1242
1243 memcpy(&linkid, &p6.sin6_addr.s6_addr[2],
1256 sizeof(linkid));
1244 sizeof(linkid));
1257 linkid = ntohs(linkid);
1258 p6.sin6_scope_id = linkid;
1259 p6.sin6_addr.s6_addr[2] = 0;
1260 p6.sin6_addr.s6_addr[3] = 0;
1261 }
1262
1263 niflags = NI_NUMERICHOST;
1245 linkid = ntohs(linkid);
1246 p6.sin6_scope_id = linkid;
1247 p6.sin6_addr.s6_addr[2] = 0;
1248 p6.sin6_addr.s6_addr[3] = 0;
1249 }
1250
1251 niflags = NI_NUMERICHOST;
1264#ifdef __KAME__
1265 niflags |= NI_WITHSCOPEID;
1266#endif
1267 if (getnameinfo((struct sockaddr *)&p6,
1252 if (getnameinfo((struct sockaddr *)&p6,
1268 sizeof(p6), namebuf, sizeof(namebuf),
1269 NULL, 0, niflags)) {
1253 sizeof(p6), namebuf, sizeof(namebuf),
1254 NULL, 0, niflags)) {
1270 warnx("getnameinfo failed");
1271 continue;
1272 }
1273 printf("%s/%d if=%s\n", namebuf, PR.prefixlen,
1255 warnx("getnameinfo failed");
1256 continue;
1257 }
1258 printf("%s/%d if=%s\n", namebuf, PR.prefixlen,
1274 if_indextoname(PR.if_index, ifix_buf));
1259 if_indextoname(PR.if_index, ifix_buf));
1275
1276 gettimeofday(&time, 0);
1277 /*
1278 * meaning of fields, especially flags, is very different
1279 * by origin. notify the difference to the users.
1280 */
1281#if 0
1282 printf(" %s",
1260
1261 gettimeofday(&time, 0);
1262 /*
1263 * meaning of fields, especially flags, is very different
1264 * by origin. notify the difference to the users.
1265 */
1266#if 0
1267 printf(" %s",
1283 PR.origin == PR_ORIG_RA ? "" : "advertise: ");
1268 PR.origin == PR_ORIG_RA ? "" : "advertise: ");
1284#endif
1285#ifdef NDPRF_ONLINK
1286 printf("flags=%s%s%s%s%s",
1269#endif
1270#ifdef NDPRF_ONLINK
1271 printf("flags=%s%s%s%s%s",
1287 PR.raflags.onlink ? "L" : "",
1288 PR.raflags.autonomous ? "A" : "",
1289 (PR.flags & NDPRF_ONLINK) != 0 ? "O" : "",
1290 (PR.flags & NDPRF_DETACHED) != 0 ? "D" : "",
1272 PR.raflags.onlink ? "L" : "",
1273 PR.raflags.autonomous ? "A" : "",
1274 (PR.flags & NDPRF_ONLINK) != 0 ? "O" : "",
1275 (PR.flags & NDPRF_DETACHED) != 0 ? "D" : "",
1291#ifdef NDPRF_HOME
1276#ifdef NDPRF_HOME
1292 (PR.flags & NDPRF_HOME) != 0 ? "H" : ""
1277 (PR.flags & NDPRF_HOME) != 0 ? "H" : ""
1293#else
1278#else
1294 ""
1279 ""
1295#endif
1280#endif
1296 );
1281 );
1297#else
1298 printf("flags=%s%s",
1282#else
1283 printf("flags=%s%s",
1299 PR.raflags.onlink ? "L" : "",
1300 PR.raflags.autonomous ? "A" : "");
1284 PR.raflags.onlink ? "L" : "",
1285 PR.raflags.autonomous ? "A" : "");
1301#endif
1302 if (PR.vltime == ND6_INFINITE_LIFETIME)
1303 printf(" vltime=infinity");
1304 else
1305 printf(" vltime=%ld", (long)PR.vltime);
1306 if (PR.pltime == ND6_INFINITE_LIFETIME)
1307 printf(", pltime=infinity");
1308 else
1309 printf(", pltime=%ld", (long)PR.pltime);
1310 if (PR.expire == 0)
1311 printf(", expire=Never");
1312 else if (PR.expire >= time.tv_sec)
1313 printf(", expire=%s",
1286#endif
1287 if (PR.vltime == ND6_INFINITE_LIFETIME)
1288 printf(" vltime=infinity");
1289 else
1290 printf(" vltime=%ld", (long)PR.vltime);
1291 if (PR.pltime == ND6_INFINITE_LIFETIME)
1292 printf(", pltime=infinity");
1293 else
1294 printf(", pltime=%ld", (long)PR.pltime);
1295 if (PR.expire == 0)
1296 printf(", expire=Never");
1297 else if (PR.expire >= time.tv_sec)
1298 printf(", expire=%s",
1314 sec2str(PR.expire - time.tv_sec));
1299 sec2str(PR.expire - time.tv_sec));
1315 else
1316 printf(", expired");
1317#ifdef NDPRF_ONLINK
1318 printf(", ref=%d", PR.refcnt);
1319#endif
1320#if 0
1321 switch (PR.origin) {
1322 case PR_ORIG_RA:

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

1352 struct in6_nbrinfo *nbi;
1353
1354 bzero(&sin6, sizeof(sin6));
1355 sin6.sin6_family = AF_INET6;
1356 sin6.sin6_len = sizeof(sin6);
1357 sin6.sin6_addr = PR.advrtr[j];
1358 sin6.sin6_scope_id = PR.if_index; /* XXX */
1359 getnameinfo((struct sockaddr *)&sin6,
1300 else
1301 printf(", expired");
1302#ifdef NDPRF_ONLINK
1303 printf(", ref=%d", PR.refcnt);
1304#endif
1305#if 0
1306 switch (PR.origin) {
1307 case PR_ORIG_RA:

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

1337 struct in6_nbrinfo *nbi;
1338
1339 bzero(&sin6, sizeof(sin6));
1340 sin6.sin6_family = AF_INET6;
1341 sin6.sin6_len = sizeof(sin6);
1342 sin6.sin6_addr = PR.advrtr[j];
1343 sin6.sin6_scope_id = PR.if_index; /* XXX */
1344 getnameinfo((struct sockaddr *)&sin6,
1360 sin6.sin6_len, host_buf,
1361 sizeof(host_buf), NULL, 0,
1362 NI_WITHSCOPEID | (nflag ? NI_NUMERICHOST : 0));
1345 sin6.sin6_len, host_buf,
1346 sizeof(host_buf), NULL, 0,
1347 (nflag ? NI_NUMERICHOST : 0));
1363 printf(" %s", host_buf);
1364
1348 printf(" %s", host_buf);
1349
1365 nbi = getnbrinfo(&sin6.sin6_addr, PR.if_index,
1366 0);
1350 nbi = getnbrinfo(&sin6.sin6_addr,
1351 PR.if_index, 0);
1367 if (nbi) {
1352 if (nbi) {
1368 switch(nbi->state) {
1369 case ND6_LLINFO_REACHABLE:
1370 case ND6_LLINFO_STALE:
1371 case ND6_LLINFO_DELAY:
1372 case ND6_LLINFO_PROBE:
1353 switch (nbi->state) {
1354 case ND6_LLINFO_REACHABLE:
1355 case ND6_LLINFO_STALE:
1356 case ND6_LLINFO_DELAY:
1357 case ND6_LLINFO_PROBE:
1373 printf(" (reachable)\n");
1374 break;
1358 printf(" (reachable)\n");
1359 break;
1375 default:
1360 default:
1376 printf(" (unreachable)\n");
1377 }
1378 } else
1379 printf(" (no neighbor state)\n");
1380 }
1381 if (PR.advrtrs > DRLSTSIZ)
1382 printf(" and %d routers\n",
1361 printf(" (unreachable)\n");
1362 }
1363 } else
1364 printf(" (no neighbor state)\n");
1365 }
1366 if (PR.advrtrs > DRLSTSIZ)
1367 printf(" and %d routers\n",
1383 PR.advrtrs - DRLSTSIZ);
1368 PR.advrtrs - DRLSTSIZ);
1384 } else
1385 printf(" No advertising router\n");
1386 }
1387#undef PR
1388 close(s);
1389#endif
1390}
1391
1392void
1393pfx_flush()
1394{
1395 char dummyif[IFNAMSIZ+8];
1396 int s;
1397
1398 if ((s = socket(AF_INET6, SOCK_DGRAM, 0)) < 0)
1399 err(1, "socket");
1369 } else
1370 printf(" No advertising router\n");
1371 }
1372#undef PR
1373 close(s);
1374#endif
1375}
1376
1377void
1378pfx_flush()
1379{
1380 char dummyif[IFNAMSIZ+8];
1381 int s;
1382
1383 if ((s = socket(AF_INET6, SOCK_DGRAM, 0)) < 0)
1384 err(1, "socket");
1400 strcpy(dummyif, "lo0"); /* dummy */
1385 strlcpy(dummyif, "lo0", sizeof(dummyif)); /* dummy */
1401 if (ioctl(s, SIOCSPFXFLUSH_IN6, (caddr_t)&dummyif) < 0)
1386 if (ioctl(s, SIOCSPFXFLUSH_IN6, (caddr_t)&dummyif) < 0)
1402 err(1, "ioctl(SIOCSPFXFLUSH_IN6)");
1387 err(1, "ioctl(SIOCSPFXFLUSH_IN6)");
1403}
1404
1405void
1406rtr_flush()
1407{
1408 char dummyif[IFNAMSIZ+8];
1409 int s;
1410
1411 if ((s = socket(AF_INET6, SOCK_DGRAM, 0)) < 0)
1412 err(1, "socket");
1388}
1389
1390void
1391rtr_flush()
1392{
1393 char dummyif[IFNAMSIZ+8];
1394 int s;
1395
1396 if ((s = socket(AF_INET6, SOCK_DGRAM, 0)) < 0)
1397 err(1, "socket");
1413 strcpy(dummyif, "lo0"); /* dummy */
1398 strlcpy(dummyif, "lo0", sizeof(dummyif)); /* dummy */
1414 if (ioctl(s, SIOCSRTRFLUSH_IN6, (caddr_t)&dummyif) < 0)
1399 if (ioctl(s, SIOCSRTRFLUSH_IN6, (caddr_t)&dummyif) < 0)
1415 err(1, "ioctl(SIOCSRTRFLUSH_IN6)");
1400 err(1, "ioctl(SIOCSRTRFLUSH_IN6)");
1416
1417 close(s);
1418}
1419
1420void
1421harmonize_rtr()
1422{
1423 char dummyif[IFNAMSIZ+8];
1424 int s;
1425
1426 if ((s = socket(AF_INET6, SOCK_DGRAM, 0)) < 0)
1427 err(1, "socket");
1401
1402 close(s);
1403}
1404
1405void
1406harmonize_rtr()
1407{
1408 char dummyif[IFNAMSIZ+8];
1409 int s;
1410
1411 if ((s = socket(AF_INET6, SOCK_DGRAM, 0)) < 0)
1412 err(1, "socket");
1428 strcpy(dummyif, "lo0"); /* dummy */
1413 strlcpy(dummyif, "lo0", sizeof(dummyif)); /* dummy */
1429 if (ioctl(s, SIOCSNDFLUSH_IN6, (caddr_t)&dummyif) < 0)
1414 if (ioctl(s, SIOCSNDFLUSH_IN6, (caddr_t)&dummyif) < 0)
1430 err(1, "ioctl (SIOCSNDFLUSH_IN6)");
1415 err(1, "ioctl(SIOCSNDFLUSH_IN6)");
1431
1432 close(s);
1433}
1434
1435#ifdef SIOCSDEFIFACE_IN6 /* XXX: check SIOCGDEFIFACE_IN6 as well? */
1436static void
1437setdefif(ifname)
1438 char *ifname;

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

1445 else {
1446 if ((ifindex = if_nametoindex(ifname)) == 0)
1447 err(1, "failed to resolve i/f index for %s", ifname);
1448 }
1449
1450 if ((s = socket(AF_INET6, SOCK_DGRAM, 0)) < 0)
1451 err(1, "socket");
1452
1416
1417 close(s);
1418}
1419
1420#ifdef SIOCSDEFIFACE_IN6 /* XXX: check SIOCGDEFIFACE_IN6 as well? */
1421static void
1422setdefif(ifname)
1423 char *ifname;

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

1430 else {
1431 if ((ifindex = if_nametoindex(ifname)) == 0)
1432 err(1, "failed to resolve i/f index for %s", ifname);
1433 }
1434
1435 if ((s = socket(AF_INET6, SOCK_DGRAM, 0)) < 0)
1436 err(1, "socket");
1437
1453 strcpy(ndifreq.ifname, "lo0"); /* dummy */
1438 strlcpy(ndifreq.ifname, "lo0", sizeof(ndifreq.ifname)); /* dummy */
1454 ndifreq.ifindex = ifindex;
1455
1456 if (ioctl(s, SIOCSDEFIFACE_IN6, (caddr_t)&ndifreq) < 0)
1439 ndifreq.ifindex = ifindex;
1440
1441 if (ioctl(s, SIOCSDEFIFACE_IN6, (caddr_t)&ndifreq) < 0)
1457 err(1, "ioctl (SIOCSDEFIFACE_IN6)");
1442 err(1, "ioctl(SIOCSDEFIFACE_IN6)");
1458
1459 close(s);
1460}
1461
1462static void
1463getdefif()
1464{
1465 struct in6_ndifreq ndifreq;
1466 char ifname[IFNAMSIZ+8];
1467
1468 if ((s = socket(AF_INET6, SOCK_DGRAM, 0)) < 0)
1469 err(1, "socket");
1470
1471 memset(&ndifreq, 0, sizeof(ndifreq));
1443
1444 close(s);
1445}
1446
1447static void
1448getdefif()
1449{
1450 struct in6_ndifreq ndifreq;
1451 char ifname[IFNAMSIZ+8];
1452
1453 if ((s = socket(AF_INET6, SOCK_DGRAM, 0)) < 0)
1454 err(1, "socket");
1455
1456 memset(&ndifreq, 0, sizeof(ndifreq));
1472 strcpy(ndifreq.ifname, "lo0"); /* dummy */
1457 strlcpy(ndifreq.ifname, "lo0", sizeof(ndifreq.ifname)); /* dummy */
1473
1474 if (ioctl(s, SIOCGDEFIFACE_IN6, (caddr_t)&ndifreq) < 0)
1458
1459 if (ioctl(s, SIOCGDEFIFACE_IN6, (caddr_t)&ndifreq) < 0)
1475 err(1, "ioctl (SIOCGDEFIFACE_IN6)");
1460 err(1, "ioctl(SIOCGDEFIFACE_IN6)");
1476
1477 if (ndifreq.ifindex == 0)
1478 printf("No default interface.\n");
1479 else {
1480 if ((if_indextoname(ndifreq.ifindex, ifname)) == NULL)
1481 err(1, "failed to resolve ifname for index %lu",
1482 ndifreq.ifindex);
1483 printf("ND default interface = %s\n", ifname);

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

1490static char *
1491sec2str(total)
1492 time_t total;
1493{
1494 static char result[256];
1495 int days, hours, mins, secs;
1496 int first = 1;
1497 char *p = result;
1461
1462 if (ndifreq.ifindex == 0)
1463 printf("No default interface.\n");
1464 else {
1465 if ((if_indextoname(ndifreq.ifindex, ifname)) == NULL)
1466 err(1, "failed to resolve ifname for index %lu",
1467 ndifreq.ifindex);
1468 printf("ND default interface = %s\n", ifname);

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

1475static char *
1476sec2str(total)
1477 time_t total;
1478{
1479 static char result[256];
1480 int days, hours, mins, secs;
1481 int first = 1;
1482 char *p = result;
1483 char *ep = &result[sizeof(result)];
1484 int n;
1498
1499 days = total / 3600 / 24;
1500 hours = (total / 3600) % 24;
1501 mins = (total / 60) % 60;
1502 secs = total % 60;
1503
1504 if (days) {
1505 first = 0;
1485
1486 days = total / 3600 / 24;
1487 hours = (total / 3600) % 24;
1488 mins = (total / 60) % 60;
1489 secs = total % 60;
1490
1491 if (days) {
1492 first = 0;
1506 p += sprintf(p, "%dd", days);
1493 n = snprintf(p, ep - p, "%dd", days);
1494 if (n < 0 || n >= ep - p)
1495 return "?";
1496 p += n;
1507 }
1508 if (!first || hours) {
1509 first = 0;
1497 }
1498 if (!first || hours) {
1499 first = 0;
1510 p += sprintf(p, "%dh", hours);
1500 n = snprintf(p, ep - p, "%dh", hours);
1501 if (n < 0 || n >= ep - p)
1502 return "?";
1503 p += n;
1511 }
1512 if (!first || mins) {
1513 first = 0;
1504 }
1505 if (!first || mins) {
1506 first = 0;
1514 p += sprintf(p, "%dm", mins);
1507 n = snprintf(p, ep - p, "%dm", mins);
1508 if (n < 0 || n >= ep - p)
1509 return "?";
1510 p += n;
1515 }
1511 }
1516 sprintf(p, "%ds", secs);
1512 snprintf(p, ep - p, "%ds", secs);
1517
1518 return(result);
1519}
1520
1521/*
1522 * Print the timestamp
1523 * from tcpdump/util.c
1524 */
1525static void
1526ts_print(tvp)
1527 const struct timeval *tvp;
1528{
1529 int s;
1530
1531 /* Default */
1532 s = (tvp->tv_sec + thiszone) % 86400;
1533 (void)printf("%02d:%02d:%02d.%06u ",
1534 s / 3600, (s % 3600) / 60, s % 60, (u_int32_t)tvp->tv_usec);
1535}
1513
1514 return(result);
1515}
1516
1517/*
1518 * Print the timestamp
1519 * from tcpdump/util.c
1520 */
1521static void
1522ts_print(tvp)
1523 const struct timeval *tvp;
1524{
1525 int s;
1526
1527 /* Default */
1528 s = (tvp->tv_sec + thiszone) % 86400;
1529 (void)printf("%02d:%02d:%02d.%06u ",
1530 s / 3600, (s % 3600) / 60, s % 60, (u_int32_t)tvp->tv_usec);
1531}