Merge branch 'master' of /home/aggelos/devel/dfly/dfly.git/
[dragonfly.git] / usr.sbin / tcpdump / tcpdump / print-ospf6.c.patch
1 $DragonFly: src/usr.sbin/tcpdump/tcpdump/print-ospf6.c.patch,v 1.1 2006/01/18 02:33:38 dillon Exp $
2
3 Index: contrib/tcpdump-3.8.3/print-ospf6.c
4 ===================================================================
5 RCS file: /cvs/src/contrib/tcpdump-3.8.3/print-ospf6.c,v
6 retrieving revision 1.1.1.1
7 diff -u -r1.1.1.1 print-ospf6.c
8 --- print-ospf6.c.orig  15 May 2004 12:24:19 -0000      1.1.1.1
9 +++ print-ospf6.c       17 Jan 2006 23:38:21 -0000
10 @@ -348,9 +348,9 @@
11                 printf(" metric %u",
12                         EXTRACT_32BITS(&lsap->lsa_un.un_inter_ap.inter_ap_metric) & SLA_MASK_METRIC);
13                 lsapp = lsap->lsa_un.un_inter_ap.inter_ap_prefix;
14 -               while (lsapp + sizeof(lsapp) <= (struct lsa_prefix *)ls_end) {
15 +               while (lsapp + 1 <= (struct lsa_prefix *)ls_end) {
16                         k = ospf6_print_lsaprefix(lsapp);
17 -                       if (k)
18 +                       if (k < 0)
19                                 goto trunc;
20                         lsapp = (struct lsa_prefix *)(((u_char *)lsapp) + k);
21                 }