From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jarno Rajahalme Subject: [PATCH net-next v4 2/8] netfilter: Factor out nf_ct_get_info(). Date: Tue, 8 Dec 2015 17:01:04 -0800 Message-ID: <1449622870-48944-3-git-send-email-jarno@ovn.org> References: <1449622870-48944-1-git-send-email-jarno@ovn.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Cc: dev-yBygre7rU0TnMu66kgdUjQ@public.gmane.org, netfilter-devel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Return-path: In-Reply-To: <1449622870-48944-1-git-send-email-jarno-LZ6Gd1LRuIk@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces-yBygre7rU0TnMu66kgdUjQ@public.gmane.org Sender: "dev" List-Id: netdev.vger.kernel.org RGVmaW5lIGEgbmV3IGlubGluZSBmdW5jdGlvbiB0byBtYXAgY29ubnRyYWNrIHN0YXR1cyB0byBl bnVtCmlwX2Nvbm50cmFja19pbmZvLiAgVGhpcyByZW1vdmVzIHRoZSBuZWVkIHRvIG90aGVyd2lz ZSBkdXBsaWNhdGUgdGhpcwpjb2RlIGluIGEgbGF0ZXIgcGF0Y2ggKCJvcGVudnN3aXRjaDogRmlu ZCBleGlzdGluZyBjb25udHJhY2sgZW50cnkKYWZ0ZXIgdXBjYWxsLiIpLgoKU2lnbmVkLW9mZi1i eTogSmFybm8gUmFqYWhhbG1lIDxqYXJub0Bvdm4ub3JnPgotLS0KIGluY2x1ZGUvbmV0L25ldGZp bHRlci9uZl9jb25udHJhY2suaCB8IDE1ICsrKysrKysrKysrKysrKwogbmV0L25ldGZpbHRlci9u Zl9jb25udHJhY2tfY29yZS5jICAgIHwgMjIgKysrLS0tLS0tLS0tLS0tLS0tLS0tLQogMiBmaWxl cyBjaGFuZ2VkLCAxOCBpbnNlcnRpb25zKCspLCAxOSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQg YS9pbmNsdWRlL25ldC9uZXRmaWx0ZXIvbmZfY29ubnRyYWNrLmggYi9pbmNsdWRlL25ldC9uZXRm aWx0ZXIvbmZfY29ubnRyYWNrLmgKaW5kZXggZmRlNDA2OC4uYjNkZTEwZSAxMDA2NDQKLS0tIGEv aW5jbHVkZS9uZXQvbmV0ZmlsdGVyL25mX2Nvbm50cmFjay5oCisrKyBiL2luY2x1ZGUvbmV0L25l dGZpbHRlci9uZl9jb25udHJhY2suaApAQCAtMTI1LDYgKzEyNSwyMSBAQCBuZl9jdF90dXBsZWhh c2hfdG9fY3RyYWNrKGNvbnN0IHN0cnVjdCBuZl9jb25udHJhY2tfdHVwbGVfaGFzaCAqaGFzaCkK IAkJCSAgICB0dXBsZWhhc2hbaGFzaC0+dHVwbGUuZHN0LmRpcl0pOwogfQogCitzdGF0aWMgaW5s aW5lIGVudW0gaXBfY29ubnRyYWNrX2luZm8KK25mX2N0X2dldF9pbmZvKGNvbnN0IHN0cnVjdCBu Zl9jb25udHJhY2tfdHVwbGVfaGFzaCAqaCkKK3sKKwljb25zdCBzdHJ1Y3QgbmZfY29ubiAqY3Qg PSBuZl9jdF90dXBsZWhhc2hfdG9fY3RyYWNrKGgpOworCisJaWYgKE5GX0NUX0RJUkVDVElPTiho KSA9PSBJUF9DVF9ESVJfUkVQTFkpCisJCXJldHVybiBJUF9DVF9FU1RBQkxJU0hFRF9SRVBMWTsK KwkvKiBPbmNlIHdlJ3ZlIGhhZCB0d28gd2F5IGNvbW1zLCBhbHdheXMgRVNUQUJMSVNIRUQuICov CisJaWYgKHRlc3RfYml0KElQU19TRUVOX1JFUExZX0JJVCwgJmN0LT5zdGF0dXMpKQorCQlyZXR1 cm4gSVBfQ1RfRVNUQUJMSVNIRUQ7CisJaWYgKHRlc3RfYml0KElQU19FWFBFQ1RFRF9CSVQsICZj dC0+c3RhdHVzKSkKKwkJcmV0dXJuIElQX0NUX1JFTEFURUQ7CisJcmV0dXJuIElQX0NUX05FVzsK K30KKwogc3RhdGljIGlubGluZSB1X2ludDE2X3QgbmZfY3RfbDNudW0oY29uc3Qgc3RydWN0IG5m X2Nvbm4gKmN0KQogewogCXJldHVybiBjdC0+dHVwbGVoYXNoW0lQX0NUX0RJUl9PUklHSU5BTF0u dHVwbGUuc3JjLmwzbnVtOwpkaWZmIC0tZ2l0IGEvbmV0L25ldGZpbHRlci9uZl9jb25udHJhY2tf Y29yZS5jIGIvbmV0L25ldGZpbHRlci9uZl9jb25udHJhY2tfY29yZS5jCmluZGV4IDNjYjNjYjgu LjcwZGRiZDggMTAwNjQ0Ci0tLSBhL25ldC9uZXRmaWx0ZXIvbmZfY29ubnRyYWNrX2NvcmUuYwor KysgYi9uZXQvbmV0ZmlsdGVyL25mX2Nvbm50cmFja19jb3JlLmMKQEAgLTEwNTYsMjUgKzEwNTYs OSBAQCByZXNvbHZlX25vcm1hbF9jdChzdHJ1Y3QgbmV0ICpuZXQsIHN0cnVjdCBuZl9jb25uICp0 bXBsLAogCWN0ID0gbmZfY3RfdHVwbGVoYXNoX3RvX2N0cmFjayhoKTsKIAogCS8qIEl0IGV4aXN0 czsgd2UgaGF2ZSAobm9uLWV4Y2x1c2l2ZSkgcmVmZXJlbmNlLiAqLwotCWlmIChORl9DVF9ESVJF Q1RJT04oaCkgPT0gSVBfQ1RfRElSX1JFUExZKSB7Ci0JCSpjdGluZm8gPSBJUF9DVF9FU1RBQkxJ U0hFRF9SRVBMWTsKLQkJLyogUGxlYXNlIHNldCByZXBseSBiaXQgaWYgdGhpcyBwYWNrZXQgT0sg Ki8KLQkJKnNldF9yZXBseSA9IDE7Ci0JfSBlbHNlIHsKLQkJLyogT25jZSB3ZSd2ZSBoYWQgdHdv IHdheSBjb21tcywgYWx3YXlzIEVTVEFCTElTSEVELiAqLwotCQlpZiAodGVzdF9iaXQoSVBTX1NF RU5fUkVQTFlfQklULCAmY3QtPnN0YXR1cykpIHsKLQkJCXByX2RlYnVnKCJuZl9jb25udHJhY2tf aW46IG5vcm1hbCBwYWNrZXQgZm9yICVwXG4iLCBjdCk7Ci0JCQkqY3RpbmZvID0gSVBfQ1RfRVNU QUJMSVNIRUQ7Ci0JCX0gZWxzZSBpZiAodGVzdF9iaXQoSVBTX0VYUEVDVEVEX0JJVCwgJmN0LT5z dGF0dXMpKSB7Ci0JCQlwcl9kZWJ1ZygibmZfY29ubnRyYWNrX2luOiByZWxhdGVkIHBhY2tldCBm b3IgJXBcbiIsCi0JCQkJIGN0KTsKLQkJCSpjdGluZm8gPSBJUF9DVF9SRUxBVEVEOwotCQl9IGVs c2UgewotCQkJcHJfZGVidWcoIm5mX2Nvbm50cmFja19pbjogbmV3IHBhY2tldCBmb3IgJXBcbiIs IGN0KTsKLQkJCSpjdGluZm8gPSBJUF9DVF9ORVc7Ci0JCX0KLQkJKnNldF9yZXBseSA9IDA7Ci0J fQorCSpjdGluZm8gPSBuZl9jdF9nZXRfaW5mbyhoKTsKKwkqc2V0X3JlcGx5ID0gTkZfQ1RfRElS RUNUSU9OKGgpID09IElQX0NUX0RJUl9SRVBMWTsKKwogCXNrYi0+bmZjdCA9ICZjdC0+Y3RfZ2Vu ZXJhbDsKIAlza2ItPm5mY3RpbmZvID0gKmN0aW5mbzsKIAlyZXR1cm4gY3Q7Ci0tIAoyLjEuNAoK X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZGV2IG1haWxp bmcgbGlzdApkZXZAb3BlbnZzd2l0Y2gub3JnCmh0dHA6Ly9vcGVudnN3aXRjaC5vcmcvbWFpbG1h bi9saXN0aW5mby9kZXYK