Port multipath improvements to newer version
This commit is contained in:
parent
024649c175
commit
2e6cda38f6
9 changed files with 120 additions and 47 deletions
25
one.cpp
25
one.cpp
|
@ -664,37 +664,37 @@ static int cli(int argc,char **argv)
|
|||
printf("\nidx"
|
||||
" interface"
|
||||
" "
|
||||
"path socket\n");
|
||||
for(int i=0; i<100; i++) { printf("-"); }
|
||||
"path socket local port\n");
|
||||
for(int i=0; i<120; i++) { printf("-"); }
|
||||
printf("\n");
|
||||
for (int i=0; i<p.size(); i++)
|
||||
{
|
||||
printf("%2d: %26s %51s %.16llx\n",
|
||||
printf("%2d: %26s %51s %.16llx %12d\n",
|
||||
i,
|
||||
OSUtils::jsonString(p[i]["ifname"],"-").c_str(),
|
||||
OSUtils::jsonString(p[i]["address"],"-").c_str(),
|
||||
(unsigned long long)OSUtils::jsonInt(p[i]["localSocket"],0)
|
||||
(unsigned long long)OSUtils::jsonInt(p[i]["localSocket"],0),
|
||||
(uint16_t)OSUtils::jsonInt(p[i]["localPort"],0)
|
||||
);
|
||||
}
|
||||
printf("\nidx lat pdv "
|
||||
"plr per capacity qual "
|
||||
"rx_age tx_age eligible bonded\n");
|
||||
for(int i=0; i<100; i++) { printf("-"); }
|
||||
printf("\nidx lat pdv "
|
||||
"capacity qual "
|
||||
"rx_age tx_age eligible bonded flows\n");
|
||||
for(int i=0; i<120; i++) { printf("-"); }
|
||||
printf("\n");
|
||||
for (int i=0; i<p.size(); i++)
|
||||
{
|
||||
printf("%2d: %8.2f %8.2f %7.4f %7.4f %10d %7.4f %11d %11d %9d %7d\n",
|
||||
printf("%2d: %8.2f %8.2f %10d %7.4f %11d %11d %9d %7d %7d\n",
|
||||
i,
|
||||
OSUtils::jsonDouble(p[i]["latencyMean"], 0),
|
||||
OSUtils::jsonDouble(p[i]["latencyVariance"], 0),
|
||||
OSUtils::jsonDouble(p[i]["packetLossRatio"], 0),
|
||||
OSUtils::jsonDouble(p[i]["packetErrorRatio"], 0),
|
||||
(int)OSUtils::jsonInt(p[i]["givenLinkSpeed"], 0),
|
||||
OSUtils::jsonDouble(p[i]["relativeQuality"], 0),
|
||||
(int)OSUtils::jsonInt(p[i]["lastInAge"], 0),
|
||||
(int)OSUtils::jsonInt(p[i]["lastOutAge"], 0),
|
||||
(int)OSUtils::jsonInt(p[i]["eligible"],0),
|
||||
(int)OSUtils::jsonInt(p[i]["bonded"],0));
|
||||
(int)OSUtils::jsonInt(p[i]["bonded"],0),
|
||||
(int)OSUtils::jsonInt(p[i]["assignedFlowCount"],0));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -706,6 +706,7 @@ static int cli(int argc,char **argv)
|
|||
return 2;
|
||||
}
|
||||
}
|
||||
|
||||
/* zerotier-cli bond command was malformed in some way */
|
||||
printf("(bond) command is missing required arguments" ZT_EOL_S);
|
||||
return 2;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue