Browse Source

qt: sam session is now shown at qt->sam sessions, work towards #914

pull/1606/head
user 4 years ago
parent
commit
5c2f1f36e8
  1. 2
      daemon/HTTPServer.cpp
  2. 1
      daemon/HTTPServer.h
  3. 12
      qt/i2pd_qt/mainwindow.cpp

2
daemon/HTTPServer.cpp

@ -820,7 +820,7 @@ namespace http { @@ -820,7 +820,7 @@ namespace http {
s << "<b>SAM Sessions:</b> no sessions currently running.<br>\r\n";
}
static void ShowSAMSession (std::stringstream& s, const std::string& id)
void ShowSAMSession (std::stringstream& s, const std::string& id)
{
auto sam = i2p::client::context.GetSAMBridge ();
if (!sam) {

1
daemon/HTTPServer.h

@ -98,6 +98,7 @@ namespace http @@ -98,6 +98,7 @@ namespace http
void ShowSAMSessions (std::stringstream& s);
void ShowI2PTunnels (std::stringstream& s);
void ShowLocalDestination (std::stringstream& s, const std::string& b32, uint32_t token);
void ShowSAMSession (std::stringstream& s, const std::string& id);
} // http
} // i2p

12
qt/i2pd_qt/mainwindow.cpp

@ -1001,7 +1001,14 @@ void MainWindow::anchorClickedHandler(const QUrl & link) { @@ -1001,7 +1001,14 @@ void MainWindow::anchorClickedHandler(const QUrl & link) {
url.parse_query(params);
const std::string page = params["page"];
const std::string cmd = params["cmd"];
if(page == "local_destination") {
if(page == "sam_session") {
const std::string samID = params["sam_id"];
pageWithBackButton->show();
textBrowser->hide();
std::stringstream s;
i2p::http::ShowSAMSession (s, samID);
childTextBrowser->setHtml(QString::fromStdString(s.str()));
} else if(page == "local_destination") {
std::string b32 = params["b32"];
currentLocalDestinationB32 = b32;
pageWithBackButton->show();
@ -1010,8 +1017,7 @@ void MainWindow::anchorClickedHandler(const QUrl & link) { @@ -1010,8 +1017,7 @@ void MainWindow::anchorClickedHandler(const QUrl & link) {
std::string strstd = currentLocalDestinationB32;
i2p::http::ShowLocalDestination(s,strstd,0);
childTextBrowser->setHtml(QString::fromStdString(s.str()));
}
if(cmd == "closestream") {
} else if(cmd == "closestream") {
std::string b32 = params["b32"];
uint32_t streamID = std::stoul(params["streamID"], nullptr);

Loading…
Cancel
Save