Date: Mon, 11 Jul 2011 22:00:24 -0700 From: Garrett Cooper <yanegomi@gmail.com> To: freebsd-hackers@freebsd.org Subject: [PATCH] Remove dead code in netstat from route.c Message-ID: <CAGH67wS1EQFkmCKiv-VPrJFc_JXV5oTjfmht-anqbmpibJkMfQ@mail.gmail.com>
next in thread | raw e-mail | index | archive | help
--485b3939bd357bdc8404a7d82db7
Content-Type: text/plain; charset=ISO-8859-1
Hi,
While trying to determine how to print out routes via kvm for
net-snmp, I noticed that there's a chunk of code from the 4.4 BSD Lite
days that isn't executed in netstat as NewTree is always 0. The
following patch removes that dead code and gets the FreeBSD source for
netstat more in line with NetBSD and OpenBSD's copy.
Thanks!
-Garrett
--485b3939bd357bdc8404a7d82db7
Content-Type: text/x-patch; charset=US-ASCII;
name="remove-dead-4-4-bsd-lite-netstat-code.patch"
Content-Disposition: attachment;
filename="remove-dead-4-4-bsd-lite-netstat-code.patch"
Content-Transfer-Encoding: base64
X-Attachment-Id: f_gq0e4zjf0
SW5kZXg6IHVzci5iaW4vbmV0c3RhdC9yb3V0ZS5jCj09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIHVzci5iaW4vbmV0
c3RhdC9yb3V0ZS5jCShyZXZpc2lvbiAyMjM4MjQpCisrKyB1c3IuYmluL25ldHN0YXQvcm91dGUu
Ywkod29ya2luZyBjb3B5KQpAQCAtMTIwLDggKzEyMCw2IEBACiBzdHJ1Y3QJcmFkaXhfbWFzayBy
bWFzazsKIHN0cnVjdAlyYWRpeF9ub2RlX2hlYWQgKipydF90YWJsZXM7CiAKLWludAlOZXdUcmVl
ID0gMDsKLQogc3RydWN0CXRpbWVzcGVjIHVwdGltZTsKIAogc3RhdGljIHN0cnVjdCBzb2NrYWRk
ciAqa2dldHNhKHN0cnVjdCBzb2NrYWRkciAqKTsKQEAgLTEzMCw4ICsxMjgsNiBAQAogc3RhdGlj
IHZvaWQgc2l6ZV9jb2xzX3J0ZW50cnkoc3RydWN0IHJ0ZW50cnkgKnJ0KTsKIHN0YXRpYyB2b2lk
IHBfdHJlZShzdHJ1Y3QgcmFkaXhfbm9kZSAqKTsKIHN0YXRpYyB2b2lkIHBfcnRub2RlKHZvaWQp
Owotc3RhdGljIHZvaWQgbnRyZWVzdHVmZih2b2lkKTsKLXN0YXRpYyB2b2lkIG5wX3J0ZW50cnko
c3RydWN0IHJ0X21zZ2hkciAqKTsKIHN0YXRpYyB2b2lkIHBfc29ja2FkZHIoc3RydWN0IHNvY2th
ZGRyICosIHN0cnVjdCBzb2NrYWRkciAqLCBpbnQsIGludCk7CiBzdGF0aWMgY29uc3QgY2hhciAq
Zm10X3NvY2thZGRyKHN0cnVjdCBzb2NrYWRkciAqc2EsIHN0cnVjdCBzb2NrYWRkciAqbWFzaywK
ICAgICBpbnQgZmxhZ3MpOwpAQCAtMTcwLDQ2ICsxNjYsNDEgQEAKIAogCXByaW50ZigiUm91dGlu
ZyB0YWJsZXNcbiIpOwogCi0JaWYgKEFmbGFnID09IDAgJiYgTmV3VHJlZSkKLQkJbnRyZWVzdHVm
ZigpOwotCWVsc2UgewotCQlpZiAocnRyZWUgPT0gMCkgewotCQkJcHJpbnRmKCJydF90YWJsZXM6
IHN5bWJvbCBub3QgaW4gbmFtZWxpc3RcbiIpOwotCQkJcmV0dXJuOwotCQl9CisJaWYgKHJ0cmVl
ID09IDApIHsKKwkJcHJpbnRmKCJydF90YWJsZXM6IHN5bWJvbCBub3QgaW4gbmFtZWxpc3RcbiIp
OworCQlyZXR1cm47CisJfQogCi0JCWlmIChrcmVhZCgodV9sb25nKShydHJlZSksIChjaGFyICop
KHJ0X3RhYmxlcyksIChudW1maWJzICoKLQkJICAgIChBRl9NQVgrMSkgKiBzaXplb2Yoc3RydWN0
IHJhZGl4X25vZGVfaGVhZCAqKSkpICE9IDApCi0JCQlyZXR1cm47Ci0JCWZvciAoaSA9IDA7IGkg
PD0gQUZfTUFYOyBpKyspIHsKLQkJCWludCB0bXBmaWI7Ci0JCQlpZiAoaSAhPSBBRl9JTkVUKQot
CQkJCXRtcGZpYiA9IDA7Ci0JCQllbHNlCi0JCQkJdG1wZmliID0gZmlibnVtOwotCQkJcm5ocCA9
IChzdHJ1Y3QgcmFkaXhfbm9kZV9oZWFkICoqKSpydF90YWJsZXM7Ci0JCQkvKiBDYWxjdWxhdGUg
dGhlIGluLWtlcm5lbCBhZGRyZXNzLiAqLwotCQkJcm5ocCArPSB0bXBmaWIgKiAoQUZfTUFYKzEp
ICsgaTsKLQkJCS8qIFJlYWQgdGhlIGluIGtlcm5lbCByaG4gcG9pbnRlci4gKi8KLQkJCWlmIChr
Z2V0KHJuaHAsIHJuaCkgIT0gMCkKLQkJCQljb250aW51ZTsKLQkJCWlmIChybmggPT0gTlVMTCkK
LQkJCQljb250aW51ZTsKLQkJCS8qIFJlYWQgdGhlIHJuaCBkYXRhLiAqLwotCQkJaWYgKGtnZXQo
cm5oLCBoZWFkKSAhPSAwKQotCQkJCWNvbnRpbnVlOwotCQkJaWYgKGkgPT0gQUZfVU5TUEVDKSB7
Ci0JCQkJaWYgKEFmbGFnICYmIGFmID09IDApIHsKLQkJCQkJcHJpbnRmKCJOZXRtYXNrczpcbiIp
OwotCQkJCQlwX3RyZWUoaGVhZC5ybmhfdHJlZXRvcCk7Ci0JCQkJfQotCQkJfSBlbHNlIGlmIChh
ZiA9PSBBRl9VTlNQRUMgfHwgYWYgPT0gaSkgewotCQkJCXNpemVfY29scyhpLCBoZWFkLnJuaF90
cmVldG9wKTsKLQkJCQlwcl9mYW1pbHkoaSk7Ci0JCQkJZG9fcnRlbnQgPSAxOwotCQkJCXByX3J0
aGRyKGkpOworCWlmIChrcmVhZCgodV9sb25nKShydHJlZSksIChjaGFyICopKHJ0X3RhYmxlcyks
IChudW1maWJzICoKKwkgICAgKEFGX01BWCsxKSAqIHNpemVvZihzdHJ1Y3QgcmFkaXhfbm9kZV9o
ZWFkICopKSkgIT0gMCkKKwkJcmV0dXJuOworCWZvciAoaSA9IDA7IGkgPD0gQUZfTUFYOyBpKysp
IHsKKwkJaW50IHRtcGZpYjsKKwkJaWYgKGkgIT0gQUZfSU5FVCkKKwkJCXRtcGZpYiA9IDA7CisJ
CWVsc2UKKwkJCXRtcGZpYiA9IGZpYm51bTsKKwkJcm5ocCA9IChzdHJ1Y3QgcmFkaXhfbm9kZV9o
ZWFkICoqKSpydF90YWJsZXM7CisJCS8qIENhbGN1bGF0ZSB0aGUgaW4ta2VybmVsIGFkZHJlc3Mu
ICovCisJCXJuaHAgKz0gdG1wZmliICogKEFGX01BWCsxKSArIGk7CisJCS8qIFJlYWQgdGhlIGlu
IGtlcm5lbCByaG4gcG9pbnRlci4gKi8KKwkJaWYgKGtnZXQocm5ocCwgcm5oKSAhPSAwKQorCQkJ
Y29udGludWU7CisJCWlmIChybmggPT0gTlVMTCkKKwkJCWNvbnRpbnVlOworCQkvKiBSZWFkIHRo
ZSBybmggZGF0YS4gKi8KKwkJaWYgKGtnZXQocm5oLCBoZWFkKSAhPSAwKQorCQkJY29udGludWU7
CisJCWlmIChpID09IEFGX1VOU1BFQykgeworCQkJaWYgKEFmbGFnICYmIGFmID09IDApIHsKKwkJ
CQlwcmludGYoIk5ldG1hc2tzOlxuIik7CiAJCQkJcF90cmVlKGhlYWQucm5oX3RyZWV0b3ApOwog
CQkJfQorCQl9IGVsc2UgaWYgKGFmID09IEFGX1VOU1BFQyB8fCBhZiA9PSBpKSB7CisJCQlzaXpl
X2NvbHMoaSwgaGVhZC5ybmhfdHJlZXRvcCk7CisJCQlwcl9mYW1pbHkoaSk7CisJCQlkb19ydGVu
dCA9IDE7CisJCQlwcl9ydGhkcihpKTsKIAkJfQogCX0KIH0KQEAgLTUxMyw3NiArNTA0LDYgQEAK
IH0KIAogc3RhdGljIHZvaWQKLW50cmVlc3R1ZmYodm9pZCkKLXsKLQlzaXplX3QgbmVlZGVkOwot
CWludCBtaWJbNl07Ci0JY2hhciAqYnVmLCAqbmV4dCwgKmxpbTsKLQlzdHJ1Y3QgcnRfbXNnaGRy
ICpydG07Ci0KLQltaWJbMF0gPSBDVExfTkVUOwotCW1pYlsxXSA9IFBGX1JPVVRFOwotCW1pYlsy
XSA9IDA7Ci0JbWliWzNdID0gMDsKLQltaWJbNF0gPSBORVRfUlRfRFVNUDsKLQltaWJbNV0gPSAw
OwotCWlmIChzeXNjdGwobWliLCA2LCBOVUxMLCAmbmVlZGVkLCBOVUxMLCAwKSA8IDApIHsKLQkJ
ZXJyKDEsICJzeXNjdGw6IG5ldC5yb3V0ZS4wLjAuZHVtcCBlc3RpbWF0ZSIpOwotCX0KLQotCWlm
ICgoYnVmID0gbWFsbG9jKG5lZWRlZCkpID09IDApIHsKLQkJZXJyeCgyLCAibWFsbG9jKCVsdSki
LCAodW5zaWduZWQgbG9uZyluZWVkZWQpOwotCX0KLQlpZiAoc3lzY3RsKG1pYiwgNiwgYnVmLCAm
bmVlZGVkLCBOVUxMLCAwKSA8IDApIHsKLQkJZXJyKDEsICJzeXNjdGw6IG5ldC5yb3V0ZS4wLjAu
ZHVtcCIpOwotCX0KLQlsaW0gID0gYnVmICsgbmVlZGVkOwotCWZvciAobmV4dCA9IGJ1ZjsgbmV4
dCA8IGxpbTsgbmV4dCArPSBydG0tPnJ0bV9tc2dsZW4pIHsKLQkJcnRtID0gKHN0cnVjdCBydF9t
c2doZHIgKiluZXh0OwotCQlucF9ydGVudHJ5KHJ0bSk7Ci0JfQotfQotCi1zdGF0aWMgdm9pZAot
bnBfcnRlbnRyeShzdHJ1Y3QgcnRfbXNnaGRyICpydG0pCi17Ci0Jc3RydWN0IHNvY2thZGRyICpz
YSA9IChzdHJ1Y3Qgc29ja2FkZHIgKikocnRtICsgMSk7Ci0jaWZkZWYgbm90ZGVmCi0Jc3RhdGlj
IGludCBtYXNrc19kb25lLCBiYW5uZXJfcHJpbnRlZDsKLSNlbmRpZgotCXN0YXRpYyBpbnQgb2xk
X2FmOwotCWludCBhZjEgPSAwLCBpbnRlcmVzdGluZyA9IFJURl9VUCB8IFJURl9HQVRFV0FZIHwg
UlRGX0hPU1Q7Ci0KLSNpZmRlZiBub3RkZWYKLQkvKiBmb3IgdGhlIG1vbWVudCwgbmV0bWFza3Mg
YXJlIHNraXBwZWQgb3ZlciAqLwotCWlmICghYmFubmVyX3ByaW50ZWQpIHsKLQkJcHJpbnRmKCJO
ZXRtYXNrczpcbiIpOwotCQliYW5uZXJfcHJpbnRlZCA9IDE7Ci0JfQotCWlmIChtYXNrc19kb25l
ID09IDApIHsKLQkJaWYgKHJ0bS0+cnRtX2FkZHJzICE9IFJUQV9EU1QgKSB7Ci0JCQltYXNrc19k
b25lID0gMTsKLQkJCWFmMSA9IHNhLT5zYV9mYW1pbHk7Ci0JCX0KLQl9IGVsc2UKLSNlbmRpZgot
CQlhZjEgPSBzYS0+c2FfZmFtaWx5OwotCWlmIChhZjEgIT0gb2xkX2FmKSB7Ci0JCXByX2ZhbWls
eShhZjEpOwotCQlvbGRfYWYgPSBhZjE7Ci0JfQotCWlmIChydG0tPnJ0bV9hZGRycyA9PSBSVEFf
RFNUKQotCQlwX3NvY2thZGRyKHNhLCBOVUxMLCAwLCAzNik7Ci0JZWxzZSB7Ci0JCXBfc29ja2Fk
ZHIoc2EsIE5VTEwsIHJ0bS0+cnRtX2ZsYWdzLCAxNik7Ci0JCXNhID0gKHN0cnVjdCBzb2NrYWRk
ciAqKShTQV9TSVpFKHNhKSArIChjaGFyICopc2EpOwotCQlwX3NvY2thZGRyKHNhLCBOVUxMLCAw
LCAxOCk7Ci0JfQotCXBfZmxhZ3MocnRtLT5ydG1fZmxhZ3MgJiBpbnRlcmVzdGluZywgIiUtNi42
cyAiKTsKLQlwdXRjaGFyKCdcbicpOwotfQotCi1zdGF0aWMgdm9pZAogcF9zb2NrYWRkcihzdHJ1
Y3Qgc29ja2FkZHIgKnNhLCBzdHJ1Y3Qgc29ja2FkZHIgKm1hc2ssIGludCBmbGFncywgaW50IHdp
ZHRoKQogewogCWNvbnN0IGNoYXIgKmNwOwo=
--485b3939bd357bdc8404a7d82db7--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAGH67wS1EQFkmCKiv-VPrJFc_JXV5oTjfmht-anqbmpibJkMfQ>