Re: [PATCH] sbin/ip6fw bring in -n option
------=_Part_229_21713823.1114258620466
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline
Sorry, this is the correct version
--=20
Live Free or Die
------=_Part_229_21713823.1114258620466
Content-Type: text/plain; name="patch-ip6fw.c.txt"
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="patch-ip6fw.c.txt"
LS0tIGlwNmZ3LmMJMjAwNS0wNC0yNCAwMjowNTo0Ni4wMDAwMDAwMDAgKzA4MDAKKysrIGlwNmZ3
LmMJMjAwNS0wNC0yNCAwNDowNDoxMy4wMDAwMDAwMDAgKzA4MDAKQEAgLTg5LDYgKzg5LDcgQEAK
IGludAkJZG9fdGltZT0wOwkJCS8qIFNob3cgdGltZSBzdGFtcHMgICAgICAgICovCiBpbnQJCWRv
X3F1aWV0PTA7CQkJLyogQmUgcXVpZXQgaW4gYWRkIGFuZCBmbHVzaCAgKi8KIGludAkJZG9fZm9y
Y2U9MDsJCQkvKiBEb24ndCBhc2sgZm9yIGNvbmZpcm1hdGlvbiAqLworaW50CQlkb190ZXN0PTA7
CQkJLyogRG9uJ3QgbG9hZCBpbnRvIEtlcm5lbCAqLwogCiBzdHJ1Y3QgaWNtcGNvZGUgewogCWlu
dAkJIGNvZGU7CkBAIC03NzgsMTAgKzc3OSwxMyBAQAogCS8qIFJ1bGUgbnVtYmVyICovCiAJd2hp
bGUgKGFjICYmIGlzZGlnaXQoKiphdikpIHsKIAkJcnVsZS5md19udW1iZXIgPSBhdG9pKCphdik7
IGF2Kys7IGFjLS07Ci0JCWlmIChzZXRzb2Nrb3B0KHMsIElQUFJPVE9fSVBWNiwgSVBWNl9GV19E
RUwsCi0JCQkgICAgICAgJnJ1bGUsIHNpemVvZihydWxlKSkgPCAwKSB7Ci0JCQlleGl0dmFsID0g
MTsKLQkJCXdhcm4oInJ1bGUgJXU6IHNldHNvY2tvcHQoSVBWNl9GV19ERUwpIiwgcnVsZS5md19u
dW1iZXIpOworCQlpZiAoIWRvX3Rlc3QpIHsKKwkJCWlmIChzZXRzb2Nrb3B0KHMsIElQUFJPVE9f
SVBWNiwgSVBWNl9GV19ERUwsCisJCQkJICAgICAgICZydWxlLCBzaXplb2YocnVsZSkpIDwgMCkg
eworCQkJCWV4aXR2YWwgPSAxOworCQkJCXdhcm4oInJ1bGUgJXU6IHNldHNvY2tvcHQoSVBWNl9G
V19ERUwpIiwKKwkJCQkgICAgIHJ1bGUuZndfbnVtYmVyKTsKKwkJCX0KIAkJfQogCX0KIAlpZiAo
ZXhpdHZhbCAhPSAwKQpAQCAtMTExMSw4ICsxMTE1LDExIEBACiAKIAlpZiAoIWRvX3F1aWV0KQog
CQlzaG93X2lwNmZ3KCZydWxlKTsKLQlpZiAoc2V0c29ja29wdChzLCBJUFBST1RPX0lQVjYsIElQ
VjZfRldfQURELCAmcnVsZSwgc2l6ZW9mIHJ1bGUpIDwgMCkKLQkJZXJyKEVYX1VOQVZBSUxBQkxF
LCAic2V0c29ja29wdChJUFY2X0ZXX0FERCkiKTsKKwlpZiAoIWRvX3Rlc3QpIHsKKwkJaWYgKHNl
dHNvY2tvcHQocywgSVBQUk9UT19JUFY2LCBJUFY2X0ZXX0FERCwKKwkJCSAgICAgICAmcnVsZSwg
c2l6ZW9mIHJ1bGUpIDwgMCkKKwkJCWVycihFWF9VTkFWQUlMQUJMRSwgInNldHNvY2tvcHQoSVBW
Nl9GV19BREQpIik7CisJfQogfQogCiBzdGF0aWMgdm9pZApAQCAtMTEyMiwxMCArMTEyOSwxNCBA
QAogCiAJaWYgKCFhYykgewogCQkvKiBjbGVhciBhbGwgZW50cmllcyAqLwotCQlpZiAoc2V0c29j
a29wdChzLElQUFJPVE9fSVBWNixJUFY2X0ZXX1pFUk8sTlVMTCwwKTwwKQotCQkJZXJyKEVYX1VO
QVZBSUxBQkxFLCAic2V0c29ja29wdChJUFY2X0ZXX1pFUk8pIik7Ci0JCWlmICghZG9fcXVpZXQp
Ci0JCQlwcmludGYoIkFjY291bnRpbmcgY2xlYXJlZC5cbiIpOworCQlpZiAoIWRvX3Rlc3QpIHsK
KwkJCWlmIChzZXRzb2Nrb3B0KHMsSVBQUk9UT19JUFY2LElQVjZfRldfWkVSTyxOVUxMLDApPDAp
CisJCQkJZXJyKEVYX1VOQVZBSUxBQkxFLCAic2V0c29ja29wdChJUFY2X0ZXX1pFUk8pIik7CisJ
CQlpZiAoIWRvX3F1aWV0KQorCQkJCXByaW50ZigiQWNjb3VudGluZyBjbGVhcmVkLlxuIik7CisJ
CX0gZWxzZSBpZiAoIWRvX3F1aWV0KSB7CisJCQlwcmludGYoIkFjY291bnRpbmcgbm90IGNsZWFy
ZWQuXG4iKTsKKwkJfQogCX0gZWxzZSB7CiAJCXN0cnVjdCBpcDZfZncgcnVsZTsKIAkJaW50IGZh
aWxlZCA9IDA7CkBAIC0xMTM1LDEzICsxMTQ2LDE5IEBACiAJCQkvKiBSdWxlIG51bWJlciAqLwog
CQkJaWYgKGlzZGlnaXQoKiphdikpIHsKIAkJCQlydWxlLmZ3X251bWJlciA9IGF0b2koKmF2KTsg
YXYrKzsgYWMtLTsKLQkJCQlpZiAoc2V0c29ja29wdChzLCBJUFBST1RPX0lQVjYsCi0JCQkJICAg
IElQVjZfRldfWkVSTywgJnJ1bGUsIHNpemVvZiBydWxlKSkgewotCQkJCQl3YXJuKCJydWxlICV1
OiBzZXRzb2Nrb3B0KElQVjZfRldfWkVSTykiLCBydWxlLmZ3X251bWJlcik7Ci0JCQkJCWZhaWxl
ZCA9IDE7Ci0JCQkJfSBlbHNlIGlmICghZG9fcXVpZXQpCi0JCQkJCXByaW50ZigiRW50cnkgJWQg
Y2xlYXJlZFxuIiwKLQkJCQkJICAgIHJ1bGUuZndfbnVtYmVyKTsKKwkJCQlpZiAoIWRvX3Rlc3Qp
IHsKKwkJCQkJaWYgKHNldHNvY2tvcHQocywgSVBQUk9UT19JUFY2LAorCQkJCQkgICAgSVBWNl9G
V19aRVJPLCAmcnVsZSwgc2l6ZW9mIHJ1bGUpKSB7CisJCQkJCQl3YXJuKCJydWxlICV1OiBzZXRz
b2Nrb3B0KElQVjZfRldfWkVSTykiLCBydWxlLmZ3X251bWJlcik7CisJCQkJCQlmYWlsZWQgPSAx
OworCQkJCQl9IGVsc2UgaWYgKCFkb19xdWlldCkgeworCQkJCQkJcHJpbnRmKCJFbnRyeSAlZCBj
bGVhcmVkXG4iLAorCQkJCQkJICAgICAgIHJ1bGUuZndfbnVtYmVyKTsKKwkJCQkJfQorCQkJCX0g
ZWxzZSBpZiAoIWRvX3F1aWV0KSB7CisJCQkJCXByaW50ZigiRW50cnkgJWQgbm90IGNsZWFyZWRc
biIsCisJCQkJCSAgICAgICBydWxlLmZ3X251bWJlcik7CisJCQkJfQogCQkJfSBlbHNlCiAJCQkJ
c2hvd191c2FnZSgiaW52YWxpZCBydWxlIG51bWJlciBgYCVzJyciLCAqYXYpOwogCQl9CkBAIC0x
MTY1LDcgKzExODIsNyBAQAogCS8qIFNldCB0aGUgZm9yY2UgZmxhZyBmb3Igbm9uLWludGVyYWN0
aXZlIHByb2Nlc3NlcyAqLwogCWRvX2ZvcmNlID0gIWlzYXR0eShTVERJTl9GSUxFTk8pOwogCi0J
d2hpbGUgKChjaCA9IGdldG9wdChhYywgYXYgLCJhZnF0TiIpKSAhPSAtMSkKKwl3aGlsZSAoKGNo
ID0gZ2V0b3B0KGFjLCBhdiAsImFmbnF0TiIpKSAhPSAtMSkKIAlzd2l0Y2goY2gpIHsKIAkJY2Fz
ZSAnYSc6CiAJCQlkb19hY2N0PTE7CkBAIC0xMTczLDYgKzExOTAsOSBAQAogCQljYXNlICdmJzoK
IAkJCWRvX2ZvcmNlPTE7CiAJCQlicmVhazsKKwkJY2FzZSAnbic6CisJCQlkb190ZXN0PTE7CisJ
CQlicmVhazsKIAkJY2FzZSAncSc6CiAJCQlkb19xdWlldD0xOwogCQkJYnJlYWs7CkBAIC0xMjE3
LDEwICsxMjM3LDE3IEBACiAJCQkJZG9fZmx1c2ggPSAxOwogCQl9CiAJCWlmICggZG9fZmx1c2gg
KSB7Ci0JCQlpZiAoc2V0c29ja29wdChzLElQUFJPVE9fSVBWNixJUFY2X0ZXX0ZMVVNILE5VTEws
MCkgPCAwKQotCQkJCWVycihFWF9VTkFWQUlMQUJMRSwgInNldHNvY2tvcHQoSVBWNl9GV19GTFVT
SCkiKTsKLQkJCWlmICghZG9fcXVpZXQpCi0JCQkJcHJpbnRmKCJGbHVzaGVkIGFsbCBydWxlcy5c
biIpOworCQkJaWYgKCFkb190ZXN0KSB7CisJCQkJaWYgKHNldHNvY2tvcHQocywgSVBQUk9UT19J
UFY2LCBJUFY2X0ZXX0ZMVVNILAorCQkJCQkgICAgICAgTlVMTCwgMCkgPCAwKSB7CisJCQkJCWVy
cihFWF9VTkFWQUlMQUJMRSwKKwkJCQkJICAgICJzZXRzb2Nrb3B0KElQVjZfRldfRkxVU0gpIik7
CisJCQkJfQorCQkJCWlmICghZG9fcXVpZXQpCisJCQkJCXByaW50ZigiRmx1c2hlZCBhbGwgcnVs
ZXMuXG4iKTsKKwkJCX0gZWxzZSBpZiAoIWRvX3F1aWV0KSB7CisJCQkJcHJpbnRmKCJSdWxlcyBu
b3QgZmx1c2hlZC5cbiIpOworCQkJfQogCQl9CiAJfSBlbHNlIGlmICghc3RybmNtcCgqYXYsICJ6
ZXJvIiwgc3RybGVuKCphdikpKSB7CiAJCXplcm8oYWMsYXYpOwpAQCAtMTI0NCw4ICsxMjcxLDgg
QEAKICNkZWZpbmUJV0hJVEVTUAkJIiBcdFxmXHZcblxyIgogCWNoYXIJYnVmW0JVRlNJWl07CiAJ
Y2hhcgkqYSwgKnAsICphcmdzW01BWF9BUkdTXSwgKmNtZCA9IE5VTEw7Ci0JY2hhcglsaW5lbmFt
ZVsxMF0sIHFfb3B0WzNdOwotCWludCAJaSwgYywgbGluZW5vLCBxZmxhZywgcGZsYWcsIHN0YXR1
czsKKwljaGFyCWxpbmVuYW1lWzEwXSwgcV9vcHRbM10sIG5fb3B0WzNdOworCWludCAJaSwgYywg
bGluZW5vLCBuZmxhZywgcWZsYWcsIHBmbGFnLCBzdGF0dXM7CiAJRklMRQkqZiA9IE5VTEw7CiAJ
cGlkX3QJcHJlcHJvYyA9IDA7CiAKQEAgLTEyNjEsMTEgKzEyODgsMTIgQEAKIAkgKi8KIAogCXN0
cmNweShxX29wdCwgIi1xIik7CisJc3RyY3B5KG5fb3B0LCAiLW4iKTsKIAlpZiAoYWMgPiAxICYm
IGF2W2FjIC0gMV1bMF0gPT0gJy8nICYmIGFjY2VzcyhhdlthYyAtIDFdLCBSX09LKSA9PSAwKSB7
Ci0JCXFmbGFnID0gcGZsYWcgPSBpID0gMDsKKwkJbmZsYWcgPSBxZmxhZyA9IHBmbGFnID0gaSA9
IDA7CiAJCWxpbmVubyA9IDA7CiAKLQkJd2hpbGUgKChjID0gZ2V0b3B0KGFjLCBhdiwgIkQ6VTpw
OnEiKSkgIT0gLTEpCisJCXdoaWxlICgoYyA9IGdldG9wdChhYywgYXYsICJEOlU6bnA6cSIpKSAh
PSAtMSkKIAkJCXN3aXRjaChjKSB7CiAJCQljYXNlICdEJzoKIAkJCQlpZiAoIXBmbGFnKQpAQCAt
MTI4Nyw2ICsxMzE1LDEwIEBACiAJCQkJYXJnc1tpKytdID0gb3B0YXJnOwogCQkJCWJyZWFrOwog
CisJCQljYXNlICduJzoKKwkJCQluZmxhZyA9IDE7CisJCQkJYnJlYWs7CisKIAkJCWNhc2UgJ3An
OgogCQkJCXBmbGFnID0gMTsKIAkJCQljbWQgPSBvcHRhcmc7CkBAIC0xMzYwLDExICsxMzkyLDE3
IEBACiAJCQlpPTE7CiAJCQlpZiAocWZsYWcpCiAJCQkJYXJnc1tpKytdID0gcV9vcHQ7CisJCQlp
ZiAobmZsYWcpCisJCQkJYXJnc1tpKytdID0gbl9vcHQ7CiAJCQlmb3IgKGEgPSBzdHJ0b2soYnVm
LCBXSElURVNQKTsKIAkJCSAgICBhICYmIGkgPCBNQVhfQVJHUzsgYSA9IHN0cnRvayhOVUxMLCBX
SElURVNQKSwgaSsrKQogCQkJCWFyZ3NbaV0gPSBhOwotCQkJaWYgKGkgPT0gKHFmbGFnPyAyOiAx
KSkKKwkJCWlmIChuZmxhZyB8fCBxZmxhZykgeworCQkJCWlmIChpID09ICgobmZsYWcgXiBxZmxh
ZykgPyAyIDogMykpCisJCQkJCWNvbnRpbnVlOworCQkJfSBlbHNlIGlmIChpID09IDEpIHsKIAkJ
CQljb250aW51ZTsKKwkJCX0KIAkJCWlmIChpID09IE1BWF9BUkdTKQogCQkJCWVycngoRVhfVVNB
R0UsICIlczogdG9vIG1hbnkgYXJndW1lbnRzIiwgbGluZW5hbWUpOwogCQkJYXJnc1tpXSA9IE5V
TEw7Cg==
------=_Part_229_21713823.1114258620466--
討論串 (同標題文章)