Date: Tue, 10 May 2016 04:59:14 +0000 From: Phabricator <phabric-noreply@FreeBSD.org> To: freebsd-net@freebsd.org Subject: [Differential] D6148: tcp/syncache: Add comment for syncache_respond Message-ID: <7d8afe816999479ba7e90cb36f734853@localhost.localdomain> In-Reply-To: <differential-rev-PHID-DREV-ergrrw76eskhond4myab-req@FreeBSD.org> References: <differential-rev-PHID-DREV-ergrrw76eskhond4myab-req@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--b1_7d8afe816999479ba7e90cb36f734853 Content-Type: text/plain; charset = "utf-8" Content-Transfer-Encoding: 8bit This revision was automatically updated to reflect the committed changes. Closed by commit rS299315: tcp/syncache: Add comment for syncache_respond (authored by sephe). CHANGED PRIOR TO COMMIT https://reviews.freebsd.org/D6148?vs=15728&id=16100#toc REPOSITORY rS FreeBSD src repository CHANGES SINCE LAST UPDATE https://reviews.freebsd.org/D6148?vs=15728&id=16100 REVISION DETAIL https://reviews.freebsd.org/D6148 AFFECTED FILES head/sys/netinet/tcp_syncache.c CHANGE DETAILS diff --git a/head/sys/netinet/tcp_syncache.c b/head/sys/netinet/tcp_syncache.c --- a/head/sys/netinet/tcp_syncache.c +++ b/head/sys/netinet/tcp_syncache.c @@ -1505,6 +1505,10 @@ return (rv); } +/* + * Send SYN|ACK to the peer. Either in response to the peer's SYN, + * i.e. m0 != NULL, or upon 3WHS ACK timeout, i.e. m0 == NULL. + */ static int syncache_respond(struct syncache *sc, struct syncache_head *sch, int locked, const struct mbuf *m0) @@ -1688,6 +1692,11 @@ M_SETFIB(m, sc->sc_inc.inc_fibnum); m->m_pkthdr.csum_data = offsetof(struct tcphdr, th_sum); + /* + * If we have peer's SYN and it has a flowid, then let's assign it to + * our SYN|ACK. ip6_output() and ip_output() will not assign flowid + * to SYN|ACK due to lack of inp here. + */ if (m0 != NULL && M_HASHTYPE_GET(m0) != M_HASHTYPE_NONE) { m->m_pkthdr.flowid = m0->m_pkthdr.flowid; M_HASHTYPE_SET(m, M_HASHTYPE_GET(m0)); EMAIL PREFERENCES https://reviews.freebsd.org/settings/panel/emailpreferences/ To: sepherosa_gmail.com, network, transport, adrian, rwatson, gnn, lstewart, glebius, delphij, mike-karels.net, jtl, hiren, hselasky, sbruno Cc: freebsd-net-list --b1_7d8afe816999479ba7e90cb36f734853 Content-Type: text/x-patch; charset=utf-8; name="D6148.16100.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="D6148.16100.patch" ZGlmZiAtLWdpdCBhL2hlYWQvc3lzL25ldGluZXQvdGNwX3N5bmNhY2hlLmMgYi9oZWFkL3N5cy9u ZXRpbmV0L3RjcF9zeW5jYWNoZS5jCi0tLSBhL2hlYWQvc3lzL25ldGluZXQvdGNwX3N5bmNhY2hl LmMKKysrIGIvaGVhZC9zeXMvbmV0aW5ldC90Y3Bfc3luY2FjaGUuYwpAQCAtMTUwNSw2ICsxNTA1 LDEwIEBACiAJcmV0dXJuIChydik7CiB9CiAKKy8qCisgKiBTZW5kIFNZTnxBQ0sgdG8gdGhlIHBl ZXIuICBFaXRoZXIgaW4gcmVzcG9uc2UgdG8gdGhlIHBlZXIncyBTWU4sCisgKiBpLmUuIG0wICE9 IE5VTEwsIG9yIHVwb24gM1dIUyBBQ0sgdGltZW91dCwgaS5lLiBtMCA9PSBOVUxMLgorICovCiBz dGF0aWMgaW50CiBzeW5jYWNoZV9yZXNwb25kKHN0cnVjdCBzeW5jYWNoZSAqc2MsIHN0cnVjdCBz eW5jYWNoZV9oZWFkICpzY2gsIGludCBsb2NrZWQsCiAgICAgY29uc3Qgc3RydWN0IG1idWYgKm0w KQpAQCAtMTY4OCw2ICsxNjkyLDExIEBACiAKIAlNX1NFVEZJQihtLCBzYy0+c2NfaW5jLmluY19m aWJudW0pOwogCW0tPm1fcGt0aGRyLmNzdW1fZGF0YSA9IG9mZnNldG9mKHN0cnVjdCB0Y3BoZHIs IHRoX3N1bSk7CisJLyoKKwkgKiBJZiB3ZSBoYXZlIHBlZXIncyBTWU4gYW5kIGl0IGhhcyBhIGZs b3dpZCwgdGhlbiBsZXQncyBhc3NpZ24gaXQgdG8KKwkgKiBvdXIgU1lOfEFDSy4gIGlwNl9vdXRw dXQoKSBhbmQgaXBfb3V0cHV0KCkgd2lsbCBub3QgYXNzaWduIGZsb3dpZAorCSAqIHRvIFNZTnxB Q0sgZHVlIHRvIGxhY2sgb2YgaW5wIGhlcmUuCisJICovCiAJaWYgKG0wICE9IE5VTEwgJiYgTV9I QVNIVFlQRV9HRVQobTApICE9IE1fSEFTSFRZUEVfTk9ORSkgewogCQltLT5tX3BrdGhkci5mbG93 aWQgPSBtMC0+bV9wa3RoZHIuZmxvd2lkOwogCQlNX0hBU0hUWVBFX1NFVChtLCBNX0hBU0hUWVBF X0dFVChtMCkpOwoK --b1_7d8afe816999479ba7e90cb36f734853--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?7d8afe816999479ba7e90cb36f734853>