nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 22:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Tweak GETINFO process/* code: no need to print an int as anything other than %d

Browse Source
This commit is contained in:
Nick Mathewson 2011-01-03 12:11:09 -05:00
parent 8708ffa655
commit 1e295666d9
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/getinfo_process Normal file
View File

@ -0,0 +1,3 @@
o Minor features
- Implement some GETINFO controller fields to provide information about
the Tor process's pid, euid, username, and resource limits.

8
src/or/control.c
View File

@ -1359,13 +1359,13 @@ getinfo_helper_misc(control_connection_t *conn, const char *question,
myPid = getpid(); myPid = getpid();
#endif #endif
tor_asprintf(answer, U64_FORMAT, U64_PRINTF_ARG(myPid)); tor_asprintf(answer, "%d", myPid);
} else if (!strcmp(question, "process/uid")) { } else if (!strcmp(question, "process/uid")) {
#ifdef MS_WINDOWS #ifdef MS_WINDOWS
*answer = tor_strdup("-1"); *answer = tor_strdup("-1");
#else #else
int myUid = geteuid(); int myUid = geteuid();
tor_asprintf(answer, U64_FORMAT, U64_PRINTF_ARG(myUid)); tor_asprintf(answer, "%d", myUid);
#endif #endif
} else if (!strcmp(question, "process/user")) { } else if (!strcmp(question, "process/user")) {
#ifdef MS_WINDOWS #ifdef MS_WINDOWS
@ -1383,12 +1383,14 @@ getinfo_helper_misc(control_connection_t *conn, const char *question,
} else if (!strcmp(question, "process/descriptor-limit")) { } else if (!strcmp(question, "process/descriptor-limit")) {
/** platform specifc limits are from the set_max_file_descriptors function /** platform specifc limits are from the set_max_file_descriptors function
* of src/common/compat.c */ * of src/common/compat.c */
/* XXXX023 This is duplicated code from compat.c; it should turn into a
* function. */
#ifdef HAVE_GETRLIMIT #ifdef HAVE_GETRLIMIT
struct rlimit descriptorLimit; struct rlimit descriptorLimit;
if (getrlimit(RLIMIT_NOFILE, &descriptorLimit) == 0) { if (getrlimit(RLIMIT_NOFILE, &descriptorLimit) == 0) {
tor_asprintf(answer, U64_FORMAT, tor_asprintf(answer, U64_FORMAT,
U64_PRINTF_ARG(descriptorLimit.rlim_max)); U64_PRINTF_ARG(descriptorLimit.rlim_max));
} else { } else {
*answer = tor_strdup("-1"); *answer = tor_strdup("-1");
} }