Date: Sat, 21 Jan 2017 08:12:45 +0000 From: "ale (Alex Dupre)" <phabric-noreply@FreeBSD.org> To: freebsd-net@freebsd.org Subject: [Differential] D9270: Add support for user-supplied Host-Uniq tag in Netgraph PPPoE Message-ID: <differential-rev-PHID-DREV-zs5j6sjj2bwywywa3p22-req@FreeBSD.org>
next in thread | raw e-mail | index | archive | help
--b1_ef54bcc72775c6f9b6c4c9e9af2c7489 Content-Type: text/plain; charset = "utf-8" Content-Transfer-Encoding: base64 YWxlIGNyZWF0ZWQgdGhpcyByZXZpc2lvbi4KYWxlIGFkZGVkIHJldmlld2VyczogbmV0d29yaywg anVsaWFuLgphbGUgYWRkZWQgc3Vic2NyaWJlcnM6IGZyZWVic2QtbmV0LWxpc3QsIG1hbmRyZWUu CmFsZSBzZXQgdGhlIHJlcG9zaXRvcnkgZm9yIHRoaXMgcmV2aXNpb24gdG8gclMgRnJlZUJTRCBz cmMgcmVwb3NpdG9yeS4KSGVyYWxkIGFkZGVkIGEgc3Vic2NyaWJlcjogaW1wLgpIZXJhbGQgYWRk ZWQgYSByZXZpZXdlcjogbWFucGFnZXMuCgpSRVZJU0lPTiBTVU1NQVJZCiAgQWRkIHN1cHBvcnQg Zm9yIHVzZXItc3VwcGxpZWQgSG9zdC1VbmlxIHRhZyBpbiBOZXRncmFwaCBQUFBvRS4KICBBIGZl dyBJU1AgZmlsdGVyIFBBREkgcmVxdWVzdHMgYmFzZWQgb24gc3VjaCB0YWcsIHRvIGZvcmNlIHRo ZSB1c2Ugb2YgdGhlaXIgb3duIHJvdXRlcnMuCiAgVGhlIGN1c3RvbSBIb3N0LVVuaXEgdGFnIGlz IHBhc3NlZCBpbiB0aGUgTkdNX1BQUE9FX0NPTk5FQ1QgY29udHJvbCBtZXNzYWdlLCBzbyBpdCBj YW4gYmUgdXNlZCB3aXRoIEZyZWVCU0QgcHBwKDgpIHdpdGhvdXQgYW55IG90aGVyIGNoYW5nZS4K ClRFU1QgUExBTgogIEkndmUgdGVzdGVkIHRoZSB0aHJlZSBwb3NzaWJsZSBIb3N0LVVuaXEgdGFn cyAoYXV0by1nZW5lcmF0ZWQgYXMgYmVmb3JlLCBsb25nIHBsYWluIHN0cmluZyBhbmQgbG9uZyBi aW5hcnkgc3RyaW5nKSB3aXRoIG15IG93biBJU1AgY29ubmVjdGlvbi4KClJFUE9TSVRPUlkKICBy UyBGcmVlQlNEIHNyYyByZXBvc2l0b3J5CgpSRVZJU0lPTiBERVRBSUwKICBodHRwczovL3Jldmll d3MuZnJlZWJzZC5vcmcvRDkyNzAKCkFGRkVDVEVEIEZJTEVTCiAgc2hhcmUvbWFuL21hbjQvbmdf cHBwb2UuNAogIHN5cy9uZXRncmFwaC9uZ19wcHBvZS5jCgpFTUFJTCBQUkVGRVJFTkNFUwogIGh0 dHBzOi8vcmV2aWV3cy5mcmVlYnNkLm9yZy9zZXR0aW5ncy9wYW5lbC9lbWFpbHByZWZlcmVuY2Vz LwoKVG86IGFsZSwgI25ldHdvcmssICNtYW5wYWdlcywganVsaWFuCkNjOiBtYW5kcmVlLCBpbXAs IGZyZWVic2QtbmV0LWxpc3QK --b1_ef54bcc72775c6f9b6c4c9e9af2c7489 Content-Type: text/x-patch; charset=utf-8; name="D9270.24264.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="D9270.24264.patch" ZGlmZiAtLWdpdCBhL3N5cy9uZXRncmFwaC9uZ19wcHBvZS5jIGIvc3lzL25ldGdyYXBoL25nX3Bw cG9lLmMKLS0tIGEvc3lzL25ldGdyYXBoL25nX3BwcG9lLmMKKysrIGIvc3lzL25ldGdyYXBoL25n X3BwcG9lLmMKQEAgLTIyNiw5ICsyMjYsMTEgQEAKIAljb25zdCBzdHJ1Y3QgcHBwb2VfdGFnCSp0 YWdzW05VTVRBR1NdOwogCXVfaW50CQkJc2VydmljZV9sZW47CiAJdV9pbnQJCQlhY19uYW1lX2xl bjsKKwl1X2ludAkJCWhvc3RfdW5pcV9sZW47CiAKIAlzdHJ1Y3QgZGF0YXRhZwkJc2VydmljZTsK IAlzdHJ1Y3QgZGF0YXRhZwkJYWNfbmFtZTsKKwlzdHJ1Y3QgZGF0YXRhZwkJaG9zdF91bmlxOwog fTsKIHR5cGVkZWYgc3RydWN0IHNlc3NfbmVnICpuZWdwOwogCkBAIC01ODksMTggKzU5MSwyMCBA QAogcHBwb2VfZmluZHVuaXEobm9kZV9wIG5vZGUsIGNvbnN0IHN0cnVjdCBwcHBvZV90YWcgKnRh ZykKIHsKIAlob29rX3AJaG9vayA9IE5VTEw7Ci0JdW5pb24gdW5pcSB1bmlxOworCXNlc3NwCXNw OwogCi0JYmNvcHkodGFnICsgMSwgdW5pcS5ieXRlcywgc2l6ZW9mKHZvaWQgKikpOwogCS8qIEN5 Y2xlIHRocm91Z2ggYWxsIGtub3duIGhvb2tzLiAqLwogCUxJU1RfRk9SRUFDSChob29rLCAmbm9k ZS0+bmRfaG9va3MsIGhrX2hvb2tzKSB7CiAJCS8qIFNraXAgYW55IG5vbnNlc3Npb24gaG9vay4g Ki8KIAkJaWYgKE5HX0hPT0tfUFJJVkFURShob29rKSA9PSBOVUxMKQogCQkJY29udGludWU7Ci0J CWlmICh1bmlxLnBvaW50ZXIgPT0gTkdfSE9PS19QUklWQVRFKGhvb2spKQorCQlzcCA9IE5HX0hP T0tfUFJJVkFURShob29rKTsKKwkJaWYgKHNwLT5uZWctPmhvc3RfdW5pcV9sZW4gPT0gbnRvaHMo dGFnLT50YWdfbGVuKSAmJgorCQkgICAgYmNtcChzcC0+bmVnLT5ob3N0X3VuaXEuZGF0YSwgKGNv bnN0IGNoYXIgKikodGFnICsgMSksCisJCSAgICAgc3AtPm5lZy0+aG9zdF91bmlxX2xlbikgPT0g MCkKIAkJCWJyZWFrOwogCX0KLQlDVFIzKEtUUl9ORVQsICIlMjBzOiBtYXRjaGVkICVwIGZvciAl cCIsIF9fZnVuY19fLCBob29rLCB1bmlxLnBvaW50ZXIpOworCUNUUjMoS1RSX05FVCwgIiUyMHM6 IG1hdGNoZWQgJXAgZm9yICVwIiwgX19mdW5jX18sIGhvb2ssIHNwKTsKIAogCXJldHVybiAoaG9v ayk7CiB9CkBAIC04NTMsMjMgKzg1Nyw2NyBAQAogCQkJICogU2V0IHVwIHRoZSBzZXNzaW9uIHRv IHRoZSBjb3JyZWN0IHN0YXRlIGFuZAogCQkJICogc3RhcnQgaXQuCiAJCQkgKi8KLQkJCWludAlp LCBhY25sZW4gPSAwLCBhY25zZXAgPSAwLCBzcnZsZW47CisJCQlpbnQJYWNucG9zLCBhY25sZW4g PSAwLCBhY25zZXAgPSAwOworCQkJaW50CWh1cG9zLCBodWxlbiA9IDAsIGh1c2VwID0gMDsKKwkJ CWludAlpLCBzcnZwb3MsIHNydmxlbjsKKwkJCWFjbnBvcyA9IDA7CiAJCQlmb3IgKGkgPSAwOyBp IDwgb3VybXNnLT5kYXRhX2xlbjsgaSsrKSB7CiAJCQkJaWYgKG91cm1zZy0+ZGF0YVtpXSA9PSAn XFwnKSB7CiAJCQkJCWFjbmxlbiA9IGk7CiAJCQkJCWFjbnNlcCA9IDE7CiAJCQkJCWJyZWFrOwog CQkJCX0KIAkJCX0KLQkJCXNydmxlbiA9IG91cm1zZy0+ZGF0YV9sZW4gLSBhY25sZW4gLSBhY25z ZXA7CisJCQlodXBvcyA9IGFjbmxlbiArIGFjbnNlcDsKKwkJCWZvciAoaSA9IGh1cG9zOyBpIDwg b3VybXNnLT5kYXRhX2xlbjsgaSsrKSB7CisJCQkJaWYgKG91cm1zZy0+ZGF0YVtpXSA9PSAnfCcp IHsKKwkJCQkJaHVsZW4gPSBpIC0gaHVwb3M7CisJCQkJCWh1c2VwID0gMTsKKwkJCQkJYnJlYWs7 CisJCQkJfQorCQkJfQorCQkJc3J2cG9zID0gaHVwb3MgKyBodWxlbiArIGh1c2VwOworCQkJc3J2 bGVuID0gb3VybXNnLT5kYXRhX2xlbiAtIHNydnBvczsKIAotCQkJYmNvcHkob3VybXNnLT5kYXRh LCBuZWctPmFjX25hbWUuZGF0YSwgYWNubGVuKTsKKwkJCWJjb3B5KG91cm1zZy0+ZGF0YSArIGFj bnBvcywgbmVnLT5hY19uYW1lLmRhdGEsIGFjbmxlbik7CiAJCQluZWctPmFjX25hbWVfbGVuID0g YWNubGVuOwogCisJCQluZWctPmhvc3RfdW5pcS5oZHIudGFnX3R5cGUgPSBQVFRfSE9TVF9VTklR OworCQkJaWYgKGh1bGVuID09IDApIHsKKwkJCQkvKiBOb3QgcHJvdmlkZWQsIGdlbmVyYXRlIG9u ZSAqLworCQkJCW5lZy0+aG9zdF91bmlxLmhkci50YWdfbGVuID0gaHRvbnMoc2l6ZW9mKHNwKSk7 CisJCQkJYmNvcHkoJnNwLCBuZWctPmhvc3RfdW5pcS5kYXRhLCBzaXplb2Yoc3ApKTsKKwkJCQlu ZWctPmhvc3RfdW5pcV9sZW4gPSBzaXplb2Yoc3ApOworCQkJfSBlbHNlIGlmIChodWxlbiA+IDIg JiYgb3VybXNnLT5kYXRhW2h1cG9zXSA9PSAnMCcgJiYKKwkJCSAgb3VybXNnLT5kYXRhW2h1cG9z ICsgMV0gPT0gJ3gnICYmIGh1bGVuICUgMiA9PSAwKSB7CisJCQkJLyogSGV4IGVuY29kZWQgKi8K KwkJCQlzdGF0aWMgY29uc3QgY2hhciBoZXhkaWdbMTZdID0gIjAxMjM0NTY3ODlhYmNkZWYiOwor CQkJCWludCBqOworCisJCQkJbmVnLT5ob3N0X3VuaXEuaGRyLnRhZ19sZW4gPSBodG9ucygodWlu dDE2X3QpKGh1bGVuIC8gMiAtIDEpKTsKKwkJCQlmb3IgKGkgPSAwOyBpIDwgaHVsZW4gLSAyOyBp KyspIHsKKwkJCQkJZm9yIChqID0gMDsKKwkJCQkJICAgICBqIDwgMTYgJiYKKwkJCQkJICAgICBv dXJtc2ctPmRhdGFbaHVwb3MgKyAyICsgaV0gIT0gaGV4ZGlnW2pdOworCQkJCQkgICAgIGorKyk7 CisJCQkJCWlmIChqID09IDE2KQorCQkJCQkJTEVBVkUoRUlOVkFMKTsKKwkJCQkJaWYgKGkgJSAy ID09IDApCisJCQkJCQluZWctPmhvc3RfdW5pcS5kYXRhW2kgLyAyXSA9IGogPDwgNDsKKwkJCQkJ ZWxzZQorCQkJCQkJbmVnLT5ob3N0X3VuaXEuZGF0YVtpIC8gMl0gfD0gajsKKwkJCQl9CisJCQkJ bmVnLT5ob3N0X3VuaXFfbGVuID0gaHVsZW4gLyAyIC0gMTsKKwkJCX0gZWxzZSB7CisJCQkJLyog UGxhaW4gc3RyaW5nICovCisJCQkJbmVnLT5ob3N0X3VuaXEuaGRyLnRhZ19sZW4gPSBodG9ucygo dWludDE2X3QpaHVsZW4pOworCQkJCWJjb3B5KG91cm1zZy0+ZGF0YSArIGh1cG9zLCBuZWctPmhv c3RfdW5pcS5kYXRhLCBodWxlbik7CisJCQkJbmVnLT5ob3N0X3VuaXFfbGVuID0gaHVsZW47CisJ CQl9CisKIAkJCW5lZy0+c2VydmljZS5oZHIudGFnX3R5cGUgPSBQVFRfU1JWX05BTUU7CiAJCQlu ZWctPnNlcnZpY2UuaGRyLnRhZ19sZW4gPSBodG9ucygodWludDE2X3Qpc3J2bGVuKTsKLQkJCWJj b3B5KG91cm1zZy0+ZGF0YSArIGFjbmxlbiArIGFjbnNlcCwKLQkJCSAgICBuZWctPnNlcnZpY2Uu ZGF0YSwgc3J2bGVuKTsKKwkJCWJjb3B5KG91cm1zZy0+ZGF0YSArIHNydnBvcywgbmVnLT5zZXJ2 aWNlLmRhdGEsIHNydmxlbik7CiAJCQluZWctPnNlcnZpY2VfbGVuID0gc3J2bGVuOwogCQkJcHBw b2Vfc3RhcnQoc3ApOwogCQkJYnJlYWs7CkBAIC0xMDYxLDEwICsxMTA5LDYgQEAKIAlub2RlX3AJ bm9kZSA9IE5HX0hPT0tfTk9ERShob29rKTsKIAlwcml2X3AJcHJpdnAgPSBOR19OT0RFX1BSSVZB VEUobm9kZSk7CiAJbmVncAluZWcgPSBzcC0+bmVnOwotCXN0cnVjdCB7Ci0JCXN0cnVjdCBwcHBv ZV90YWcgaGRyOwotCQl1bmlvbgl1bmlxCWRhdGE7Ci0JfSBfX3BhY2tlZCB1bmlxdGFnOwogCXN0 cnVjdCAgbWJ1ZiAqbTA7CiAJaW50CWVycm9yOwogCkBAIC0xMDgwLDExICsxMTI0LDggQEAKIAlt ZW1jcHkoKHZvaWQgKikmbmVnLT5wa3QtPnBrdF9oZWFkZXIuZWgsICZwcml2cC0+ZWgsCiAJICAg IHNpemVvZihzdHJ1Y3QgZXRoZXJfaGVhZGVyKSk7CiAJbmVnLT5wa3QtPnBrdF9oZWFkZXIucGgu Y29kZSA9IFBBRElfQ09ERTsKLQl1bmlxdGFnLmhkci50YWdfdHlwZSA9IFBUVF9IT1NUX1VOSVE7 Ci0JdW5pcXRhZy5oZHIudGFnX2xlbiA9IGh0b25zKCh1X2ludDE2X3Qpc2l6ZW9mKHVuaXF0YWcu ZGF0YSkpOwotCXVuaXF0YWcuZGF0YS5wb2ludGVyID0gc3A7CiAJaW5pdF90YWdzKHNwKTsKLQlp bnNlcnRfdGFnKHNwLCAmdW5pcXRhZy5oZHIpOworCWluc2VydF90YWcoc3AsICZuZWctPmhvc3Rf dW5pcS5oZHIpOwogCWluc2VydF90YWcoc3AsICZuZWctPnNlcnZpY2UuaGRyKTsKIAlpZiAocHJp dnAtPm1heF9wYXlsb2FkLmRhdGEgIT0gMCkKIAkJaW5zZXJ0X3RhZyhzcCwgJnByaXZwLT5tYXhf cGF5bG9hZC5oZHIpOwpAQCAtMTQzOCw4ICsxNDc5LDcgQEAKIAkJCSAqIEZvciBub3cgc2ltcGx5 IGFjY2VwdCB0aGUgZmlyc3Qgd2UgcmVjZWl2ZS4KIAkJCSAqLwogCQkJdXRhZyA9IGdldF90YWco cGgsIFBUVF9IT1NUX1VOSVEpOwotCQkJaWYgKCh1dGFnID09IE5VTEwpIHx8Ci0JCQkgICAgKG50 b2hzKHV0YWctPnRhZ19sZW4pICE9IHNpemVvZihzcCkpKSB7CisJCQlpZiAodXRhZyA9PSBOVUxM KSB7CiAJCQkJbG9nKExPR19OT1RJQ0UsICJuZ19wcHBvZVsleF06IG5vIGhvc3QgIgogCQkJCSAg ICAidW5pcXVlIGZpZWxkXG4iLCBub2RlLT5uZF9JRCk7CiAJCQkJTEVBVkUoRU5FVFVOUkVBQ0gp OwpAQCAtMTYwNSw4ICsxNjQ1LDcgQEAKIAkJCSAqIHNldCB1cyBpbnRvIFNlc3Npb24gbW9kZS4K IAkJCSAqLwogCQkJdXRhZyA9IGdldF90YWcocGgsIFBUVF9IT1NUX1VOSVEpOwotCQkJaWYgKCh1 dGFnID09IE5VTEwpIHx8Ci0JCQkgICAgKG50b2hzKHV0YWctPnRhZ19sZW4pICE9IHNpemVvZihz cCkpKSB7CisJCQlpZiAodXRhZyA9PSBOVUxMKSB7CiAJCQkJTEVBVkUgKEVORVRVTlJFQUNIKTsK IAkJCX0KIAkJCXNlbmRob29rID0gcHBwb2VfZmluZHVuaXEobm9kZSwgdXRhZyk7CmRpZmYgLS1n aXQgYS9zaGFyZS9tYW4vbWFuNC9uZ19wcHBvZS40IGIvc2hhcmUvbWFuL21hbjQvbmdfcHBwb2Uu NAotLS0gYS9zaGFyZS9tYW4vbWFuNC9uZ19wcHBvZS40CisrKyBiL3NoYXJlL21hbi9tYW40L25n X3BwcG9lLjQKQEAgLTM1LDcgKzM1LDcgQEAKIC5cIiAkRnJlZUJTRCQKIC5cIiAkV2hpc3RsZTog bmdfcHBwb2UuOCx2IDEuMSAxOTk5LzAxLzI1IDIzOjQ2OjI3IGFyY2hpZSBFeHAgJAogLlwiCi0u RGQgU2VwdGVtYmVyIDE1LCAyMDE1CisuRGQgSmFudWFyeSAyMCwgMjAxNwogLkR0IE5HX1BQUE9F IDQKIC5PcwogLlNoIE5BTUUKQEAgLTEwNCw4ICsxMDQsMTEgQEAKIEl0IG11c3QgYmUgbmV3bHkg Y3JlYXRlZCBhbmQgYSBzZXJ2aWNlIG5hbWUgY2FuIGJlIGdpdmVuIGFzIGFuIGFyZ3VtZW50Lgog SXQgaXMgbGVnYWwgdG8gc3BlY2lmeSBhIHplcm8tbGVuZ3RoIHNlcnZpY2UgbmFtZSwgdGhpcyBp cyBjb21tb24KIG9uIHNvbWUgRFNMIHNldHVwcy4KLUl0IGlzIHBvc3NpYmxlIHRvIHJlcXVlc3Qg YSBjb25uZWN0aW9uIHRvIGEgc3BlY2lmaWMKLWFjY2VzcyBjb25jZW50cmF0b3IgYnkgaXRzIG5h bWUgdXNpbmcgdGhlICJBQy1OYW1lXFxTZXJ2aWNlLU5hbWUiIHN5bnRheC4KK0l0IGlzIHBvc3Np YmxlIHRvIHJlcXVlc3QgYSBjb25uZWN0aW9uIHRvIGEgc3BlY2lmaWMgYWNjZXNzIGNvbmNlbnRy YXRvciwKK2FuZC9vciBzZXQgYSBzcGVjaWZpYyBob3N0IHVuaXEgdGFnLCByZXF1aXJlZCBieSBz b21lIEludGVybmV0IHByb3ZpZGVycywKK3VzaW5nIHRoZSAiW0FDLU5hbWVcXF1bSG9zdC1Vbmlx fF1TZXJ2aWNlLU5hbWUiIHN5bnRheC4KK1RvIHNldCBhIGJpbmFyeSBIb3N0LVVuaXEsIGl0IG11 c3QgYmUgZW5jb2RlZCBhcyBhIGhleGFkZWNpbWFsIGxvd2VyY2FzZQorc3RyaW5nIGFuZCBwcmVm aXhlZCB3aXRoICIweCIuCiBBIHNlc3Npb24gcmVxdWVzdCBwYWNrZXQgd2lsbCBiZSBicm9hZGNh c3RlZCBvbiB0aGUgRXRoZXJuZXQuCiBUaGlzIGNvbW1hbmQgdXNlcyB0aGUKIC5EdiBuZ3BwcG9l X2luaXRfZGF0YQoK --b1_ef54bcc72775c6f9b6c4c9e9af2c7489--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?differential-rev-PHID-DREV-zs5j6sjj2bwywywa3p22-req>