From owner-svn-src-all@FreeBSD.ORG Tue Feb 17 21:40:44 2015 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 05996697; Tue, 17 Feb 2015 21:40:44 +0000 (UTC) Received: from mail-we0-f176.google.com (mail-we0-f176.google.com [74.125.82.176]) (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 9399292D; Tue, 17 Feb 2015 21:40:43 +0000 (UTC) Received: by wesw62 with SMTP id w62so1032824wes.9; Tue, 17 Feb 2015 13:40:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:cc:content-type; bh=ZTmsB5Ks8FAimeDYIPnp74Z1Eus77DT7oivXcsJm/Ek=; b=kcW/Epgu1PmdbUcV+Xv/fscYUcW4qebqN/z6HDkN1Jl2qo1rX6Ruks8VDC+p29ptii 7H0eSkyHu3Dw6fAFr1Iw88m9Ad4LzoCTh9zzAqFF5kHyRwrK94BLsOxTNnJeCHaQNyLs ECGmir6Z5kZoEySl3AI5sXg8O9xZxpGwh3AjpDdn6FXVJoEWLZ8kKxrnPY90DyPOyfxS Mp1eIk50vZF+GZLOajizyE3tgLLeWNOodWMSrzkxuEb09ccojaT3WXgrVpMQ/pY2UXw9 vxJsPKLECutUb0bCDVrbNlJUbrHlBKOa3GGPGlkD+ekxRGyBf9TRcOaWFN3uhQWeyQkI IvTA== MIME-Version: 1.0 X-Received: by 10.180.76.45 with SMTP id h13mr50037921wiw.51.1424209236437; Tue, 17 Feb 2015 13:40:36 -0800 (PST) Sender: pluknet@gmail.com Received: by 10.27.84.206 with HTTP; Tue, 17 Feb 2015 13:40:36 -0800 (PST) In-Reply-To: <20150217173134.GZ1953@funkthat.com> References: <201502160338.t1G3cRlX042385@svn.freebsd.org> <20150217173134.GZ1953@funkthat.com> Date: Wed, 18 Feb 2015 01:40:36 +0400 X-Google-Sender-Auth: Lxx7oFzDdsK_0Tb35ydqTKdNTNo Message-ID: Subject: Re: svn commit: r278831 - head/sys/netpfil/pf From: Sergey Kandaurov To: John-Mark Gurney Content-Type: multipart/mixed; boundary=f46d043be09ea031b5050f4f8d81 Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, Gleb Smirnoff , src-committers@freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 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: Tue, 17 Feb 2015 21:40:44 -0000 --f46d043be09ea031b5050f4f8d81 Content-Type: text/plain; charset=ISO-8859-1 On 17 February 2015 at 20:31, John-Mark Gurney wrote: > Gleb Smirnoff wrote this message on Mon, Feb 16, 2015 at 03:38 +0000: >> Author: glebius >> Date: Mon Feb 16 03:38:27 2015 >> New Revision: 278831 >> URL: https://svnweb.freebsd.org/changeset/base/278831 >> >> Log: >> Update the pf fragment handling code to closer match recent OpenBSD. >> That partially fixes IPv6 fragment handling. Thanks to Kristof for >> working on that. >> >> Submitted by: Kristof Provost >> Tested by: peter >> Differential Revision: D1765 > > Looks like pf_flush_fragments still called in !INET case, though only > defined for INET case: > /scratch/tmp/jmg/src.head/sys/modules/pf/../../netpfil/pf/pf_norm.c:385:3: error: implicit declaration of function 'pf_flush_fragments' is invalid in C99 [-Werror,-Wimplicit-function-declaration] > pf_flush_fragments(); > > when compiling LINT-NOINET kernel.. With the changes attached I got all three kernels with both cc compiled (tested on MINI w/ MODULES_OVERRIDE=pf). Basically, - pf_flush_fragments is improperly INET-only - pf_find_fragment is properly declared, but its body is under INET - pf_refragment6 / pf_reassemble6 are properly under INET6, which is also under INET (the latter is wrong). - bonus: some functions may be / were static'ized. -- wbr, pluknet --f46d043be09ea031b5050f4f8d81 Content-Type: text/plain; charset=US-ASCII; name="pf.diff" Content-Disposition: attachment; filename="pf.diff" Content-Transfer-Encoding: base64 X-Attachment-Id: f_i69tcyhf0 SW5kZXg6IHN5cy9uZXRwZmlsL3BmL3BmX25vcm0uYwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBzeXMvbmV0cGZp bC9wZi9wZl9ub3JtLmMJKHJldmlzaW9uIDI3ODkxNykKKysrIHN5cy9uZXRwZmlsL3BmL3BmX25v cm0uYwkod29ya2luZyBjb3B5KQpAQCAtMTM4LDE3ICsxMzgsMTcgQEAgc3RhdGljIHZvaWQJcGZf ZnJlZV9mcmFnbWVudChzdHJ1Y3QgcGZfZnJhZ21lbnQgKikKIHN0YXRpYyB2b2lkCXBmX3JlbW92 ZV9mcmFnbWVudChzdHJ1Y3QgcGZfZnJhZ21lbnQgKik7CiBzdGF0aWMgaW50CXBmX25vcm1hbGl6 ZV90Y3BvcHQoc3RydWN0IHBmX3J1bGUgKiwgc3RydWN0IG1idWYgKiwKIAkJICAgIHN0cnVjdCB0 Y3BoZHIgKiwgaW50LCBzYV9mYW1pbHlfdCk7Ci1zdHJ1Y3QgcGZfZnJlbnQJKnBmX2NyZWF0ZV9m cmFnbWVudCh1X3Nob3J0ICopOworc3RhdGljIHN0cnVjdCBwZl9mcmVudAkqcGZfY3JlYXRlX2Zy YWdtZW50KHVfc2hvcnQgKik7CiBzdGF0aWMgc3RydWN0IHBmX2ZyYWdtZW50ICoKIAkJcGZfZmlu ZF9mcmFnbWVudChzdHJ1Y3QgcGZfZnJhZ21lbnRfY21wICprZXksCiAJCSAgICBzdHJ1Y3QgcGZf ZnJhZ190cmVlICp0cmVlKTsKIHN0YXRpYyBzdHJ1Y3QgcGZfZnJhZ21lbnQgKgogCQlwZl9maWxs dXBfZnJhZ21lbnQoc3RydWN0IHBmX2ZyYWdtZW50X2NtcCAqLCBzdHJ1Y3QgcGZfZnJlbnQgKiwJ CQkgICAgdV9zaG9ydCAqKTsKIHN0YXRpYyBpbnQJcGZfaXNmdWxsX2ZyYWdtZW50KHN0cnVjdCBw Zl9mcmFnbWVudCAqKTsKLXN0cnVjdCBtYnVmCSpwZl9qb2luX2ZyYWdtZW50KHN0cnVjdCBwZl9m cmFnbWVudCAqKTsKK3N0YXRpYyBzdHJ1Y3QgbWJ1ZgkqcGZfam9pbl9mcmFnbWVudChzdHJ1Y3Qg cGZfZnJhZ21lbnQgKik7CitzdGF0aWMgdm9pZAlwZl9mbHVzaF9mcmFnbWVudHModm9pZCk7CiAj aWZkZWYgSU5FVAogc3RhdGljIHZvaWQJcGZfc2NydWJfaXAoc3RydWN0IG1idWYgKiosIHVpbnQz Ml90LCB1aW50OF90LCB1aW50OF90KTsKLXN0YXRpYyB2b2lkCXBmX2ZsdXNoX2ZyYWdtZW50cyh2 b2lkKTsKIHN0YXRpYyBpbnQJcGZfcmVhc3NlbWJsZShzdHJ1Y3QgbWJ1ZiAqKiwgc3RydWN0IGlw ICosIGludCwgdV9zaG9ydCAqKTsKIHN0YXRpYyBzdHJ1Y3QgbWJ1ZiAqCiAJCXBmX2ZyYWdjYWNo ZShzdHJ1Y3QgbWJ1ZiAqKiwgc3RydWN0IGlwKiwgc3RydWN0IHBmX2ZyYWdtZW50ICoqLApAQCAt MjY3LDcgKzI2Nyw2IEBAIHBmX3B1cmdlX2V4cGlyZWRfZnJhZ21lbnRzKHZvaWQpCiAJUEZfRlJB R19VTkxPQ0soKTsKIH0KIAotI2lmZGVmIElORVQKIC8qCiAgKiBUcnkgdG8gZmx1c2ggb2xkIGZy YWdtZW50cyB0byBtYWtlIHNwYWNlIGZvciBuZXcgb25lcwogICovCkBAIC0yOTIsNyArMjkxLDYg QEAgcGZfZmx1c2hfZnJhZ21lbnRzKHZvaWQpCiAJCQlicmVhazsKIAl9CiB9Ci0jZW5kaWYgLyog SU5FVCAqLwogCiAvKiBGcmVlcyB0aGUgZnJhZ21lbnRzIGFuZCBhbGwgYXNzb2NpYXRlZCBlbnRy aWVzICovCiBzdGF0aWMgdm9pZApAQCAtMzI5LDcgKzMyNyw2IEBAIHBmX2ZyZWVfZnJhZ21lbnQo c3RydWN0IHBmX2ZyYWdtZW50ICpmcmFnKQogCXBmX3JlbW92ZV9mcmFnbWVudChmcmFnKTsKIH0K IAotI2lmZGVmIElORVQKIHN0YXRpYyBzdHJ1Y3QgcGZfZnJhZ21lbnQgKgogcGZfZmluZF9mcmFn bWVudChzdHJ1Y3QgcGZfZnJhZ21lbnRfY21wICprZXksIHN0cnVjdCBwZl9mcmFnX3RyZWUgKnRy ZWUpCiB7CkBAIC0zNTIsMTAgKzM0OSw4IEBAIHBmX2ZpbmRfZnJhZ21lbnQoc3RydWN0IHBmX2Zy YWdtZW50X2NtcCAqa2V5LCBzdHJ1CiAKIAlyZXR1cm4gKGZyYWcpOwogfQotI2VuZGlmIC8qIElO RVQgKi8KIAogLyogUmVtb3ZlcyBhIGZyYWdtZW50IGZyb20gdGhlIGZyYWdtZW50IHF1ZXVlIGFu ZCBmcmVlcyB0aGUgZnJhZ21lbnQgKi8KLQogc3RhdGljIHZvaWQKIHBmX3JlbW92ZV9mcmFnbWVu dChzdHJ1Y3QgcGZfZnJhZ21lbnQgKmZyYWcpCiB7CkBAIC0zNzMsNyArMzY4LDcgQEAgcGZfcmVt b3ZlX2ZyYWdtZW50KHN0cnVjdCBwZl9mcmFnbWVudCAqZnJhZykKIAl9CiB9CiAKLXN0cnVjdCBw Zl9mcmVudCAqCitzdGF0aWMgc3RydWN0IHBmX2ZyZW50ICoKIHBmX2NyZWF0ZV9mcmFnbWVudCh1 X3Nob3J0ICpyZWFzb24pCiB7CiAJc3RydWN0IHBmX2ZyZW50ICpmcmVudDsKQEAgLTM5Myw3ICsz ODgsNyBAQCBwZl9jcmVhdGVfZnJhZ21lbnQodV9zaG9ydCAqcmVhc29uKQogCXJldHVybiAoZnJl bnQpOwogfQogCi1zdHJ1Y3QgcGZfZnJhZ21lbnQgKgorc3RhdGljIHN0cnVjdCBwZl9mcmFnbWVu dCAqCiBwZl9maWxsdXBfZnJhZ21lbnQoc3RydWN0IHBmX2ZyYWdtZW50X2NtcCAqa2V5LCBzdHJ1 Y3QgcGZfZnJlbnQgKmZyZW50LAogCQl1X3Nob3J0ICpyZWFzb24pCiB7CkBAIC01NzAsNyArNTY1 LDcgQEAgcGZfaXNmdWxsX2ZyYWdtZW50KHN0cnVjdCBwZl9mcmFnbWVudCAqZnJhZykKIAlyZXR1 cm4gKDEpOwogfQogCi1zdHJ1Y3QgbWJ1ZiAqCitzdGF0aWMgc3RydWN0IG1idWYgKgogcGZfam9p bl9mcmFnbWVudChzdHJ1Y3QgcGZfZnJhZ21lbnQgKmZyYWcpCiB7CiAJc3RydWN0IG1idWYgKm0s ICptMjsKQEAgLTY2Niw2ICs2NjEsNyBAQCBwZl9yZWFzc2VtYmxlKHN0cnVjdCBtYnVmICoqbTAs IHN0cnVjdCBpcCAqaXAsIGludAogCURQRlBSSU5URigoImNvbXBsZXRlOiAlcCglZClcbiIsIG0s IG50b2hzKGlwLT5pcF9sZW4pKSk7CiAJcmV0dXJuIChQRl9QQVNTKTsKIH0KKyNlbmRpZgkvKiBJ TkVUICovCiAKICNpZmRlZiBJTkVUNgogc3RhdGljIGludApAQCAtNzg5LDYgKzc4NSw3IEBAIGZh aWw6CiB9CiAjZW5kaWYJLyogSU5FVDYgKi8KIAorI2lmZGVmIElORVQKIHN0YXRpYyBzdHJ1Y3Qg bWJ1ZiAqCiBwZl9mcmFnY2FjaGUoc3RydWN0IG1idWYgKiptMCwgc3RydWN0IGlwICpoLCBzdHJ1 Y3QgcGZfZnJhZ21lbnQgKipmcmFnLCBpbnQgbWZmLAogICAgIGludCBkcm9wLCBpbnQgKm5vbWVt KQpAQCAtMTA5MCw2ICsxMDg3LDcgQEAgcGZfZnJhZ2NhY2hlKHN0cnVjdCBtYnVmICoqbTAsIHN0 cnVjdCBpcCAqaCwgc3RydWMKIAltX2ZyZWVtKG0pOwogCXJldHVybiAoTlVMTCk7CiB9CisjZW5k aWYJLyogSU5FVCAqLwogCiAjaWZkZWYgSU5FVDYKIGludApAQCAtMTE2Miw2ICsxMTYwLDcgQEAg cGZfcmVmcmFnbWVudDYoc3RydWN0IGlmbmV0ICppZnAsIHN0cnVjdCBtYnVmICoqbTAKIH0KICNl bmRpZiAvKiBJTkVUNiAqLwogCisjaWZkZWYgSU5FVAogaW50CiBwZl9ub3JtYWxpemVfaXAoc3Ry dWN0IG1idWYgKiptMCwgaW50IGRpciwgc3RydWN0IHBmaV9raWYgKmtpZiwgdV9zaG9ydCAqcmVh c29uLAogICAgIHN0cnVjdCBwZl9wZGVzYyAqcGQpCg== --f46d043be09ea031b5050f4f8d81--