Attachment #2359 for bug #13916

View | Details | Raw Unified | Return to bug 13916
Collapse All | Expand All

Lines 486-492 Link Here

(-)iputils.p8/ping6.c (-2 / +2 lines)
486		486
487	if (1) {	487	if (1) {
488	int on = 1;	488	int on = 1;
489	if (setsockopt(icmp_sock, IPPROTO_IPV6, IPV6_HOPLIMIT,	489	if (setsockopt(icmp_sock, IPPROTO_IPV6, IPV6_2292HOPLIMIT,
490	&on, sizeof(on)) == -1) {	490	&on, sizeof(on)) == -1) {
491	perror ("can't receive hop limit");	491	perror ("can't receive hop limit");
492	exit(2);	492	exit(2);
Lines 704-710 Link Here
704		704
705	for (c = CMSG_FIRSTHDR(msg); c; c = CMSG_NXTHDR(msg, c)) {	705	for (c = CMSG_FIRSTHDR(msg); c; c = CMSG_NXTHDR(msg, c)) {
706	if (c->cmsg_level != SOL_IPV6 \|\|	706	if (c->cmsg_level != SOL_IPV6 \|\|
707	c->cmsg_type != IPV6_HOPLIMIT)	707	c->cmsg_type != IPV6_2292HOPLIMIT)
708	continue;	708	continue;
709	if (c->cmsg_len < CMSG_LEN(sizeof(int)))	709	if (c->cmsg_len < CMSG_LEN(sizeof(int)))
710	continue;	710	continue;

Lines 113-119 Link Here

(-)iputils.p8/tracepath6.c (-2 / +2 lines)
113	if (cmsg->cmsg_level == SOL_IPV6) {	113	if (cmsg->cmsg_level == SOL_IPV6) {
114	if (cmsg->cmsg_type == IPV6_RECVERR) {	114	if (cmsg->cmsg_type == IPV6_RECVERR) {
115	e = (struct sock_extended_err *)CMSG_DATA(cmsg);	115	e = (struct sock_extended_err *)CMSG_DATA(cmsg);
116	} else if (cmsg->cmsg_type == IPV6_HOPLIMIT) {	116	} else if (cmsg->cmsg_type == IPV6_2292HOPLIMIT) {
117	rethops = (int)CMSG_DATA(cmsg);	117	rethops = (int)CMSG_DATA(cmsg);
118	}	118	}
119	} else if (cmsg->cmsg_level == SOL_IP) {	119	} else if (cmsg->cmsg_level == SOL_IP) {
Lines 359-365 Link Here
359	perror("IP_RECVERR");	359	perror("IP_RECVERR");
360	exit(1);	360	exit(1);
361	}	361	}
362	if (setsockopt(fd, SOL_IPV6, IPV6_HOPLIMIT, &on, sizeof(on))) {	362	if (setsockopt(fd, SOL_IPV6, IPV6_2292HOPLIMIT, &on, sizeof(on))) {
363	perror("IPV6_HOPLIMIT");	363	perror("IPV6_HOPLIMIT");
364	exit(1);	364	exit(1);
365	}	365	}

Return to bug 13916