aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
Diffstat (limited to 'contrib')
-rw-r--r--contrib/epee/include/console_handler.h6
-rw-r--r--contrib/epee/include/net/abstract_tcp_server2.inl6
-rw-r--r--contrib/epee/include/net/levin_client.inl4
-rw-r--r--contrib/epee/include/net/levin_client_async.h2
-rw-r--r--contrib/epee/include/net/levin_helper.h4
-rw-r--r--contrib/epee/include/net/levin_protocol_handler.h4
-rw-r--r--contrib/epee/include/net/net_helper.h2
-rw-r--r--contrib/epee/include/readline_buffer.h13
-rw-r--r--contrib/epee/include/storages/portable_storage.h2
-rw-r--r--contrib/epee/src/mlog.cpp6
-rw-r--r--contrib/epee/src/readline_buffer.cpp72
11 files changed, 90 insertions, 31 deletions
diff --git a/contrib/epee/include/console_handler.h b/contrib/epee/include/console_handler.h
index 6832f2ea1..e780ad4de 100644
--- a/contrib/epee/include/console_handler.h
+++ b/contrib/epee/include/console_handler.h
@@ -374,6 +374,9 @@ namespace epee
}
else
{
+#ifdef HAVE_READLINE
+ rdln::suspend_readline pause_readline;
+#endif
std::cout << "unknown command: " << command << std::endl;
std::cout << usage;
}
@@ -477,6 +480,9 @@ namespace epee
lookup::mapped_type & vt = m_command_handlers[cmd];
vt.first = hndlr;
vt.second = usage;
+#ifdef HAVE_READLINE
+ rdln::readline_buffer::add_completion(cmd);
+#endif
}
bool process_command_vec(const std::vector<std::string>& cmd)
diff --git a/contrib/epee/include/net/abstract_tcp_server2.inl b/contrib/epee/include/net/abstract_tcp_server2.inl
index 0fbd9ed28..61276e761 100644
--- a/contrib/epee/include/net/abstract_tcp_server2.inl
+++ b/contrib/epee/include/net/abstract_tcp_server2.inl
@@ -209,14 +209,14 @@ PRAGMA_WARNING_DISABLE_VS(4355)
bool connection<t_protocol_handler>::add_ref()
{
TRY_ENTRY();
- //_dbg3("[sock " << socket_.native_handle() << "] add_ref, m_peer_number=" << mI->m_peer_number);
- CRITICAL_REGION_LOCAL(m_self_refs_lock);
- //_dbg3("[sock " << socket_.native_handle() << "] add_ref 2, m_peer_number=" << mI->m_peer_number);
// Use safe_shared_from_this, because of this is public method and it can be called on the object being deleted
auto self = safe_shared_from_this();
if(!self)
return false;
+ //_dbg3("[sock " << socket_.native_handle() << "] add_ref, m_peer_number=" << mI->m_peer_number);
+ CRITICAL_REGION_LOCAL(self->m_self_refs_lock);
+ //_dbg3("[sock " << socket_.native_handle() << "] add_ref 2, m_peer_number=" << mI->m_peer_number);
if(m_was_shutdown)
return false;
m_self_refs.push_back(self);
diff --git a/contrib/epee/include/net/levin_client.inl b/contrib/epee/include/net/levin_client.inl
index 50a01aaa5..ab7c32c32 100644
--- a/contrib/epee/include/net/levin_client.inl
+++ b/contrib/epee/include/net/levin_client.inl
@@ -99,7 +99,7 @@ int levin_client_impl::invoke(int command, const std::string& in_buff, std::stri
if(head.m_signature!=LEVIN_SIGNATURE)
{
- LOG_PRINT_L1("Signature missmatch in response");
+ LOG_PRINT_L1("Signature mismatch in response");
return -1;
}
@@ -160,7 +160,7 @@ inline
if(head.m_signature!=LEVIN_SIGNATURE)
{
- LOG_PRINT_L1("Signature missmatch in response");
+ LOG_PRINT_L1("Signature mismatch in response");
return -1;
}
diff --git a/contrib/epee/include/net/levin_client_async.h b/contrib/epee/include/net/levin_client_async.h
index 4b48070d6..337d345c4 100644
--- a/contrib/epee/include/net/levin_client_async.h
+++ b/contrib/epee/include/net/levin_client_async.h
@@ -408,7 +408,7 @@ namespace levin
if(head.m_signature!=LEVIN_SIGNATURE)
{
- LOG_ERROR("Signature missmatch in response");
+ LOG_ERROR("Signature mismatch in response");
return false;
}
diff --git a/contrib/epee/include/net/levin_helper.h b/contrib/epee/include/net/levin_helper.h
index c51d7244b..05560dd90 100644
--- a/contrib/epee/include/net/levin_helper.h
+++ b/contrib/epee/include/net/levin_helper.h
@@ -94,7 +94,7 @@ namespace levin
}
if(head.m_cb != buff.size()-sizeof(levin::bucket_head))
{
- LOG_PRINT_L3("sizes missmatch, at load_struct_from_levin_message");
+ LOG_PRINT_L3("sizes mismatch, at load_struct_from_levin_message");
return false;
}
@@ -121,7 +121,7 @@ namespace levin
}
if(head.m_cb != buff.size()-sizeof(levin::bucket_head))
{
- LOG_ERROR("sizes missmatch, at load_struct_from_levin_message");
+ LOG_ERROR("sizes mismatch, at load_struct_from_levin_message");
return false;
}
diff --git a/contrib/epee/include/net/levin_protocol_handler.h b/contrib/epee/include/net/levin_protocol_handler.h
index 3e1b8493a..fbc9727e2 100644
--- a/contrib/epee/include/net/levin_protocol_handler.h
+++ b/contrib/epee/include/net/levin_protocol_handler.h
@@ -103,7 +103,7 @@ namespace levin
{
if(m_cach_in_buffer.size() >= sizeof(uint64_t) && *((uint64_t*)m_cach_in_buffer.data()) != LEVIN_SIGNATURE)
{
- LOG_ERROR_CC(m_conn_context, "Signature missmatch on accepted connection");
+ LOG_ERROR_CC(m_conn_context, "Signature mismatch on accepted connection");
return false;
}
is_continue = false;
@@ -113,7 +113,7 @@ namespace levin
bucket_head* phead = (bucket_head*)m_cach_in_buffer.data();
if(LEVIN_SIGNATURE != phead->m_signature)
{
- LOG_ERROR_CC(m_conn_context, "Signature missmatch on accepted connection");
+ LOG_ERROR_CC(m_conn_context, "Signature mismatch on accepted connection");
return false;
}
m_current_head = *phead;
diff --git a/contrib/epee/include/net/net_helper.h b/contrib/epee/include/net/net_helper.h
index 432169990..1d808cc4c 100644
--- a/contrib/epee/include/net/net_helper.h
+++ b/contrib/epee/include/net/net_helper.h
@@ -473,7 +473,7 @@ namespace net_utils
if(bytes_transfered != buff.size())
{
- LOG_ERROR("Transferred missmatch with transfer_at_least value: m_bytes_transferred=" << bytes_transfered << " at_least value=" << buff.size());
+ LOG_ERROR("Transferred mismatch with transfer_at_least value: m_bytes_transferred=" << bytes_transfered << " at_least value=" << buff.size());
return false;
}
diff --git a/contrib/epee/include/readline_buffer.h b/contrib/epee/include/readline_buffer.h
index 916d14f01..8dd082a70 100644
--- a/contrib/epee/include/readline_buffer.h
+++ b/contrib/epee/include/readline_buffer.h
@@ -3,6 +3,8 @@
#include <streambuf>
#include <sstream>
#include <iostream>
+#include <vector>
+#include <algorithm>
namespace rdln
{
@@ -19,12 +21,23 @@ namespace rdln
}
void get_line(std::string& line) const;
void set_prompt(const std::string& prompt);
+ static void add_completion(const std::string& command)
+ {
+ if(std::find(completion_commands.begin(), completion_commands.end(), command) != completion_commands.end())
+ return;
+ completion_commands.push_back(command);
+ }
+ static const std::vector<std::string>& get_completions()
+ {
+ return completion_commands;
+ }
protected:
virtual int sync();
private:
std::streambuf* m_cout_buf;
+ static std::vector<std::string> completion_commands;
};
class suspend_readline
diff --git a/contrib/epee/include/storages/portable_storage.h b/contrib/epee/include/storages/portable_storage.h
index ba9292306..2023e2f2a 100644
--- a/contrib/epee/include/storages/portable_storage.h
+++ b/contrib/epee/include/storages/portable_storage.h
@@ -158,7 +158,7 @@ namespace epee
pbuff->m_signature_b != PORTABLE_STORAGE_SIGNATUREB
)
{
- LOG_ERROR("portable_storage: wrong binary format - signature missmatch");
+ LOG_ERROR("portable_storage: wrong binary format - signature mismatch");
return false;
}
if(pbuff->m_ver != PORTABLE_STORAGE_FORMAT_VER)
diff --git a/contrib/epee/src/mlog.cpp b/contrib/epee/src/mlog.cpp
index 3be992374..a51654d36 100644
--- a/contrib/epee/src/mlog.cpp
+++ b/contrib/epee/src/mlog.cpp
@@ -91,10 +91,10 @@ static const char *get_default_categories(int level)
switch (level)
{
case 0:
- categories = "*:WARNING,net:FATAL,net.p2p:FATAL,net.cn:FATAL,global:INFO,verify:FATAL,stacktrace:INFO,logging:INFO";
+ categories = "*:WARNING,net:FATAL,net.p2p:FATAL,net.cn:FATAL,global:INFO,verify:FATAL,stacktrace:INFO,logging:INFO,msgwriter:INFO";
break;
case 1:
- categories = "*:WARNING,global:INFO,stacktrace:INFO,logging:INFO";
+ categories = "*:WARNING,global:INFO,stacktrace:INFO,logging:INFO,msgwriter:INFO";
break;
case 2:
categories = "*:DEBUG";
@@ -139,7 +139,7 @@ void mlog_configure(const std::string &filename_base, bool console)
{
monero_log = get_default_categories(0);
}
- mlog_set_categories(monero_log);
+ mlog_set_log(monero_log);
}
void mlog_set_categories(const char *categories)
diff --git a/contrib/epee/src/readline_buffer.cpp b/contrib/epee/src/readline_buffer.cpp
index c846641bd..549f49d45 100644
--- a/contrib/epee/src/readline_buffer.cpp
+++ b/contrib/epee/src/readline_buffer.cpp
@@ -6,6 +6,7 @@
#include <mutex>
#include <condition_variable>
#include <boost/thread.hpp>
+#include <boost/algorithm/string.hpp>
static int process_input();
static void install_line_handler();
@@ -16,6 +17,8 @@ static std::string last_prompt;
std::mutex line_mutex, sync_mutex, process_mutex;
std::condition_variable have_line;
+std::vector<std::string> rdln::readline_buffer::completion_commands = {"exit"};
+
namespace
{
rdln::readline_buffer* current = NULL;
@@ -59,6 +62,7 @@ void rdln::readline_buffer::start()
void rdln::readline_buffer::stop()
{
std::unique_lock<std::mutex> lock(process_mutex);
+ have_line.notify_all();
if(m_cout_buf == NULL)
return;
std::cout.rdbuf(m_cout_buf);
@@ -78,6 +82,7 @@ void rdln::readline_buffer::set_prompt(const std::string& prompt)
last_prompt = prompt;
if(m_cout_buf == NULL)
return;
+ std::lock_guard<std::mutex> lock(sync_mutex);
rl_set_prompt(last_prompt.c_str());
rl_redisplay();
}
@@ -112,8 +117,7 @@ int rdln::readline_buffer::sync()
do
{
- char x = this->sgetc();
- m_cout_buf->sputc(x);
+ m_cout_buf->sputc( this->sgetc() );
}
while ( this->snextc() != EOF );
@@ -148,43 +152,44 @@ static int process_input()
static void handle_line(char* line)
{
- if (line != NULL)
+ if(last_line == "exit" || last_line == "q")
{
- std::lock_guard<std::mutex> lock(sync_mutex);
- rl_set_prompt(last_prompt.c_str());
- rl_already_prompted = 1;
return;
}
- rl_set_prompt("");
- rl_replace_line("", 0);
- rl_redisplay();
+ std::lock_guard<std::mutex> lock(sync_mutex);
rl_set_prompt(last_prompt.c_str());
+ rl_already_prompted = 1;
}
static int handle_enter(int x, int y)
{
std::lock_guard<std::mutex> lock(sync_mutex);
char* line = NULL;
-
+
line = rl_copy_text(0, rl_end);
+ rl_crlf();
+ rl_on_new_line();
rl_set_prompt("");
rl_replace_line("", 1);
rl_redisplay();
- if (strcmp(line, "") != 0)
+ std::string test_line = line;
+ boost::trim_right(test_line);
+ if (test_line.length() > 0)
{
- last_line = line;
- add_history(line);
+ last_line = test_line;
+ add_history(test_line.c_str());
have_line.notify_one();
}
free(line);
-
- if(last_line != "exit")
+
+ if(last_line != "exit" && last_line != "q")
{
rl_set_prompt(last_prompt.c_str());
+ rl_on_new_line_with_prompt();
rl_redisplay();
}
-
+
rl_done = 1;
return 0;
}
@@ -196,15 +201,50 @@ static int startup_hook()
return 0;
}
+static char* completion_matches(const char* text, int state)
+{
+ static size_t list_index;
+ static size_t len;
+
+ if(state == 0)
+ {
+ list_index = 0;
+ len = strlen(text);
+ }
+
+ const std::vector<std::string>& completions = rdln::readline_buffer::get_completions();
+ for(; list_index<completions.size(); )
+ {
+ const std::string& cmd = completions[list_index++];
+ if(cmd.compare(0, len, text) == 0)
+ {
+ return strdup(cmd.c_str());
+ }
+ }
+
+ return NULL;
+}
+
+static char** attempted_completion(const char* text, int start, int end)
+{
+ rl_attempted_completion_over = 1;
+ return rl_completion_matches(text, completion_matches);
+}
+
static void install_line_handler()
{
rl_startup_hook = startup_hook;
+ rl_attempted_completion_function = attempted_completion;
rl_callback_handler_install("", handle_line);
}
static void remove_line_handler()
{
+ rl_replace_line("", 0);
+ rl_set_prompt("");
+ rl_redisplay();
rl_unbind_key(RETURN);
+ rl_unbind_key(NEWLINE);
rl_callback_handler_remove();
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-27 13:11:08 +0000