source:
patches/iputils-s20071127-fixes-2.patch@
369d5d6
Last change on this file since 369d5d6 was 708ee25, checked in by , 16 years ago | |
---|---|
|
|
File size: 6.9 KB |
-
iputils-s20071127
Submitted By: Jim Gifford (jim at cross-lfs dot org) Date: 02-18-2009 Initial Package Version: s20071127 Origin: Debian and Fedora Upstream Status: Unknown Description: Fixes Various Issues diff -Naur iputils-s20071127.orig/arping.c iputils-s20071127/arping.c
old new 168 168 if (start.tv_sec==0) 169 169 start = tv; 170 170 171 if ( count-- == 0 || (timeout && MS_TDIFF(tv,start) > timeout*1000 + 500))172 finish();171 if (timeout && MS_TDIFF(tv,start) > timeout*1000 + 500) 172 finish(); 173 173 174 if (last.tv_sec==0 || MS_TDIFF(tv,last) > 500) { 174 if ((!timeout) && (count == 0)) 175 finish(); 176 177 if ( count!=0 && (last.tv_sec==0 || MS_TDIFF(tv,last) > 500 ) ) { 175 178 send_pack(s, src, dst, &me, &he); 176 if (count == 0 && unsolicited) 179 if (count >= 0) 180 count--; 181 if (count==0 && unsolicited) 177 182 finish(); 178 183 } 179 184 alarm(1); -
doc/docbook2man-spec.pl
diff -Naur iputils-s20071127.orig/doc/docbook2man-spec.pl iputils-s20071127/doc/docbook2man-spec.pl
old new 428 428 output ' '; 429 429 430 430 if($_[0]->attribute('CHOICE')->value =~ /opt/i) { 431 output '[ 431 output '['; 432 432 } 433 433 bold_on(); 434 434 } … … 441 441 font_off(); 442 442 } 443 443 if($_[0]->attribute('CHOICE')->value =~ /opt/i) { 444 output '] 444 output ']'; 445 445 } 446 446 } 447 447 -
iputils-s20071127
diff -Naur iputils-s20071127.orig/doc/Makefile iputils-s20071127/doc/Makefile
old new 6 6 7 7 html: $(HTMLFILES) iputils.html 8 8 9 man: $(MANFILES) 9 man: $(MANFILES) fix_sgml2man 10 10 11 11 # docbook scripts are incredibly dirty in the sense that they leak 12 12 # lots of some strange temporary junk directories and files. … … 33 33 @set -e; cd tmp.db2man; nsgmls ../$< | sgmlspl ../docbook2man-spec.pl ; mv $@ .. 34 34 @-rm -rf tmp.db2man 35 35 36 fix_sgml2man: 37 @sed -i -e 's!\\fB\\fIdestination\\fB\\fR \[\\fB/\\fIport\\fB\\fR\]!\\fB\\fIdestination\\fB\\fR[\\fB/\\fIport\\fB\\fR]!g' tracepath.8 38 36 39 clean: 37 40 @rm -rf $(MANFILES) $(HTMLFILES) iputils.html tmp.db2html tmp.db2man 38 41 -
iputils-s20071127
diff -Naur iputils-s20071127.orig/Makefile iputils-s20071127/Makefile
old new 16 16 CCOPT=-D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g 17 17 CFLAGS=$(CCOPT) $(GLIBCFIX) $(DEFINES) 18 18 19 IPV4_TARGETS=tracepath ping clockdiff rdisc arping tftpd rarpd19 IPV4_TARGETS=tracepath ping clockdiff rdisc arping 20 20 IPV6_TARGETS=tracepath6 traceroute6 ping6 21 21 TARGETS=$(IPV4_TARGETS) $(IPV6_TARGETS) 22 22 … … 25 25 26 26 all: $(TARGETS) 27 27 28 29 28 tftpd: tftpd.o tftpsubs.o 30 29 ping: ping.o ping_common.o 31 30 ping6: ping6.o ping_common.o … … 37 36 rdisc_srv.o: rdisc.c 38 37 $(CC) $(CFLAGS) -DRDISC_SERVER -o rdisc_srv.o rdisc.c 39 38 40 41 39 check-kernel: 42 40 ifeq ($(KERNEL_INCLUDE),) 43 41 @echo "Please, set correct KERNEL_INCLUDE"; false -
iputils-s20071127
diff -Naur iputils-s20071127.orig/ping6.c iputils-s20071127/ping6.c
old new 414 414 fprintf(stderr, "ping: unknown iface %s\n", device); 415 415 exit(2); 416 416 } 417 cmsg = (struct cmsghdr*) cmsgbuf;417 cmsg = (struct cmsghdr*)(cmsgbuf+cmsglen); 418 418 cmsglen += CMSG_SPACE(sizeof(*ipi)); 419 419 cmsg->cmsg_len = CMSG_LEN(sizeof(*ipi)); 420 420 cmsg->cmsg_level = SOL_IPV6; … … 486 486 /* 487 487 * select icmp echo reply as icmp type to receive 488 488 */ 489 490 489 ICMP6_FILTER_SETBLOCKALL(&filter); 491 490 492 491 if (!working_recverr) { -
iputils-s20071127
diff -Naur iputils-s20071127.orig/ping.c iputils-s20071127/ping.c
old new 249 249 if (argc == 1) 250 250 options |= F_NUMERIC; 251 251 } else { 252 hp = gethostbyname (target);252 hp = gethostbyname2(target, AF_INET); 253 253 if (!hp) { 254 254 fprintf(stderr, "ping: unknown host %s\n", target); 255 255 exit(2); … … 865 865 case ICMP_SR_FAILED: 866 866 printf("Source Route Failed\n"); 867 867 break; 868 case ICMP_NET_UNKNOWN: 869 printf("Destination Net Unknown\n"); 870 break; 871 case ICMP_HOST_UNKNOWN: 872 printf("Destination Host Unknown\n"); 873 break; 874 case ICMP_HOST_ISOLATED: 875 printf("Source Host Isolated\n"); 876 break; 877 case ICMP_NET_ANO: 878 printf("Destination Net Prohibited\n"); 879 break; 880 case ICMP_HOST_ANO: 881 printf("Destination Host Prohibited\n"); 882 break; 883 case ICMP_NET_UNR_TOS: 884 printf("Destination Net Unreachable for Type of Service\n"); 885 break; 886 case ICMP_HOST_UNR_TOS: 887 printf("Destination Host Unreachable for Type of Service\n"); 888 break; 868 889 case ICMP_PKT_FILTERED: 869 890 printf("Packet filtered\n"); 870 891 break; 892 case ICMP_PREC_VIOLATION: 893 printf("Precedence Violation\n"); 894 break; 895 case ICMP_PREC_CUTOFF: 896 printf("Precedence Cutoff\n"); 897 break; 871 898 default: 872 899 printf("Dest Unreachable, Bad Code: %d\n", code); 873 900 break; -
iputils-s20071127
diff -Naur iputils-s20071127.orig/ping_common.c iputils-s20071127/ping_common.c
old new 818 818 } 819 819 if (pipesize > 1) 820 820 printf(", pipe %d", pipesize); 821 if (ntransmitted > 1 && (!interval || (options&(F_FLOOD|F_ADAPTIVE)))) { 821 if (ntransmitted > 1 && nreceived && 822 (!interval || (options&(F_FLOOD|F_ADAPTIVE)))) { 822 823 int ipg = (1000000*(long long)tv.tv_sec+tv.tv_usec)/(ntransmitted-1); 823 824 printf(", ipg/ewma %d.%03d/%d.%03d ms", 824 825 ipg/1000, ipg%1000, rtt/8000, (rtt/8)%1000); … … 852 853 } 853 854 fprintf(stderr, "\n"); 854 855 } 855 -
iputils-s20071127
diff -Naur iputils-s20071127.orig/rdisc.c iputils-s20071127/rdisc.c
old new 240 240 { 241 241 int t; 242 242 pid_t pid; 243 long open_max; 243 244 244 245 if (trace) 245 246 return; 247 if ((open_max = sysconf(_SC_OPEN_MAX)) == -1) { 248 if (errno == 0) { 249 (void) fprintf(stderr, "OPEN_MAX is not supported\n"); 250 } 251 else { 252 (void) fprintf(stderr, "sysconf() error\n"); 253 } 254 exit(1); 255 } 256 246 257 247 258 if ((pid=fork()) != 0) 248 259 exit(0); 249 260 250 for (t = 0; t < OPEN_MAX; t++)261 for (t = 0; t < open_max; t++) 251 262 if (t != s) 252 263 close(t); 253 264 -
iputils-s20071127
diff -Naur iputils-s20071127.orig/tracepath.c iputils-s20071127/tracepath.c
old new 318 318 base_port = atoi(p+1); 319 319 } else 320 320 base_port = 44444; 321 he = gethostbyname (argv[0]);321 he = gethostbyname2(argv[0], AF_INET); 322 322 if (he == NULL) { 323 herror("gethostbyname ");323 herror("gethostbyname2"); 324 324 exit(1); 325 325 } 326 326 memcpy(&target.sin_addr, he->h_addr, 4);
Note:
See TracBrowser
for help on using the repository browser.