🚀 go-pugleaf

Subject: network release - netinet/ip_icmp.c option strip code incomplete
Index:	sys/netinet/ip_icmp.c network-release Fix

Description:
	ip_icmp.c won't compile due to an undeclared pointer "m".  It
	appears that somebody tried to inline ip_stripoptions and
	didn't finish.

Repeat-By:
	After merging the network release into 4.3 Tahoe, config/make a
	VAX kernel with internet protocols.

Fix:
	Complete changes to eliminate use of ip_stripoptions or put
	call to ip_stripoptions back in...

*** sys/netinet/ip_icmp.c.grr	Fri Jun  2 20:59:01 1989
--- sys/netinet/ip_icmp.c	Fri Jun  2 20:59:39 1989
***************
*** 428,439 ****
  		 * Now strip out original options by copying rest of first
  		 * mbuf's data back, and adjust the IP length.
  		 */
! 		ip->ip_len -= optlen;
! 		ip->ip_hl = sizeof(struct ip) >> 2;
! 		m->m_len -= optlen;
! 		optlen += sizeof(struct ip);
! 		bcopy((caddr_t)ip + optlen, (caddr_t)(ip + 1),
! 		    m->m_len - sizeof(struct ip));
  	}
  
  	icmp_send(ip, opts);
--- 428,444 ----
  		 * Now strip out original options by copying rest of first
  		 * mbuf's data back, and adjust the IP length.
  		 */
! 		{
! 		    struct mbuf *m;
! 
! 		    ip->ip_len -= optlen;
! 		    ip->ip_hl = sizeof(struct ip) >> 2;
! 		    m = dtom(ip);
! 		    m->m_len -= optlen;
! 		    optlen += sizeof(struct ip);
! 		    bcopy((caddr_t)ip + optlen, (caddr_t)(ip + 1),
! 			 m->m_len - sizeof(struct ip));
! 		}
  	}
  
  	icmp_send(ip, opts);
-- 
George Robbins - now working for,	uucp: {uunet|pyramid|rutgers}!cbmvax!grr
but no way officially representing	arpa: cbmvax!grr@uunet.uu.net
Commodore, Engineering Department	fone: 215-431-9255 (only by moonlite)