From owner-svn-src-head@freebsd.org Tue Dec 26 16:34:39 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C2F35EA0A73; Tue, 26 Dec 2017 16:34:39 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 995B17CEE1; Tue, 26 Dec 2017 16:34:38 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (localhost [127.0.0.1]) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3) with ESMTP id vBQGYWQB056953; Tue, 26 Dec 2017 08:34:32 -0800 (PST) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: (from freebsd@localhost) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3/Submit) id vBQGYVFB056952; Tue, 26 Dec 2017 08:34:31 -0800 (PST) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <201712261634.vBQGYVFB056952@pdx.rh.CN85.dnsmgr.net> Subject: Re: svn commit: r327209 - head/sys/netinet/libalias In-Reply-To: <201712261612.vBQGC4wj066322@repo.freebsd.org> To: Michael Tuexen Date: Tue, 26 Dec 2017 08:34:31 -0800 (PST) CC: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Reply-To: rgrimes@freebsd.org X-Mailer: ELM [version 2.4ME+ PL121h (25)] MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Dec 2017 16:34:39 -0000 > Author: tuexen > Date: Tue Dec 26 16:12:04 2017 > New Revision: 327209 > URL: https://svnweb.freebsd.org/changeset/base/327209 > > Log: > Clearify CID 1008197. > > MFC after: 3 days This and the prior few commits log entries leave a great deal to be desired from the perspective of someone reading this. > Modified: > head/sys/netinet/libalias/alias_sctp.c > > Modified: head/sys/netinet/libalias/alias_sctp.c > ============================================================================== > --- head/sys/netinet/libalias/alias_sctp.c Tue Dec 26 16:06:11 2017 (r327208) > +++ head/sys/netinet/libalias/alias_sctp.c Tue Dec 26 16:12:04 2017 (r327209) > @@ -1737,27 +1737,28 @@ ProcessSctpMsg(struct libalias *la, int direction, str > static int > ID_process(struct libalias *la, int direction, struct sctp_nat_assoc *assoc, struct sctp_nat_msg *sm) > { > - switch(sm->msg) { > + switch (sm->msg) { > case SN_SCTP_ASCONF: /* a packet containing an ASCONF chunk with ADDIP */ > if (!sysctl_accept_global_ootb_addip && (direction == SN_TO_LOCAL)) > - return(SN_DROP_PKT); > + return (SN_DROP_PKT); > /* if this Asconf packet does not contain the Vtag parameters it is of no use in Idle state */ > if (!GetAsconfVtags(la, sm, &(assoc->l_vtag), &(assoc->g_vtag), direction)) > - return(SN_DROP_PKT); > + return (SN_DROP_PKT); > + /* FALLTHROUGH */ > case SN_SCTP_INIT: /* a packet containing an INIT chunk or an ASCONF AddIP */ > if (sysctl_track_global_addresses) > AddGlobalIPAddresses(sm, assoc, direction); > - switch(direction){ > + switch (direction) { > case SN_TO_GLOBAL: > assoc->l_addr = sm->ip_hdr->ip_src; > assoc->a_addr = FindAliasAddress(la, assoc->l_addr); > assoc->l_port = sm->sctp_hdr->src_port; > assoc->g_port = sm->sctp_hdr->dest_port; > - if(sm->msg == SN_SCTP_INIT) > + if (sm->msg == SN_SCTP_INIT) > assoc->g_vtag = sm->sctpchnk.Init->initiate_tag; > if (AddSctpAssocGlobal(la, assoc)) /* DB clash *///**** need to add dst address > return((sm->msg == SN_SCTP_INIT) ? SN_REPLY_ABORT : SN_REPLY_ERROR); > - if(sm->msg == SN_SCTP_ASCONF) { > + if (sm->msg == SN_SCTP_ASCONF) { > if (AddSctpAssocLocal(la, assoc, sm->ip_hdr->ip_dst)) /* DB clash */ > return(SN_REPLY_ERROR); > assoc->TableRegister |= SN_WAIT_TOLOCAL; /* wait for tolocal ack */ > @@ -1768,25 +1769,25 @@ ID_process(struct libalias *la, int direction, struct > assoc->a_addr = sm->ip_hdr->ip_dst; > assoc->l_port = sm->sctp_hdr->dest_port; > assoc->g_port = sm->sctp_hdr->src_port; > - if(sm->msg == SN_SCTP_INIT) > + if (sm->msg == SN_SCTP_INIT) > assoc->l_vtag = sm->sctpchnk.Init->initiate_tag; > if (AddSctpAssocLocal(la, assoc, sm->ip_hdr->ip_src)) /* DB clash */ > return((sm->msg == SN_SCTP_INIT) ? SN_REPLY_ABORT : SN_REPLY_ERROR); > - if(sm->msg == SN_SCTP_ASCONF) { > + if (sm->msg == SN_SCTP_ASCONF) { > if (AddSctpAssocGlobal(la, assoc)) /* DB clash */ //**** need to add src address > return(SN_REPLY_ERROR); > assoc->TableRegister |= SN_WAIT_TOGLOBAL; /* wait for toglobal ack */ > } > break; > } > - assoc->state = (sm->msg == SN_SCTP_INIT) ? SN_INi : SN_INa; > - assoc->exp = SN_I_T(la); > - sctp_AddTimeOut(la,assoc); > - return(SN_NAT_PKT); > + assoc->state = (sm->msg == SN_SCTP_INIT) ? SN_INi : SN_INa; > + assoc->exp = SN_I_T(la); > + sctp_AddTimeOut(la,assoc); > + return (SN_NAT_PKT); > default: /* Any other type of SCTP message is not valid in Idle */ > - return(SN_DROP_PKT); > + return (SN_DROP_PKT); > } > -return(SN_DROP_PKT);/* shouldn't get here very bad: log, drop and hope for the best */ > + return (SN_DROP_PKT);/* shouldn't get here very bad: log, drop and hope for the best */ > } > > /** @ingroup state_machine > > -- Rod Grimes rgrimes@freebsd.org