chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ignore rule with GOTO to a non-existent label
[elogind.git]
/
udevmonitor.c
diff --git
a/udevmonitor.c
b/udevmonitor.c
index 2efb705b6d945e87e035e6645c810a289aa1466d..2430dd39a557fe1411d9b21380e501126b32ce36 100644
(file)
--- a/
udevmonitor.c
+++ b/
udevmonitor.c
@@
-1,7
+1,5
@@
/*
/*
- * udevmonitor.c
- *
- * Copyright (C) 2004-2005 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2004-2006 Kay Sievers <kay.sievers@vrfy.org>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@
-14,17
+12,20
@@
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
- *
675 Mass Ave, Cambridge, MA 02139
, USA.
+ *
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
, USA.
*
*/
#include <unistd.h>
#include <stdio.h>
#include <stdlib.h>
*
*/
#include <unistd.h>
#include <stdio.h>
#include <stdlib.h>
+#include <stddef.h>
#include <string.h>
#include <fcntl.h>
#include <string.h>
#include <fcntl.h>
-#include <time.h>
#include <errno.h>
#include <errno.h>
+#include <signal.h>
+#include <getopt.h>
+#include <sys/time.h>
#include <sys/socket.h>
#include <sys/un.h>
#include <sys/select.h>
#include <sys/socket.h>
#include <sys/un.h>
#include <sys/select.h>
@@
-33,42
+34,38
@@
#include "udev.h"
#include "udevd.h"
#include "udev.h"
#include "udevd.h"
-#include "udev_utils.h"
-#include "udev_libc_wrapper.h"
-static int uevent_netlink_sock;
-static int udev_monitor_sock;
+static int uevent_netlink_sock = -1;
+static int udev_monitor_sock = -1;
+static volatile int udev_exit;
static int init_udev_monitor_socket(void)
{
struct sockaddr_un saddr;
socklen_t addrlen;
static int init_udev_monitor_socket(void)
{
struct sockaddr_un saddr;
socklen_t addrlen;
- const int feature_on = 1;
int retval;
memset(&saddr, 0x00, sizeof(saddr));
saddr.sun_family = AF_LOCAL;
/* use abstract namespace for socket path */
strcpy(&saddr.sun_path[1], "/org/kernel/udev/monitor");
int retval;
memset(&saddr, 0x00, sizeof(saddr));
saddr.sun_family = AF_LOCAL;
/* use abstract namespace for socket path */
strcpy(&saddr.sun_path[1], "/org/kernel/udev/monitor");
- addrlen = offsetof(struct sockaddr_un, sun_path) +
strlen(saddr.sun_path+1) + 1
;
+ addrlen = offsetof(struct sockaddr_un, sun_path) +
1 + strlen(&saddr.sun_path[1])
;
udev_monitor_sock = socket(AF_LOCAL, SOCK_DGRAM, 0);
if (udev_monitor_sock == -1) {
udev_monitor_sock = socket(AF_LOCAL, SOCK_DGRAM, 0);
if (udev_monitor_sock == -1) {
- fprintf(stderr, "error getting socket
,
%s\n", strerror(errno));
+ fprintf(stderr, "error getting socket
:
%s\n", strerror(errno));
return -1;
}
/* the bind takes care of ensuring only one copy running */
retval = bind(udev_monitor_sock, (struct sockaddr *) &saddr, addrlen);
if (retval < 0) {
return -1;
}
/* the bind takes care of ensuring only one copy running */
retval = bind(udev_monitor_sock, (struct sockaddr *) &saddr, addrlen);
if (retval < 0) {
- fprintf(stderr, "bind failed
,
%s\n", strerror(errno));
+ fprintf(stderr, "bind failed
:
%s\n", strerror(errno));
close(udev_monitor_sock);
close(udev_monitor_sock);
+ udev_monitor_sock = -1;
return -1;
}
return -1;
}
- /* enable receiving of the sender credentials */
- setsockopt(udev_monitor_sock, SOL_SOCKET, SO_PASSCRED, &feature_on, sizeof(feature_on));
-
return 0;
}
return 0;
}
@@
-80,18
+77,18
@@
static int init_uevent_netlink_sock(void)
memset(&snl, 0x00, sizeof(struct sockaddr_nl));
snl.nl_family = AF_NETLINK;
snl.nl_pid = getpid();
memset(&snl, 0x00, sizeof(struct sockaddr_nl));
snl.nl_family = AF_NETLINK;
snl.nl_pid = getpid();
- snl.nl_groups =
0xffffffff
;
+ snl.nl_groups =
1
;
uevent_netlink_sock = socket(PF_NETLINK, SOCK_DGRAM, NETLINK_KOBJECT_UEVENT);
if (uevent_netlink_sock == -1) {
uevent_netlink_sock = socket(PF_NETLINK, SOCK_DGRAM, NETLINK_KOBJECT_UEVENT);
if (uevent_netlink_sock == -1) {
- fprintf(stderr, "error getting socket
,
%s\n", strerror(errno));
+ fprintf(stderr, "error getting socket
:
%s\n", strerror(errno));
return -1;
}
retval = bind(uevent_netlink_sock, (struct sockaddr *) &snl,
sizeof(struct sockaddr_nl));
if (retval < 0) {
return -1;
}
retval = bind(uevent_netlink_sock, (struct sockaddr *) &snl,
sizeof(struct sockaddr_nl));
if (retval < 0) {
- fprintf(stderr, "bind failed
,
%s\n", strerror(errno));
+ fprintf(stderr, "bind failed
:
%s\n", strerror(errno));
close(uevent_netlink_sock);
uevent_netlink_sock = -1;
return -1;
close(uevent_netlink_sock);
uevent_netlink_sock = -1;
return -1;
@@
-100,90
+97,172
@@
static int init_uevent_netlink_sock(void)
return 0;
}
return 0;
}
-
int main(int argc, char *argv[]
)
+
static void asmlinkage sig_handler(int signum
)
{
{
+ if (signum == SIGINT || signum == SIGTERM)
+ udev_exit = 1;
+}
+
+static const char *search_key(const char *searchkey, const char *buf, size_t buflen)
+{
+ size_t bufpos = 0;
+ size_t searchkeylen = strlen(searchkey);
+
+ while (bufpos < buflen) {
+ const char *key;
+ int keylen;
+
+ key = &buf[bufpos];
+ keylen = strlen(key);
+ if (keylen == 0)
+ break;
+ if ((strncmp(searchkey, key, searchkeylen) == 0) && key[searchkeylen] == '=')
+ return &key[searchkeylen + 1];
+ bufpos += keylen + 1;
+ }
+ return NULL;
+}
+
+int udevmonitor(int argc, char *argv[], char *envp[])
+{
+ struct sigaction act;
+ int option;
int env = 0;
int env = 0;
+ int kernel = 0;
+ int udev = 0;
fd_set readfds;
fd_set readfds;
- int i;
- int retval;
+ int retval = 0;
+
+ static const struct option options[] = {
+ { "environment", 0, NULL, 'e' },
+ { "kernel", 0, NULL, 'k' },
+ { "udev", 0, NULL, 'u' },
+ { "help", 0, NULL, 'h' },
+ {}
+ };
- for (i = 1 ; i < argc; i++) {
- char *arg = argv[i];
- if (strcmp(arg, "--env") == 0 || strcmp(arg, "-e") == 0) {
+ while (1) {
+ option = getopt_long(argc, argv, "ekuh", options, NULL);
+ if (option == -1)
+ break;
+
+ switch (option) {
+ case 'e':
env = 1;
env = 1;
- }
- else if (strcmp(arg, "--help") == 0 || strcmp(arg, "-h") == 0){
- printf("Usage: udevmonitor [--env]\n"
- " --env print the whole event environment\n"
- " --help print this help text\n\n");
- exit(0);
- } else {
- fprintf(stderr, "unknown option\n\n");
- exit(1);
+ break;
+ case 'k':
+ kernel = 1;
+ break;
+ case 'u':
+ udev = 1;
+ break;
+ case 'h':
+ printf("Usage: udevadm monitor [--environment] [--kernel] [--udev] [--help]\n"
+ " --env print the whole event environment\n"
+ " --kernel print kernel uevents\n"
+ " --udev print udev events\n"
+ " --help print this help text\n\n");
+ default:
+ goto out;
}
}
}
}
- if (
getuid() != 0
) {
-
fprintf(stderr, "need to be root, exit\n\n")
;
-
exit(1)
;
+ if (
!kernel && !udev
) {
+
kernel = 1
;
+
udev =1
;
}
}
- init_uevent_netlink_sock();
- init_udev_monitor_socket();
+ if (getuid() != 0 && kernel) {
+ fprintf(stderr, "root privileges needed to subscribe to kernel events\n");
+ goto out;
+ }
- printf("udevmonitor prints received from the kernel [UEVENT] and after\n"
- "the udev processing, the event which udev [UDEV] has generated\n\n");
+ /* set signal handlers */
+ memset(&act, 0x00, sizeof(struct sigaction));
+ act.sa_handler = (void (*)(int)) sig_handler;
+ sigemptyset(&act.sa_mask);
+ act.sa_flags = SA_RESTART;
+ sigaction(SIGINT, &act, NULL);
+ sigaction(SIGTERM, &act, NULL);
- FD_ZERO(&readfds);
- if (uevent_netlink_sock > 0)
- FD_SET(uevent_netlink_sock, &readfds);
- if (udev_monitor_sock > 0)
- FD_SET(udev_monitor_sock, &readfds);
+ printf("udevmonitor will print the received events for:\n");
+ if (udev) {
+ retval = init_udev_monitor_socket();
+ if (retval)
+ goto out;
+ printf("UDEV the event which udev sends out after rule processing\n");
+ }
+ if (kernel) {
+ retval = init_uevent_netlink_sock();
+ if (retval)
+ goto out;
+ printf("UEVENT the kernel uevent\n");
+ }
+ printf("\n");
- while (
1
) {
-
static
char buf[UEVENT_BUFFER_SIZE*2];
+ while (
!udev_exit
) {
+ char buf[UEVENT_BUFFER_SIZE*2];
ssize_t buflen;
ssize_t buflen;
- fd_set workreadfds;
+ ssize_t bufpos;
+ ssize_t keys;
+ int fdcount;
+ struct timeval tv;
+ struct timezone tz;
+ char timestr[64];
+ const char *source = NULL;
+ const char *devpath, *action, *subsys;
buflen = 0;
buflen = 0;
- workreadfds = readfds;
+ FD_ZERO(&readfds);
+ if (uevent_netlink_sock >= 0)
+ FD_SET(uevent_netlink_sock, &readfds);
+ if (udev_monitor_sock >= 0)
+ FD_SET(udev_monitor_sock, &readfds);
-
retval = select(UDEV_MAX(uevent_netlink_sock, udev_monitor_sock)+1, &work
readfds, NULL, NULL, NULL);
- if (
retval
< 0) {
+
fdcount = select(UDEV_MAX(uevent_netlink_sock, udev_monitor_sock)+1, &
readfds, NULL, NULL, NULL);
+ if (
fdcount
< 0) {
if (errno != EINTR)
if (errno != EINTR)
- fprintf(stderr, "error receiving uevent message
\n"
);
+ fprintf(stderr, "error receiving uevent message
: %s\n", strerror(errno)
);
continue;
}
continue;
}
- if ((uevent_netlink_sock > 0) && FD_ISSET(uevent_netlink_sock, &workreadfds)) {
+ if (gettimeofday(&tv, &tz) == 0) {
+ snprintf(timestr, sizeof(timestr), "%llu.%06u",
+ (unsigned long long) tv.tv_sec, (unsigned int) tv.tv_usec);
+ } else
+ timestr[0] = '\0';
+
+ if ((uevent_netlink_sock >= 0) && FD_ISSET(uevent_netlink_sock, &readfds)) {
buflen = recv(uevent_netlink_sock, &buf, sizeof(buf), 0);
buflen = recv(uevent_netlink_sock, &buf, sizeof(buf), 0);
- if (buflen <=
0) {
- fprintf(stderr, "error receiving uevent message
\n"
);
+ if (buflen <= 0) {
+ fprintf(stderr, "error receiving uevent message
: %s\n", strerror(errno)
);
continue;
}
continue;
}
-
printf("UEVENT[%i] %s\n", time(NULL), buf)
;
+
source = "UEVENT"
;
}
}
- if ((udev_monitor_sock >
0) && FD_ISSET(udev_monitor_sock, &work
readfds)) {
+ if ((udev_monitor_sock >
= 0) && FD_ISSET(udev_monitor_sock, &
readfds)) {
buflen = recv(udev_monitor_sock, &buf, sizeof(buf), 0);
buflen = recv(udev_monitor_sock, &buf, sizeof(buf), 0);
- if (buflen <=
0) {
- fprintf(stderr, "error receiving udev message
\n"
);
+ if (buflen <= 0) {
+ fprintf(stderr, "error receiving udev message
: %s\n", strerror(errno)
);
continue;
}
continue;
}
-
printf("UDEV [%i] %s\n", time(NULL), buf)
;
+
source = "UDEV "
;
}
if (buflen == 0)
continue;
}
if (buflen == 0)
continue;
+ keys = strlen(buf) + 1; /* start of payload */
+ devpath = search_key("DEVPATH", &buf[keys], buflen);
+ action = search_key("ACTION", &buf[keys], buflen);
+ subsys = search_key("SUBSYSTEM", &buf[keys], buflen);
+ printf("%s[%s] %-8s %s (%s)\n", source, timestr, action, devpath, subsys);
+
/* print environment */
/* print environment */
+ bufpos = keys;
if (env) {
if (env) {
- size_t bufpos;
-
- /* start of payload */
- bufpos = strlen(buf) + 1;
-
- while (bufpos < (size_t)buflen) {
+ while (bufpos < buflen) {
int keylen;
char *key;
int keylen;
char *key;
@@
-198,9
+277,13
@@
int main(int argc, char *argv[])
}
}
}
}
- if (uevent_netlink_sock > 0)
+out:
+ if (uevent_netlink_sock >= 0)
close(uevent_netlink_sock);
close(uevent_netlink_sock);
- if (udev_monitor_sock > 0)
+ if (udev_monitor_sock >
=
0)
close(udev_monitor_sock);
close(udev_monitor_sock);
- exit(1);
+
+ if (retval)
+ return 1;
+ return 0;
}
}