From owner-svn-src-all@freebsd.org Thu Jan 28 22:24:27 2016 Return-Path: Delivered-To: svn-src-all@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 2798DA70D36 for ; Thu, 28 Jan 2016 22:24:27 +0000 (UTC) (envelope-from oliver.pinter@hardenedbsd.org) Received: from mail-wm0-x230.google.com (mail-wm0-x230.google.com [IPv6:2a00:1450:400c:c09::230]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C9641A7F for ; Thu, 28 Jan 2016 22:24:26 +0000 (UTC) (envelope-from oliver.pinter@hardenedbsd.org) Received: by mail-wm0-x230.google.com with SMTP id p63so44562568wmp.1 for ; Thu, 28 Jan 2016 14:24:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hardenedbsd-org.20150623.gappssmtp.com; s=20150623; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=gS/QTpnEgSs+3Jk2xS9m5T3AAu9tVXAUuBVz2GWHOyc=; b=SkgmcXVkfIfzF9Dg6XwDcQlia4nObx9GJadRkjOpsqIkXRgf+eRiNLfrRBCedWf8zZ UTTtztxS73PwcRogArhpCKMmyZVBX+Wz1LzYFbUuNMnyUMdnPNpMv6ysgukEgaWsnPrc LYtPV3UjnVXmSmBOWo0biPZO/sDRg6NEXNlDc0mUc3Ud62DOUEn5yo/e2Miw7zWQsHuk ejyjbccqQVbugP1nBCfMgUBgbpH7sQq/aCdr+pPo1OheFwicMu0gcbPrWviysQuY1MZ7 Pl6MF+UGM3sWyusWlu/MH2qv+Y4oGgcClpfbqJ38Y+rc625NMuwSNHKjSIWGBd1JRIvM 24HQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc:content-type; bh=gS/QTpnEgSs+3Jk2xS9m5T3AAu9tVXAUuBVz2GWHOyc=; b=dpjQUGP4Dxvv1gHEYaAWXiLVbkiyMvhzdXAOV7hMeIfLbQudbnO83rEwGudDDLXbzE Xq8mNojReXiDtT7+cnhHSqxaEQEGXmyc4X5IcZep3lID6L441tOyWJm1PuMvDQTucc2F tB2EeHgLcOcZohtheJiNO4LvhYTH+j8SP8Yc5WF6Wv95Outv5xTRyKkTTf2AMbL6BFlG 9RmmB0mgVHZdeWpR9JfVvgyHmnFadrw7C2fGnNiS5Mv1jbN4aLxNc2o7a6XTd4dwBZiz 9Ma6Tuhx2al12ULGXemZwtdBzCkhXscaVYKvsdZ+NkYCS+yE+tZm0sL++WgBxMdZkKDv szZQ== X-Gm-Message-State: AG10YOQaATRNRMfqNybaDSsWH3xLu6pWUghn4fk4+rW+lG2T7YFY2onN/EVQ6yaAjr6CS7ev29FJw4BvZQM4hxZh MIME-Version: 1.0 X-Received: by 10.28.184.78 with SMTP id i75mr5718202wmf.22.1454019865372; Thu, 28 Jan 2016 14:24:25 -0800 (PST) Received: by 10.194.82.6 with HTTP; Thu, 28 Jan 2016 14:24:25 -0800 (PST) In-Reply-To: <201601281605.u0SG5kYU027051@repo.freebsd.org> References: <201601281605.u0SG5kYU027051@repo.freebsd.org> Date: Thu, 28 Jan 2016 23:24:25 +0100 Message-ID: Subject: Re: svn commit: r294995 - head/sys/netinet From: Oliver Pinter To: Michael Tuexen Cc: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Jan 2016 22:24:27 -0000 On Thu, Jan 28, 2016 at 5:05 PM, Michael Tuexen wrote: > Author: tuexen > Date: Thu Jan 28 16:05:46 2016 > New Revision: 294995 > URL: https://svnweb.freebsd.org/changeset/base/294995 > > Log: > Always look in the TCP pool. > This fixes issues with a restarting peer when the listening > 1-to-1 style socket is closed. > > MFC after: 3 days > > Modified: > head/sys/netinet/sctp_input.c > head/sys/netinet/sctp_pcb.c > > Modified: head/sys/netinet/sctp_input.c > ============================================================================== > --- head/sys/netinet/sctp_input.c Thu Jan 28 15:44:14 2016 (r294994) > +++ head/sys/netinet/sctp_input.c Thu Jan 28 16:05:46 2016 (r294995) > @@ -5688,6 +5688,7 @@ sctp_common_input_processing(struct mbuf > if (net->port == 0) { > sctp_pathmtu_adjustment(stcb, net->mtu - sizeof(struct udphdr)); > } > +printf("Changing remote encaps port from %u to %u.\n", ntohs(net->port), ntohs(port)); Are these debug printf intended? > net->port = port; > } > #endif > @@ -5719,6 +5720,7 @@ sctp_common_input_processing(struct mbuf > if (net->port == 0) { > sctp_pathmtu_adjustment(stcb, net->mtu - sizeof(struct udphdr)); > } > +printf("Changing remote encaps port from %u to %u.\n", ntohs(net->port), ntohs(port)); > net->port = port; > } > #endif > @@ -5831,6 +5833,7 @@ sctp_common_input_processing(struct mbuf > if (net->port == 0) { > sctp_pathmtu_adjustment(stcb, net->mtu - sizeof(struct udphdr)); > } > +printf("Changing remote encaps port from %u to %u.\n", ntohs(net->port), ntohs(port)); > net->port = port; > } > #endif > > Modified: head/sys/netinet/sctp_pcb.c > ============================================================================== > --- head/sys/netinet/sctp_pcb.c Thu Jan 28 15:44:14 2016 (r294994) > +++ head/sys/netinet/sctp_pcb.c Thu Jan 28 16:05:46 2016 (r294995) > @@ -2256,7 +2256,6 @@ sctp_findassociation_addr(struct mbuf *m > struct sctphdr *sh, struct sctp_chunkhdr *ch, > struct sctp_inpcb **inp_p, struct sctp_nets **netp, uint32_t vrf_id) > { > - int find_tcp_pool; > struct sctp_tcb *stcb; > struct sctp_inpcb *inp; > > @@ -2268,25 +2267,13 @@ sctp_findassociation_addr(struct mbuf *m > return (stcb); > } > } > - find_tcp_pool = 0; > - /* > - * Don't consider INIT chunks since that breaks 1-to-1 sockets: When > - * a server closes the listener, incoming INIT chunks are not > - * responsed by an INIT-ACK chunk. > - */ > - if ((ch->chunk_type != SCTP_INITIATION_ACK) && > - (ch->chunk_type != SCTP_COOKIE_ACK) && > - (ch->chunk_type != SCTP_COOKIE_ECHO)) { > - /* Other chunk types go to the tcp pool. */ > - find_tcp_pool = 1; > - } > if (inp_p) { > stcb = sctp_findassociation_addr_sa(src, dst, inp_p, netp, > - find_tcp_pool, vrf_id); > + 1, vrf_id); > inp = *inp_p; > } else { > stcb = sctp_findassociation_addr_sa(src, dst, &inp, netp, > - find_tcp_pool, vrf_id); > + 1, vrf_id); > } > SCTPDBG(SCTP_DEBUG_PCB1, "stcb:%p inp:%p\n", (void *)stcb, (void *)inp); > if (stcb == NULL && inp) { > _______________________________________________ > svn-src-head@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/svn-src-head > To unsubscribe, send any mail to "svn-src-head-unsubscribe@freebsd.org"