add/delete route
diff --git a/src/forwarder-status.cpp b/src/forwarder-status.cpp
index a6b7660..5850b36 100644
--- a/src/forwarder-status.cpp
+++ b/src/forwarder-status.cpp
@@ -100,19 +100,20 @@
beginResetModel();
m_items.clear();
nfd::ForwarderStatus status(data->getContent());
- addItem(ForwarderStatusItem("version", QString::fromStdString(status.getNfdVersion())));
- addItem(ForwarderStatusItem("startTime", QString::fromStdString(time::toIsoString(status.getStartTimestamp()))));
- addItem(ForwarderStatusItem("currentTime", QString::fromStdString(time::toIsoString(status.getCurrentTimestamp()))));
- addItem(ForwarderStatusItem("nNameTreeEntries", QString::number(status.getNNameTreeEntries())));
- addItem(ForwarderStatusItem("nFibEntries", QString::number(status.getNFibEntries())));
- addItem(ForwarderStatusItem("nPitEntries", QString::number(status.getNPitEntries())));
- addItem(ForwarderStatusItem("nMeasurementsEntries", QString::number(status.getNMeasurementsEntries())));
- addItem(ForwarderStatusItem("nCsEntries", QString::number(status.getNCsEntries())));
- addItem(ForwarderStatusItem("nInInterests", QString::number(status.getNInInterests())));
- addItem(ForwarderStatusItem("nOutInterests", QString::number(status.getNOutInterests())));
- addItem(ForwarderStatusItem("nInDatas", QString::number(status.getNInDatas())));
- addItem(ForwarderStatusItem("nNInNacks", QString::number(status.getNInDatas())));
- addItem(ForwarderStatusItem("nNOutNacks", QString::number(status.getNOutDatas())));
+ addItem(ForwarderStatusItem("Version", QString::fromStdString(status.getNfdVersion())));
+ addItem(ForwarderStatusItem("Start Time", QString::fromStdString(time::toIsoString(status.getStartTimestamp()))));
+ addItem(ForwarderStatusItem("Current Time", QString::fromStdString(time::toIsoString(status.getCurrentTimestamp()))));
+ addItem(ForwarderStatusItem("Name Tree Entries", QString::number(status.getNNameTreeEntries())));
+ addItem(ForwarderStatusItem("Fib Entries", QString::number(status.getNFibEntries())));
+ addItem(ForwarderStatusItem("PitEntries", QString::number(status.getNPitEntries())));
+ addItem(ForwarderStatusItem("Measurements Entries", QString::number(status.getNMeasurementsEntries())));
+ addItem(ForwarderStatusItem("Content Store Entries", QString::number(status.getNCsEntries())));
+ addItem(ForwarderStatusItem("Incoming Interests", QString::number(status.getNInInterests())));
+ addItem(ForwarderStatusItem("Outgoing Interests", QString::number(status.getNOutInterests())));
+ addItem(ForwarderStatusItem("Incoming Data", QString::number(status.getNInDatas())));
+ addItem(ForwarderStatusItem("Outgoing Data", QString::number(status.getNOutDatas())));
+ addItem(ForwarderStatusItem("Incoming Nacks", QString::number(status.getNInDatas())));
+ addItem(ForwarderStatusItem("Outgoing Nacks", QString::number(status.getNOutDatas())));
endResetModel();
}
diff --git a/src/main.qml b/src/main.qml
index 976faa2..6eb7b18 100644
--- a/src/main.qml
+++ b/src/main.qml
@@ -145,7 +145,7 @@
TableViewColumn{
role: "value"
title: "Value"
- width: 200
+ width: 300
}
}
}
@@ -164,6 +164,36 @@
}
}
}
+ Tab {
+ title: "Add/Delete Route"
+ Column {
+ spacing: 2
+ anchors.fill: parent
+ anchors.topMargin: 20
+ anchors.bottomMargin: 20
+ anchors.leftMargin: 20
+ }
+
+ Row {
+ spacing: 20
+ anchors.topMargin: 30
+ anchors.leftMargin: 10
+ anchors.rightMargin: 10
+ anchors.bottomMargin: 10
+ anchors.fill: parent
+ TextField {
+ focus: true
+ }
+ Button {
+ text: "Add Route"
+ onClicked: trayModel.addRoute(TextField.text);
+ }
+ Button {
+ text: "Delete Route"
+ onClicked: trayModel.deleteRoute(TextField.text);
+ }
+ }
+ }
}
Connections {
target: trayModel;
diff --git a/src/tray-menu.cpp b/src/tray-menu.cpp
index c34a2f2..115cec1 100644
--- a/src/tray-menu.cpp
+++ b/src/tray-menu.cpp
@@ -141,6 +141,39 @@
// #endif
}
+Q_INVOKABLE void
+TrayMenu::addDeleteRoute()
+{
+ addRoute();
+}
+
+Q_INVOKABLE void
+TrayMenu::addRoute()
+{
+ std::cout << "Adding route" << std::endl;
+ QString cmd = "nfdc register /test tcp4://localhost";
+ QProcess *addNewRoute = new QProcess();
+ connect(addNewRoute,SIGNAL(finished(int)), addNewRoute, SLOT(deleteLater()));
+ addNewRoute->start("bash", QStringList() << "-c" << cmd);
+ std::cout << "Done" << std::endl;
+
+
+// QProcess * proc = new QProcess();
+}
+
+void
+TrayMenu::deleteRoute()
+{
+ std::cout << "Deleting route" << std::endl;
+ QString cmd = "nfdc unregister /test tcp4://localhost";
+ QProcess *addNewRoute = new QProcess();
+ connect(addNewRoute,SIGNAL(finished(int)), addNewRoute, SLOT(deleteLater()));
+ addNewRoute->start("bash", QStringList() << "-c" << cmd);
+ std::cout << "Done" << std::endl;
+
+}
+
+
void
TrayMenu::updateNfdActivityIcon(bool isActive)
{
diff --git a/src/tray-menu.hpp b/src/tray-menu.hpp
index 0ffdcb3..952260a 100644
--- a/src/tray-menu.hpp
+++ b/src/tray-menu.hpp
@@ -55,6 +55,15 @@
Q_INVOKABLE void
startStopNfd();
+ Q_INVOKABLE void
+ addDeleteRoute();
+
+ Q_INVOKABLE void
+ addRoute();
+
+ Q_INVOKABLE void
+ deleteRoute();
+
private slots:
void
@@ -69,6 +78,7 @@
void
stopNfd();
+
void
updateNfdActivityIcon(bool isActive);