From: Steven Rostedt <rostedt@goodmis.org>
To: linux-trace-devel@vger.kernel.org
Cc: "Steven Rostedt (Google)" <rostedt@goodmis.org>
Subject: [PATCH v2 7/9] trace-cmd: Add print helpers to show connections
Date: Sun, 17 Apr 2022 14:45:36 -0400 [thread overview]
Message-ID: <20220417184538.1044417-8-rostedt@goodmis.org> (raw)
In-Reply-To: <20220417184538.1044417-1-rostedt@goodmis.org>
From: "Steven Rostedt (Google)" <rostedt@goodmis.org>
Add helper functions trace_net_print_connection() and
trace_vsock_print_connection() to print the host/port or cid/port that
has connected.
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
---
tracecmd/include/trace-local.h | 6 ++++++
tracecmd/trace-agent.c | 14 ++++++++++++++
tracecmd/trace-listen.c | 22 ++++++++++++++++++++++
tracecmd/trace-vsock.c | 20 ++++++++++++++++++++
4 files changed, 62 insertions(+)
diff --git a/tracecmd/include/trace-local.h b/tracecmd/include/trace-local.h
index fdb0d887557f..b3230529a45c 100644
--- a/tracecmd/include/trace-local.h
+++ b/tracecmd/include/trace-local.h
@@ -311,6 +311,7 @@ extern struct buffer_instance *first_instance;
int trace_net_make(int port, enum port_type type);
int trace_net_search(int start_port, int *sfd, enum port_type type);
+int trace_net_print_connection(int fd);
struct buffer_instance *allocate_instance(const char *name);
void add_instance(struct buffer_instance *instance, int cpu_count);
@@ -366,6 +367,7 @@ int get_vsocket_params(int fd, unsigned int *lcid, unsigned int *rcid);
int trace_vsock_get_port(int sd, unsigned int *port);
bool trace_vsock_can_splice_read(void);
int trace_vsock_local_cid(void);
+int trace_vsock_print_connection(int fd);
#else
static inline int trace_vsock_open(unsigned int cid, unsigned int port)
{
@@ -403,6 +405,10 @@ static inline int trace_vsock_local_cid(void)
{
return -ENOTSUP;
}
+static inline int trace_vsock_print_connection(int fd)
+{
+ return -1;
+}
#endif /* VSOCK */
/* No longer in event-utils.h */
diff --git a/tracecmd/trace-agent.c b/tracecmd/trace-agent.c
index 819ac016612f..59cecae770a6 100644
--- a/tracecmd/trace-agent.c
+++ b/tracecmd/trace-agent.c
@@ -109,6 +109,18 @@ static char *get_clock(int argc, char **argv)
return NULL;
}
+static void trace_print_connection(int fd, bool network)
+{
+ int ret;
+
+ if (network)
+ ret = trace_net_print_connection(fd);
+ else
+ ret = trace_vsock_print_connection(fd);
+ if (ret < 0)
+ tracecmd_debug("Could not print connection fd:%d\n", fd);
+}
+
static void agent_handle(int sd, int nr_cpus, int page_size, bool network)
{
struct tracecmd_tsync_protos *tsync_protos = NULL;
@@ -273,6 +285,8 @@ static void agent_serve(unsigned int port, bool do_daemon, bool network)
continue;
die("accept");
}
+ if (tracecmd_get_debug())
+ trace_print_connection(cd, network);
if (handler_pid)
goto busy;
diff --git a/tracecmd/trace-listen.c b/tracecmd/trace-listen.c
index 3b446acea972..b7be761d032e 100644
--- a/tracecmd/trace-listen.c
+++ b/tracecmd/trace-listen.c
@@ -756,6 +756,28 @@ static int do_fork(int cfd)
return 0;
}
+int trace_net_print_connection(int fd)
+{
+ char host[NI_MAXHOST], service[NI_MAXSERV];
+ struct sockaddr_storage net_addr;
+ socklen_t addr_len;
+
+ addr_len = sizeof(net_addr);
+ if (getpeername(fd, (struct sockaddr *)&net_addr, &addr_len))
+ return -1;
+
+ if (getnameinfo((struct sockaddr *)&net_addr, addr_len,
+ host, NI_MAXHOST,
+ service, NI_MAXSERV, NI_NUMERICSERV))
+ return -1;
+
+ if (tracecmd_get_debug())
+ tracecmd_debug("Connected to %s:%s fd:%d\n", host, service, fd);
+ else
+ tracecmd_plog("Connected to %s:%s\n", host, service);
+ return 0;
+}
+
static int do_connection(int cfd, struct sockaddr *addr,
socklen_t addr_len)
{
diff --git a/tracecmd/trace-vsock.c b/tracecmd/trace-vsock.c
index d18ecb45004e..39294e7a2a3c 100644
--- a/tracecmd/trace-vsock.c
+++ b/tracecmd/trace-vsock.c
@@ -94,6 +94,26 @@ int get_vsocket_params(int fd, unsigned int *lcid, unsigned int *rcid)
return 0;
}
+int trace_vsock_print_connection(int fd)
+{
+ struct sockaddr_vm vm_addr;
+ socklen_t addr_len;
+ int cid, port;
+
+ addr_len = sizeof(vm_addr);
+ if (getpeername(fd, (struct sockaddr *)&vm_addr, &addr_len))
+ return -1;
+ if (vm_addr.svm_family != AF_VSOCK)
+ return -1;
+ cid = vm_addr.svm_cid;
+ port = vm_addr.svm_port;
+ if (tracecmd_get_debug())
+ tracecmd_debug("Connected to @%u:%u fd:%d\n", cid, port, fd);
+ else
+ tracecmd_plog("Connected to @%u:%u\n", cid, port);
+ return 0;
+}
+
static int try_splice_read_vsock(void)
{
int ret, sd, brass[2];
--
2.35.1
next prev parent reply other threads:[~2022-04-17 18:45 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-17 18:45 [PATCH v2 0/9] trace-cmd: Allow agent to use networking Steven Rostedt
2022-04-17 18:45 ` [PATCH v2 1/9] trace-cmd record: Move port_type into instance Steven Rostedt
2022-04-18 10:22 ` Tzvetomir Stoyanov
2022-04-18 19:33 ` Steven Rostedt
2022-04-17 18:45 ` [PATCH v2 2/9] trace-cmd library: Add network roles for time sync Steven Rostedt
2022-04-17 18:45 ` [PATCH v2 3/9] trace-cmd record: Allow for ip connections to agents Steven Rostedt
2022-04-17 18:45 ` [PATCH v2 4/9] trace-cmd agent: Allow for ip connections from the agent Steven Rostedt
2022-04-18 10:22 ` Tzvetomir Stoyanov
2022-04-18 19:37 ` Steven Rostedt
2022-04-17 18:45 ` [PATCH v2 5/9] trace-cmd library: Create tracecmd_debug() for debug printing Steven Rostedt
2022-04-17 18:45 ` [PATCH v2 6/9] trace-cmd: Add debug prints for network connections Steven Rostedt
2022-04-17 18:45 ` Steven Rostedt [this message]
2022-04-17 18:45 ` [PATCH v2 8/9] trace-cmd: Override tracecmd_debug() to show thread id Steven Rostedt
2022-04-17 18:45 ` [PATCH v2 9/9] trace-cmd agent: Have agent work without vsockets available Steven Rostedt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220417184538.1044417-8-rostedt@goodmis.org \
--to=rostedt@goodmis.org \
--cc=linux-trace-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).