From owner-p4-projects@FreeBSD.ORG Mon Aug 4 07:37:00 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6E16E37B407; Mon, 4 Aug 2003 07:37:00 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D45AE37B401 for ; Mon, 4 Aug 2003 07:36:59 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AE6E943FAF for ; Mon, 4 Aug 2003 07:36:54 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h74Eas0U021133 for ; Mon, 4 Aug 2003 07:36:54 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h74EarVL021130 for perforce@freebsd.org; Mon, 4 Aug 2003 07:36:53 -0700 (PDT) Date: Mon, 4 Aug 2003 07:36:53 -0700 (PDT) Message-Id: <200308041436.h74EarVL021130@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 35474 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Aug 2003 14:37:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=35474 Change 35474 by rwatson@rwatson_tislabs on 2003/08/04 07:36:15 Expand the annotation for ip_output(): in the IP forwarding case, the options will already be in the IP header of (m), so the opt pointer must be NULL (we can't insert options into a packet that already holds options). Affected files ... .. //depot/projects/trustedbsd/mac/sys/netinet/ip_output.c#29 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/netinet/ip_output.c#29 (text+ko) ==== @@ -118,10 +118,12 @@ extern struct protosw inetsw[]; /* - * IP output. The packet in mbuf chain m contains a skeletal IP - * header (with len, off, ttl, proto, tos, src, dst). + * IP output. The packet in mbuf chain m contains a skeletal IP header (with + * len, off, ttl, proto, tos, src, dst). * The mbuf chain containing the packet will be freed. - * The mbuf opt, if present, will not be freed. + * The mbuf opt, if present, will not be freed. In the IP forwarding + * case, the packet will arrive with options already inserted, so must + * have a NULL opt pointer. */ int ip_output(m0, opt, ro, flags, imo, inp)