chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
db: store devpath - node relationship for all devices
[elogind.git]
/
udevmonitor.c
diff --git
a/udevmonitor.c
b/udevmonitor.c
index 3a71d002f562377aad741d514dfd57c22f6640fa..4c59a495dbc92c90fa77e45ff6a43401463646e0 100644
(file)
--- a/
udevmonitor.c
+++ b/
udevmonitor.c
@@
-1,7
+1,7
@@
/*
* udevmonitor.c
*
/*
* udevmonitor.c
*
- * Copyright (C) 2004-200
5
Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2004-200
6
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
@@
-21,10
+21,12
@@
#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 <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,10
+35,10
@@
#include "udev.h"
#include "udevd.h"
#include "udev.h"
#include "udevd.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)
{
static int init_udev_monitor_socket(void)
{
@@
-53,15
+55,16
@@
static int init_udev_monitor_socket(void)
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;
}
@@
-79,18
+82,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;
@@
-99,60
+102,104
@@
static int init_uevent_netlink_sock(void)
return 0;
}
return 0;
}
+static void asmlinkage sig_handler(int signum)
+{
+ if (signum == SIGINT || signum == SIGTERM)
+ udev_exit = 1;
+}
+
int main(int argc, char *argv[])
{
int main(int argc, char *argv[])
{
+ struct sigaction act;
int env = 0;
int env = 0;
- int maxsockplus;
fd_set readfds;
fd_set readfds;
- int retval;
+ int i;
+ int retval = 0;
+
+ for (i = 1 ; i < argc; i++) {
+ char *arg = argv[i];
+ if (strcmp(arg, "--env") == 0 || strcmp(arg, "-e") == 0) {
+ 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);
+ }
+ }
if (getuid() != 0) {
if (getuid() != 0) {
-
printf("need to be root, exit
\n");
- exit(
1
);
+
fprintf(stderr, "need to be root, exit\n
\n");
+ exit(
2
);
}
}
- if (argc == 2 && strstr(argv[1], "--env"))
- env = 1;
+ /* 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);
- init_uevent_netlink_sock();
- init_udev_monitor_socket();
+ retval = init_udev_monitor_socket();
+ if (retval)
+ goto out;
- FD_ZERO(&readfds);
- FD_SET(uevent_netlink_sock, &readfds);
- FD_SET(udev_monitor_sock, &readfds);
- maxsockplus = udev_monitor_sock+1;
+ retval = init_uevent_netlink_sock();
+ if (retval)
+ goto out;
- while (1) {
- static char buf[UEVENT_BUFFER_SIZE*2];
+ printf("udevmonitor prints the received event from the kernel [UEVENT]\n"
+ "and the event which udev sends out after rule processing [UDEV]\n\n");
+
+ while (!udev_exit) {
+ char buf[UEVENT_BUFFER_SIZE*2];
ssize_t buflen;
ssize_t buflen;
- fd_set workreadfds;
+ int fdcount;
+ struct timeval tv;
+ struct timezone tz;
+ char timestr[64];
buflen = 0;
buflen = 0;
- workreadfds = readfds;
-
- retval = select(maxsockplus, &workreadfds, NULL, NULL, NULL);
- if (retval < 0) {
+ 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);
+
+ 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 (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);
if (buflen <= 0) {
buflen = recv(uevent_netlink_sock, &buf, sizeof(buf), 0);
if (buflen <= 0) {
- fprintf(stderr, "error receiving uevent message
\n"
);
+ fprintf(stderr, "error receiving uevent message
: %s\n", strerror(errno)
);
continue;
}
continue;
}
- printf("UEVENT[%
i] %s\n", time(NULL)
, buf);
+ printf("UEVENT[%
s] %s\n", timestr
, buf);
}
}
- if (
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);
if (buflen <= 0) {
buflen = recv(udev_monitor_sock, &buf, sizeof(buf), 0);
if (buflen <= 0) {
- fprintf(stderr, "error receiving udev message
\n"
);
+ fprintf(stderr, "error receiving udev message
: %s\n", strerror(errno)
);
continue;
}
continue;
}
- printf("UDEV [%
i] %s\n", time(NULL)
, buf);
+ printf("UDEV [%
s] %s\n", timestr
, buf);
}
if (buflen == 0)
}
if (buflen == 0)
@@
-180,7
+227,13
@@
int main(int argc, char *argv[])
}
}
}
}
- close(uevent_netlink_sock);
- close(udev_monitor_sock);
- exit(1);
+out:
+ if (uevent_netlink_sock >= 0)
+ close(uevent_netlink_sock);
+ if (udev_monitor_sock >= 0)
+ close(udev_monitor_sock);
+
+ if (retval)
+ return 3;
+ return 0;
}
}