[Xorp-hackers] Bugzilla #161

["Patrick Preuß"]

This is a MIME encapsulated multipart message -
please use a MIME-compliant e-mail program to open it.

Dies ist eine mehrteilige Nachricht im MIME-Format -
bitte verwenden Sie zum Lesen ein MIME-konformes Mailprogramm.

--========GMXBoundary293861126016488
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

Hello List,

my second try to Post and to help, 

i have written a small patch for some problems described in bug 161 
 http://www.xorp.org/bugzilla/show_bug.cgi?id=161

also have made changes to 
cli/cli_command.cc
 - fixed in cli_command.cc the line problem
   after pressing the ? if the comand is executeable needed one more
newline.
 - don't find the point for the tabs

   Xorp> show route table ipv4 unicast final
   `final' is ambiguous.
   Possible completions:
   <[Enter]>       Execute this command  brief           Show IPv4 winning
routes  |               Pipe through a command
   Xorp> show route table ipv4 unicast final ?
   Possible completions:
   <[Enter]>       Execute this command
   brief           Show IPv4 winning routes
   |               Pipe through a command



rib/tools/show_routes.cc
 - build a simple brief for showing
   the routes (-b)



-- 
best regards 
Patrick Preuss
----------------------------------------------------------------------
--

 "...a hundred billion castaways looking for a home."
                                  - Sting "Message in a Bottle" (1979)

GMX DSL = Maximale Leistung zum minimalen Preis!
2000 MB nur 2,99, Flatrate ab 4,99 Euro/Monat: http://www.gmx.net/de/go/dsl
--========GMXBoundary293861126016488
Content-Type: text/x-patch; name="xorp.patch"
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="xorp.patch"

ZGlmZiAtdSAtciB4b3JwLWN2cy1vcmlnL2NsaS9jbGlfY29tbWFuZC5jYyB4b3JwLWN2cy1maXhl
ZC9jbGkvY2xpX2NvbW1hbmQuY2MKLS0tIHhvcnAtY3ZzLW9yaWcvY2xpL2NsaV9jb21tYW5kLmNj
CTIwMDUtMDktMDYgMTU6MTU6MDEuMDAwMDAwMDAwICswMjAwCisrKyB4b3JwLWN2cy1maXhlZC9j
bGkvY2xpX2NvbW1hbmQuY2MJMjAwNS0wOS0wNiAxNjoyMDo0MC4wMDAwMDAwMDAgKzAyMDAKQEAg
LTcxOCw3ICs3MTgsNyBAQAogICAgIGlmICgodG9rZW4ubGVuZ3RoKCkgPT0gMCkgJiYgY2FuX2Nv
bXBsZXRlKCkpIHsKIAkvLyBUaGUgbGFzdCB0b2tlbiwgYW5kIHRoZXJlIGlzIHNwYWNlIGF0IHRo
ZSBlbmQsCiAJLy8gc28gcHJpbnQgdGhlICJkZWZhdWx0IiBoZWxwLgotCXJldF9zdHJpbmcgKz0g
Y19mb3JtYXQoIiAgJS0xNXMgJXNcclxuIiwKKwlyZXRfc3RyaW5nICs9IGNfZm9ybWF0KCIgICUt
MTVzICVzXHJcblxuIiwKIAkJCSAgICAgICAiPFtFbnRlcl0+IiwgIkV4ZWN1dGUgdGhpcyBjb21t
YW5kIik7CiAJcmV0X3ZhbHVlID0gdHJ1ZTsKICAgICB9CmRpZmYgLXUgLXIgeG9ycC1jdnMtb3Jp
Zy9ldGMvdGVtcGxhdGVzL3JpYi5jbWRzIHhvcnAtY3ZzLWZpeGVkL2V0Yy90ZW1wbGF0ZXMvcmli
LmNtZHMKLS0tIHhvcnAtY3ZzLW9yaWcvZXRjL3RlbXBsYXRlcy9yaWIuY21kcwkyMDA1LTA5LTA2
IDE1OjE1OjAyLjAwMDAwMDAwMCArMDIwMAorKysgeG9ycC1jdnMtZml4ZWQvZXRjL3RlbXBsYXRl
cy9yaWIuY21kcwkyMDA1LTA5LTA2IDE2OjIwOjQwLjAwMDAwMDAwMCArMDIwMApAQCAtMTQsNyAr
MTQsNDIgQEAKICAgICAgJXRhZzogSEVMUCAiU2hvdyByb3V0ZSB0YWJsZSI7CiB9CiAKK3Nob3cg
cm91dGUgdGFibGUgaXB2NCB7CisgICAgICVjb21tYW5kOiAiIiAlaGVscDogSEVMUDsKKyAgICAg
JW1vZHVsZTogcmliOworICAgICAldGFnOiBIRUxQICJTaG93IElQdjQgcm91dGVzIjsKK30KKwor
c2hvdyByb3V0ZSB0YWJsZSBpcHY0IHVuaWNhc3QgeworICAgICAlY29tbWFuZDogIiIgJWhlbHA6
IEhFTFA7CisgICAgICVtb2R1bGU6IHJpYjsKKyAgICAgJXRhZzogSEVMUCAiU2hvdyBJUHY0IHVu
aWNhc3Qgcm91dGVzIjsKK30KKworc2hvdyByb3V0ZSB0YWJsZSBpcHY0IG11bHRpY2FzdCB7Cisg
ICAgICVjb21tYW5kOiAiIiAlaGVscDogSEVMUDsKKyAgICAgJW1vZHVsZTogcmliOworICAgICAl
dGFnOiBIRUxQICJTaG93IElQdjQgbXVsdGljYXN0IHJvdXRlcyI7Cit9CisKKworc2hvdyByb3V0
ZSB0YWJsZSBpcHY2IHsKKyAgICAgJWNvbW1hbmQ6ICIiICVoZWxwOiBIRUxQOworICAgICAlbW9k
dWxlOiByaWI7CisgICAgICV0YWc6IEhFTFAgIlNob3cgSVB2NiByb3V0ZXMiOworfQorCitzaG93
IHJvdXRlIHRhYmxlIGlwdjYgdW5pY2FzdCB7CisgICAgICVjb21tYW5kOiAiIiAlaGVscDogSEVM
UDsKKyAgICAgJW1vZHVsZTogcmliOworICAgICAldGFnOiBIRUxQICJTaG93IElQdjYgdW5pY2Fz
dCByb3V0ZXMiOworfQogCitzaG93IHJvdXRlIHRhYmxlIGlwdjYgbXVsdGljYXN0IHsKKyAgICAg
JWNvbW1hbmQ6ICIiICVoZWxwOiBIRUxQOworICAgICAlbW9kdWxlOiByaWI7CisgICAgICV0YWc6
IEhFTFAgIlNob3cgSVB2NiBtdWx0aWNhc3Qgcm91dGVzIjsKK30KIAogLyoKICAqIENvbm5lY3Rl
ZCBzaG93IHJvdXRlIHRhYmxlIGNvbW1hbmRzCkBAIC0xNzUsNiArMjEwLDEzIEBACiAgICAgICV0
YWc6IEhFTFAgIlNob3cgSVB2NCB3aW5uaW5nIHJvdXRlcyI7CiB9CiAKK3Nob3cgcm91dGUgdGFi
bGUgaXB2NCB1bmljYXN0IGZpbmFsIGJyaWVmIHsKKyAgICAgJWNvbW1hbmQ6ICJyaWIvdG9vbHMv
c2hvd19yb3V0ZXMgLWIgcmlib3V0ICQ0ICQ1IGFsbCIgJWhlbHA6IEhFTFA7CisgICAgICVtb2R1
bGU6IHJpYjsKKyAgICAgJXRhZzogSEVMUCAiU2hvdyBJUHY0IHdpbm5pbmcgcm91dGVzIjsKKwor
fQorCiBzaG93IHJvdXRlIHRhYmxlIGlwdjYgdW5pY2FzdCBmaW5hbCB7CiAgICAgICVjb21tYW5k
OiAicmliL3Rvb2xzL3Nob3dfcm91dGVzIHJpYmluICQ0ICQ1IGFsbCIgJWhlbHA6IEhFTFA7CiAg
ICAgICVtb2R1bGU6IHJpYjsKQEAgLTE4Nyw2ICsyMjksMTIgQEAKICAgICAgJXRhZzogSEVMUCAi
U2hvdyBJUHY0IE1SSUIgd2lubmluZyByb3V0ZXMiOwogfQogCitzaG93IHJvdXRlIHRhYmxlIGlw
djQgbXVsdGljYXN0IGZpbmFsIGJyaWVmIHsKKyAgICAgJWNvbW1hbmQ6ICJyaWIvdG9vbHMvc2hv
d19yb3V0ZXMgLWIgcmliaW4gJDQgJDUgYWxsIiAlaGVscDogSEVMUDsKKyAgICAgJW1vZHVsZTog
cmliOworICAgICAldGFnOiBIRUxQICJTaG93IElQdjQgTVJJQiB3aW5uaW5nIHJvdXRlcyI7Cit9
CisKIHNob3cgcm91dGUgdGFibGUgaXB2NiBtdWx0aWNhc3QgZmluYWwgewogICAgICAlY29tbWFu
ZDogInJpYi90b29scy9zaG93X3JvdXRlcyByaWJpbiAkNCAkNSBhbGwiICVoZWxwOiBIRUxQOwog
ICAgICAlbW9kdWxlOiByaWI7CmRpZmYgLXUgLXIgeG9ycC1jdnMtb3JpZy9yaWIvdG9vbHMvc2hv
d19yb3V0ZXMuY2MgeG9ycC1jdnMtZml4ZWQvcmliL3Rvb2xzL3Nob3dfcm91dGVzLmNjCi0tLSB4
b3JwLWN2cy1vcmlnL3JpYi90b29scy9zaG93X3JvdXRlcy5jYwkyMDA1LTA5LTA2IDE1OjE1OjAy
LjAwMDAwMDAwMCArMDIwMAorKysgeG9ycC1jdnMtZml4ZWQvcmliL3Rvb2xzL3Nob3dfcm91dGVz
LmNjCTIwMDUtMDktMDYgMTY6MjA6NDAuMDAwMDAwMDAwICswMjAwCkBAIC00MCw2ICs0MCw3IEBA
CiAvLyBTdHJ1Y3R1cmUgZm9yIGhvbGRpbmcgY29tbWFuZCBsaW5lIG9wdGlvbnMKIAogc3RydWN0
IFNob3dSb3V0ZXNPcHRpb25zIHsKKyAgICBib29sIGJyaWVmOyAgICAgICAgICAgICAgICAgLy8g
LWIgKHRydWUpLCAoZmFsc2UpCiAgICAgYm9vbCByaWJpbjsJCQkvLyByaWJpbiAodHJ1ZSksIHJp
Ym91dCAoZmFsc2UpCiAgICAgYm9vbCBpcHY0OwkJCS8vIElQdjQgKHRydWUpLCBJUHY2KGZhbHNl
KQogICAgIGJvb2wgdW5pY2FzdDsJCS8vIHVuaWNhc3QgKHRydWUpLCBtdWx0aWNhc3QgKGZhbHNl
KQpAQCAtNDksNyArNTAsNyBAQAogICAgIHVpbnQxNl90CWZpbmRlcl9wb3J0OwogCiAgICAgaW5s
aW5lIFNob3dSb3V0ZXNPcHRpb25zKCkKLQk6IHJpYmluKGZhbHNlKSwgaXB2NCh0cnVlKSwgdW5p
Y2FzdCh0cnVlKSwgcHJvdG9jb2woImFsbCIpCisJOiBicmllZihmYWxzZSksIHJpYmluKGZhbHNl
KSwgaXB2NCh0cnVlKSwgdW5pY2FzdCh0cnVlKSwgcHJvdG9jb2woImFsbCIpCiAgICAge30KIH07
CiAKQEAgLTEyMCw2ICsxMjEsNDAgQEAKICAgICBjb3V0IDw8IGVuZGw7CiB9CiAKK3RlbXBsYXRl
IDx0eXBlbmFtZSBBPgorc3RhdGljIHZvaWQKK2Rpc3BsYXlfcm91dGVfYnJpZWYoY29uc3QgSVBO
ZXQ8QT4mIAluZXQsCisJICAgICAgY29uc3QgQSYgCQluZXh0aG9wLAorCSAgICAgIGNvbnN0IHN0
cmluZyYgCWlmbmFtZSwKKwkgICAgICBjb25zdCBzdHJpbmcmIAl2aWZuYW1lLAorCSAgICAgIGNv
bnN0IHVpbnQzMl90IAltZXRyaWMsCisJICAgICAgY29uc3QgdWludDMyX3QJYWRtaW5fZGlzdGFu
Y2UpCit7CisgICAgY291dCA8PCAiIiA8PCBuZXQuc3RyKCkgPDwgIlx0IjsKKyAgICBjb3V0IDw8
ICJbIiA7CisgICAgY29uc3QgY2hhciogcHJvdG9jb2wgPSBhZDJwcm90b2NvbChhZG1pbl9kaXN0
YW5jZSk7CisgICAgaWYgKHByb3RvY29sID09IDApIHsKKyAgICAgICAgY291dCA8PCBhZG1pbl9k
aXN0YW5jZTsKKyAgICB9IGVsc2UgeworICAgICAgICBjb3V0IDw8IHByb3RvY29sIDw8ICIoIiA8
PCBhZG1pbl9kaXN0YW5jZSA8PCAiKSI7CisgICAgfQorICAgIGNvdXQgPDwgIi8iIDw8IG1ldHJp
YyA8PCAiXSIgPDwgIiB4eDp4eDp4eCIgPDwgZW5kbCA7CisKKyAgICBjb3V0IDw8ICJcdFx0PiAi
IDsKKyAgICBpZiAoYWRtaW5fZGlzdGFuY2UgIT0gMCkKKyAgICAgICAgY291dCA8PCAidG8gIiA8
PCBuZXh0aG9wLnN0cigpIDw8ICIgIjsKKworCisgICAgaWYgKGlmbmFtZS5lbXB0eSgpID09IGZh
bHNlKQorICAgICAgICBjb3V0IDw8ICJ2aWEgIiA8PCBpZm5hbWUgOworCisgICAgaWYgKHZpZm5h
bWUuZW1wdHkoKSA9PSBmYWxzZSkKKyAgICAgICAgY291dCA8PCAiLyIgPDwgdmlmbmFtZTsKKyAg
ICBjb3V0IDw8IGVuZGw7CisKK30KKworCiAvLyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAvLyBDbGFz
cyBmb3IgUXVlcnlpbmcgUklCIHJvdXRlcwogCkBAIC00OTgsNyArNTMzLDEyIEBACiAJcmV0dXJu
IFhybENtZEVycm9yOjpPS0FZKCk7CiAgICAgfQogCi0gICAgZGlzcGxheV9yb3V0ZShkc3QsIG5l
eHRob3AsIGlmbmFtZSwgdmlmbmFtZSwgbWV0cmljLCBhZG1pbl9kaXN0YW5jZSk7CisgICAgaWYg
KHRoaXMtPl9vcHRzLmJyaWVmID09IGZhbHNlKSB7CisgICAgCWRpc3BsYXlfcm91dGUoZHN0LCBu
ZXh0aG9wLCBpZm5hbWUsIHZpZm5hbWUsIG1ldHJpYywgYWRtaW5fZGlzdGFuY2UpOworICAgIAly
ZXR1cm4gWHJsQ21kRXJyb3I6Ok9LQVkoKTsKKyAgICB9IAorCisgICAgZGlzcGxheV9yb3V0ZV9i
cmllZihkc3QsIG5leHRob3AsIGlmbmFtZSwgdmlmbmFtZSwgbWV0cmljLCBhZG1pbl9kaXN0YW5j
ZSk7CiAgICAgcmV0dXJuIFhybENtZEVycm9yOjpPS0FZKCk7CiB9CiAKQEAgLTY1MCw2ICs2OTAs
NyBAQAogCSAgICBzd2l0Y2ggKGNoKSB7CiAJICAgIGNhc2UgJ2InOgogCQlicmllZiA9IHRydWU7
CisJCXNyX29wdHMuYnJpZWYgPSB0cnVlOwogCQlicmVhazsKIAkgICAgY2FzZSAnRic6CiAJCWRv
X3J1biA9IHBhcnNlX2ZpbmRlcl9hcmdzKG9wdGFyZywK

--========GMXBoundary293861126016488--