backup/cgproxy
1
0
Fork 0
mirror of https://github.com/springzfx/cgproxy.git synced 2026-03-15 09:32:09 +08:00
Code Issues 1 Projects Releases Wiki Activity

use deltype

Browse Source
This commit is contained in:
springzfx
2020-05-29 19:32:54 +08:00
parent 75751f4887
commit cc83c1ae55
5 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/cgproxyd.hpp
View File

@@ -27,8 +27,6 @@ using namespace ::CGPROXY::CGROUP;
// using namespace ::CGPROXY::EXECSNOOP;
namespace CGPROXY::EXECSNOOP {
typedef void *(*startThread_t)(void *arg);
startThread_t _startThread;
bool loadExecsnoopLib() {
try {
info("loading %s", LIBEXECSNOOP_SO);
@@ -37,7 +35,8 @@ bool loadExecsnoopLib() {
error("dlopen %s failed: %s", LIBEXECSNOOP_SO, dlerror());
return false;
}
_startThread = reinterpret_cast<startThread_t>(dlsym(handle_dl, "_startThread"));
_startThread =
reinterpret_cast<decltype(&startThread)>(dlsym(handle_dl, "startThread"));
if (_startThread == NULL) {
error("dlsym startThread failed: %s", dlerror());
return false;

6
src/cgroup_attach.cpp
View File

@@ -17,11 +17,11 @@ string cgroup2_mount_point = get_cgroup2_mount_point();
string get_cgroup2_mount_point() {
stringstream buffer;
FILE *fp = popen("findmnt -t cgroup2 -n -o TARGET", "r");
unique_ptr<FILE, decltype(&pclose)> fp(popen("findmnt -t cgroup2 -n -o TARGET", "r"),
&pclose);
if (!fp) return "";
char buf[READ_SIZE_MAX];
while (fgets(buf, READ_SIZE_MAX, fp) != NULL) { buffer << buf; }
pclose(fp);
while (fgets(buf, READ_SIZE_MAX, fp.get()) != NULL) { buffer << buf; }
string s = buffer.str();
s.pop_back(); // remove newline character
return s;

20
src/common.cpp
View File

@@ -51,21 +51,21 @@ bool dirExist(const string &path) {
vector<int> bash_pidof(const string &path) {
vector<int> pids;
FILE *fp = popen(to_str("pidof ", path).c_str(), "r");
unique_ptr<FILE, decltype(&pclose)> fp(popen(to_str("pidof ", path).c_str(), "r"),
&pclose);
if (!fp) return pids;
int pid;
while (fscanf(fp, "%d", &pid) != EOF) { pids.push_back(pid); }
pclose(fp);
while (fscanf(fp.get(), "%d", &pid) != EOF) { pids.push_back(pid); }
return pids;
}
string bash_which(const string &name) {
stringstream buffer;
FILE *fp = popen(to_str("which ", name).c_str(), "r");
unique_ptr<FILE, decltype(&pclose)> fp(popen(to_str("which ", name).c_str(), "r"),
&pclose);
if (!fp) return "";
char buf[READ_SIZE_MAX];
while (fgets(buf, READ_SIZE_MAX, fp) != NULL) { buffer << buf; }
pclose(fp);
while (fgets(buf, READ_SIZE_MAX, fp.get()) != NULL) { buffer << buf; }
string s = buffer.str();
s.pop_back(); // remove newline character
return s;
@@ -73,11 +73,11 @@ string bash_which(const string &name) {
string bash_readlink(const string &path) {
stringstream buffer;
FILE *fp = popen(to_str("readlink -e ", path).c_str(), "r");
unique_ptr<FILE, decltype(&pclose)> fp(popen(to_str("readlink -e ", path).c_str(), "r"),
&pclose);
if (!fp) return "";
char buf[READ_SIZE_MAX];
while (fgets(buf, READ_SIZE_MAX, fp) != NULL) { buffer << buf; }
pclose(fp);
while (fgets(buf, READ_SIZE_MAX, fp.get()) != NULL) { buffer << buf; }
string s = buffer.str();
s.pop_back(); // remove newline character
return s;
@@ -112,7 +112,7 @@ string getCgroup(const string &pid) {
ifstream ifs(cgroup_f);
debug("prcessing file %s", cgroup_f.c_str());
while (ifs.good() && getline(ifs, line)) {
debug("process line: %s", line.c_str());
debug("process line: %s", line.c_str());
if (line[0] == '0') {
cgroup = line.substr(3);
debug("get cgroup of %s: %s", pid.c_str(), cgroup.c_str());

4
src/execsnoop.cpp
View File

@@ -97,6 +97,4 @@ void *startThread(void *arg) {
return (void *)0;
}
} // namespace CGPROXY::EXECSNOOP
extern "C" void *_startThread(void *arg) { return CGPROXY::EXECSNOOP::startThread(arg); }
} // namespace CGPROXY::EXECSNOOP

3
src/execsnoop.h
View File

@@ -16,7 +16,8 @@ int execsnoop();
struct thread_arg {
function<int(int)> handle_pid;
};
void *startThread(void *arg);
extern "C" void *startThread(void *arg);
decltype(&startThread) _startThread; // only for dlsym()
} // namespace CGPROXY::EXECSNOOP
#endif