afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

updates to formatting for route monitor

Browse source
This commit is contained in:
Blake Harnden 2020-04-13 17:02:05 -07:00
parent 971a959a19
commit 8c8024df10
1 changed files with 41 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
daemon/scripts/core-route-monitor
View file

@ -59,8 +59,17 @@ class SdtClient:
class RouterMonitor: class RouterMonitor:
def __init__(self, session: int, src: str, dst: str, pkt: str, rate: int, dead: int, def __init__(
sdt_host: str, sdt_port: int) -> None: self,
session: int,
src: str,
dst: str,
pkt: str,
rate: int,
dead: int,
sdt_host: str,
sdt_port: int,
) -> None:
self.queue = Queue() self.queue = Queue()
self.core = CoreGrpcClient() self.core = CoreGrpcClient()
self.session = session self.session = session
@ -102,7 +111,9 @@ class RouterMonitor:
if self.src_id is None: if self.src_id is None:
print(f"could not find node with source address: {self.src}") print(f"could not find node with source address: {self.src}")
sys.exit(1) sys.exit(1)
print(f"monitoring src_id ({self.src_id}) src({self.src}) dst({self.dst}) pkt({self.pkt})") print(
f"monitoring src_id ({self.src_id}) src({self.src}) dst({self.dst}) pkt({self.pkt})"
)
return node_map return node_map
def get_session(self) -> int: def get_session(self) -> int:
@ -152,9 +163,9 @@ class RouterMonitor:
self.sdt.delete_links() self.sdt.delete_links()
if not self.seen: if not self.seen:
return return
values = sorted(self.seen.items(), values = sorted(
key=cmp_to_key(self.route_sort), self.seen.items(), key=cmp_to_key(self.route_sort), reverse=True
reverse=True) )
print("current route:") print("current route:")
for index, node_data in enumerate(values): for index, node_data in enumerate(values):
next_index = index + 1 next_index = index + 1
@ -174,12 +185,11 @@ class RouterMonitor:
self.listeners.clear() self.listeners.clear()
def listen(self, node_id, node) -> None: def listen(self, node_id, node) -> None:
cmd = ( cmd = f"tcpdump -lnvi any src host {self.src} and dst host {self.dst} and {self.pkt}"
f"tcpdump -lnvi any src host {self.src} and dst host {self.dst} and {self.pkt}"
)
node_cmd = f"vcmd -c {node} -- {cmd}" node_cmd = f"vcmd -c {node} -- {cmd}"
p = subprocess.Popen(node_cmd, shell=True, stdout=subprocess.PIPE, p = subprocess.Popen(
stderr=subprocess.DEVNULL) node_cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.DEVNULL
)
current = time.monotonic() current = time.monotonic()
try: try:
while not p.poll() and self.running: while not p.poll() and self.running:
@ -206,21 +216,27 @@ def main() -> None:
desc = "core route monitor leverages tcpdump to monitor traffic and find route using TTL" desc = "core route monitor leverages tcpdump to monitor traffic and find route using TTL"
parser = argparse.ArgumentParser( parser = argparse.ArgumentParser(
description=desc, description=desc, formatter_class=ArgumentDefaultsHelpFormatter
formatter_class=ArgumentDefaultsHelpFormatter )
parser.add_argument(
"--src", required=True, help="source address for route monitoring"
)
parser.add_argument(
"--dst", required=True, help="destination address for route monitoring"
)
parser.add_argument("--session", type=int, help="session to monitor route")
parser.add_argument(
"--pkt", default="icmp", choices=PACKET_CHOICES, help="packet type"
)
parser.add_argument(
"--rate", type=int, default=ROUTE_TIME, help="rate to update route, in seconds"
)
parser.add_argument(
"--dead",
type=int,
default=DEAD_TIME,
help="timeout to declare path dead, in seconds",
) )
parser.add_argument("--src", required=True,
help="source address for route monitoring")
parser.add_argument("--dst", required=True,
help="destination address for route monitoring")
parser.add_argument("--session", type=int,
help="session to monitor route")
parser.add_argument("--pkt", default="icmp", choices=PACKET_CHOICES,
help="packet type")
parser.add_argument("--rate", type=int, default=ROUTE_TIME,
help="rate to update route, in seconds")
parser.add_argument("--dead", type=int, default=DEAD_TIME,
help="timeout to declare path dead, in seconds")
parser.add_argument("--sdt-host", default=SDT_HOST, help="sdt host address") parser.add_argument("--sdt-host", default=SDT_HOST, help="sdt host address")
parser.add_argument("--sdt-port", type=int, default=SDT_PORT, help="sdt port") parser.add_argument("--sdt-port", type=int, default=SDT_PORT, help="sdt port")
args = parser.parse_args() args = parser.parse_args()