source: patches/iputils-s20071127-fixes-2.patch@ bfc344f

iputils-s20071127

@@ -168 +168 @@
         if (start.tv_sec==0)
                 start = tv;
 
-        if (count-- == 0 || (timeout && MS_TDIFF(tv,start) > timeout*1000 + 500))
-                finish();
+        if (timeout && MS_TDIFF(tv,start) > timeout*1000 + 500)
+                finish();
 
-        if (last.tv_sec==0 || MS_TDIFF(tv,last) > 500) {
+        if ((!timeout) && (count == 0))
+                finish();
+ 
+        if ( count!=0  && (last.tv_sec==0 || MS_TDIFF(tv,last) > 500 ) ) {
                 send_pack(s, src, dst, &me, &he);
-                if (count == 0 && unsolicited)
+                if (count >= 0)
+                        count--;
+                if (count==0 && unsolicited)
                         finish();
         }
         alarm(1);

doc/docbook2man-spec.pl

@@ -428 +428 @@
         output ' ';
 
         if($_[0]->attribute('CHOICE')->value =~ /opt/i) {
-                output '[ ';
+                output '[';
         }
         bold_on();
 }
@@ -441 +441 @@
                 font_off();
         }
         if($_[0]->attribute('CHOICE')->value =~ /opt/i) {
-                output '] ';
+                output ']';
         }
 }
 

iputils-s20071127

@@ -6 +6 @@
 
 html: $(HTMLFILES) iputils.html
 
-man: $(MANFILES)
+man: $(MANFILES) fix_sgml2man
 
 # docbook scripts are incredibly dirty in the sense that they leak
 # lots of some strange temporary junk directories and files.
@@ -33 +33 @@
         @set -e; cd tmp.db2man; nsgmls ../$< | sgmlspl ../docbook2man-spec.pl ; mv $@ ..
         @-rm -rf tmp.db2man
 
+fix_sgml2man:
+        @sed -i -e 's!\\fB\\fIdestination\\fB\\fR \[\\fB/\\fIport\\fB\\fR\]!\\fB\\fIdestination\\fB\\fR[\\fB/\\fIport\\fB\\fR]!g' tracepath.8
+
 clean:
         @rm -rf $(MANFILES) $(HTMLFILES) iputils.html tmp.db2html tmp.db2man
 

iputils-s20071127

@@ -16 +16 @@
 CCOPT=-D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g
 CFLAGS=$(CCOPT) $(GLIBCFIX) $(DEFINES) 
 
-IPV4_TARGETS=tracepath ping clockdiff rdisc arping tftpd rarpd
+IPV4_TARGETS=tracepath ping clockdiff rdisc arping
 IPV6_TARGETS=tracepath6 traceroute6 ping6
 TARGETS=$(IPV4_TARGETS) $(IPV6_TARGETS)
 
@@ -25 +25 @@
 
 all: $(TARGETS)
 
-
 tftpd: tftpd.o tftpsubs.o
 ping: ping.o ping_common.o
 ping6: ping6.o ping_common.o
@@ -37 +36 @@
 rdisc_srv.o: rdisc.c
         $(CC) $(CFLAGS) -DRDISC_SERVER -o rdisc_srv.o rdisc.c
 
-
 check-kernel:
 ifeq ($(KERNEL_INCLUDE),)
         @echo "Please, set correct KERNEL_INCLUDE"; false

iputils-s20071127

@@ -414 +414 @@
                         fprintf(stderr, "ping: unknown iface %s\n", device);
                         exit(2);
                 }
-                cmsg = (struct cmsghdr*)cmsgbuf;
+                cmsg = (struct cmsghdr*)(cmsgbuf+cmsglen);
                 cmsglen += CMSG_SPACE(sizeof(*ipi));
                 cmsg->cmsg_len = CMSG_LEN(sizeof(*ipi));
                 cmsg->cmsg_level = SOL_IPV6;
@@ -486 +486 @@
         /*
          *      select icmp echo reply as icmp type to receive
          */
-
         ICMP6_FILTER_SETBLOCKALL(&filter);
 
         if (!working_recverr) {

iputils-s20071127

@@ -249 +249 @@
                         if (argc == 1)
                                 options |= F_NUMERIC;
                 } else {
-                        hp = gethostbyname(target);
+                        hp = gethostbyname2(target, AF_INET);
                         if (!hp) {
                                 fprintf(stderr, "ping: unknown host %s\n", target);
                                 exit(2);
@@ -865 +865 @@
                 case ICMP_SR_FAILED:
                         printf("Source Route Failed\n");
                         break;
+                case ICMP_NET_UNKNOWN:
+                        printf("Destination Net Unknown\n");
+                        break;
+                case ICMP_HOST_UNKNOWN:
+                        printf("Destination Host Unknown\n");
+                        break;
+                case ICMP_HOST_ISOLATED:
+                        printf("Source Host Isolated\n");
+                        break;
+                case ICMP_NET_ANO:
+                        printf("Destination Net Prohibited\n");
+                        break;
+                case ICMP_HOST_ANO:
+                        printf("Destination Host Prohibited\n");
+                        break;
+                case ICMP_NET_UNR_TOS:
+                        printf("Destination Net Unreachable for Type of Service\n");
+                        break;
+                case ICMP_HOST_UNR_TOS:
+                        printf("Destination Host Unreachable for Type of Service\n");
+                        break;
                 case ICMP_PKT_FILTERED:
                         printf("Packet filtered\n");
                         break;
+                case ICMP_PREC_VIOLATION:
+                        printf("Precedence Violation\n");
+                        break;
+                case ICMP_PREC_CUTOFF:
+                        printf("Precedence Cutoff\n");
+                        break;
                 default:
                         printf("Dest Unreachable, Bad Code: %d\n", code);
                         break;

iputils-s20071127

@@ -818 +818 @@
         }
         if (pipesize > 1)
                 printf(", pipe %d", pipesize);
-        if (ntransmitted > 1 && (!interval || (options&(F_FLOOD|F_ADAPTIVE)))) {
+        if (ntransmitted > 1 && nreceived && 
+                        (!interval || (options&(F_FLOOD|F_ADAPTIVE)))) {
                 int ipg = (1000000*(long long)tv.tv_sec+tv.tv_usec)/(ntransmitted-1);
                 printf(", ipg/ewma %d.%03d/%d.%03d ms",
                        ipg/1000, ipg%1000, rtt/8000, (rtt/8)%1000);
@@ -852 +853 @@
         }
         fprintf(stderr, "\n");
 }
-

iputils-s20071127

@@ -240 +240 @@
 {
         int t;
         pid_t pid;
+        long open_max;
 
         if (trace)
                 return;
+        if ((open_max = sysconf(_SC_OPEN_MAX)) == -1) {
+                if (errno == 0) {
+                        (void) fprintf(stderr, "OPEN_MAX is not supported\n");
+                } 
+                else {
+                        (void) fprintf(stderr, "sysconf() error\n");
+                }
+                exit(1);
+        }
+
 
         if ((pid=fork()) != 0)
                 exit(0);
 
-        for (t = 0; t < OPEN_MAX; t++)
+        for (t = 0; t < open_max; t++)
                 if (t != s)
                         close(t);
 

iputils-s20071127

@@ -318 +318 @@
                 base_port = atoi(p+1);
         } else
                 base_port = 44444;
-        he = gethostbyname(argv[0]);
+        he = gethostbyname2(argv[0], AF_INET);
         if (he == NULL) {
-                herror("gethostbyname");
+                herror("gethostbyname2");
                 exit(1);
         }
         memcpy(&target.sin_addr, he->h_addr, 4);