struct udev_monitor {
struct udev *udev;
int refcount;
- int socket;
+ int sock;
+ struct sockaddr_un saddr;
+ socklen_t addrlen;
};
/**
struct udev_monitor *udev_monitor_new_from_socket(struct udev *udev, const char *socket_path)
{
struct udev_monitor *udev_monitor;
- struct sockaddr_un saddr;
- socklen_t addrlen;
- const int on = 1;
if (udev == NULL)
return NULL;
udev_monitor->refcount = 1;
udev_monitor->udev = udev;
- memset(&saddr, 0x00, sizeof(saddr));
- saddr.sun_family = AF_LOCAL;
- strcpy(saddr.sun_path, socket_path);
- addrlen = offsetof(struct sockaddr_un, sun_path) + strlen(saddr.sun_path);
+ udev_monitor->saddr.sun_family = AF_LOCAL;
+ strcpy(udev_monitor->saddr.sun_path, socket_path);
+ udev_monitor->addrlen = offsetof(struct sockaddr_un, sun_path) + strlen(udev_monitor->saddr.sun_path);
/* translate leading '@' to abstract namespace */
- if (saddr.sun_path[0] == '@')
- saddr.sun_path[0] = '\0';
+ if (udev_monitor->saddr.sun_path[0] == '@')
+ udev_monitor->saddr.sun_path[0] = '\0';
- udev_monitor->socket = socket(AF_LOCAL, SOCK_DGRAM, 0);
- if (udev_monitor->socket == -1) {
- log_err(udev, "error getting socket: %s\n", strerror(errno));
+ udev_monitor->sock = socket(AF_LOCAL, SOCK_DGRAM, 0);
+ if (udev_monitor->sock == -1) {
+ err(udev, "error getting socket: %s\n", strerror(errno));
free(udev_monitor);
return NULL;
}
+ return udev_monitor;
+}
- if (bind(udev_monitor->socket, (struct sockaddr *) &saddr, addrlen) < 0) {
- log_err(udev, "bind failed: %s\n", strerror(errno));
- close(udev_monitor->socket);
- free(udev_monitor);
- return NULL;
+int udev_monitor_enable_receiving(struct udev_monitor *udev_monitor)
+{
+ int err;
+ const int on = 1;
+
+ err = bind(udev_monitor->sock, (struct sockaddr *) &udev_monitor->saddr, udev_monitor->addrlen);
+ if (err < 0) {
+ err(udev_monitor->udev, "bind failed: %s\n", strerror(errno));
+ return err;
}
/* enable receiving of the sender credentials */
- setsockopt(udev_monitor->socket, SOL_SOCKET, SO_PASSCRED, &on, sizeof(on));
- log_info(udev_monitor->udev, "udev_monitor: %p created\n", udev_monitor);
-
- return udev_monitor;
+ setsockopt(udev_monitor->sock, SOL_SOCKET, SO_PASSCRED, &on, sizeof(on));
+ info(udev_monitor->udev, "udev_monitor: %p created\n", udev_monitor);
+ return 0;
}
/**
* udev_monitor_unref:
* @udev_monitor: udev monitor
*
- * Drop a reference of a udev monitor. If the refcount reaches zero,
+ * Drop a reference ofa udev monitor. If the refcount reaches zero,
* the bound socket will be closed, and the ressources of the monitor
* will be released.
*
udev_monitor->refcount--;
if (udev_monitor->refcount > 0)
return;
- close(udev_monitor->socket);
- log_info(udev_monitor->udev, "udev_monitor: %p released\n", udev_monitor);
+ if (udev_monitor->sock >= 0)
+ close(udev_monitor->sock);
+ info(udev_monitor->udev, "udev_monitor: %p released\n", udev_monitor);
free(udev_monitor);
}
* udev_monitor_get_udev:
* @udev_monitor: udev monitor
*
- * Retrieve the udev library context the device was created with.
+ * Retrieve the udev library context the monitor was created with.
*
* Returns: the udev library context
**/
{
if (udev_monitor == NULL)
return -1;
- return udev_monitor->socket;
+ return udev_monitor->sock;
}
/**
- * udev_monitor_get_device:
+ * udev_monitor_receive_device:
* @udev_monitor: udev monitor
*
- * Retrieve data from the udev monitor socket, allocate a new udev
- * device, and fill in the received data, and return the device.
+ * Receive data from the udev monitor socket, allocate a new udev
+ * device, fill in the received data, and return the device.
*
* Only socket connections with uid=0 are accepted. The caller
- * need to make sure, that there is data to read from the socket,
+ * needs to make sure, that there is data to read from the socket,
* the call will block until the socket becomes readable.
*
* The initial refcount is 1, and needs to be decremented to
*
* Returns: a new udev device, or #NULL, in case of an error
**/
-struct udev_device *udev_monitor_get_device(struct udev_monitor *udev_monitor)
+struct udev_device *udev_monitor_receive_device(struct udev_monitor *udev_monitor)
{
struct udev_device *udev_device;
struct msghdr smsg;
smsg.msg_control = cred_msg;
smsg.msg_controllen = sizeof(cred_msg);
- if (recvmsg(udev_monitor->socket, &smsg, 0) < 0) {
+ if (recvmsg(udev_monitor->sock, &smsg, 0) < 0) {
if (errno != EINTR)
- log_info(udev_monitor->udev, "unable to receive message");
+ info(udev_monitor->udev, "unable to receive message");
return NULL;
}
cmsg = CMSG_FIRSTHDR(&smsg);
cred = (struct ucred *)CMSG_DATA (cmsg);
if (cmsg == NULL || cmsg->cmsg_type != SCM_CREDENTIALS) {
- log_info(udev_monitor->udev, "no sender credentials received, message ignored");
+ info(udev_monitor->udev, "no sender credentials received, message ignored");
return NULL;
}
if (cred->uid != 0) {
- log_info(udev_monitor->udev, "sender uid=%d, message ignored", cred->uid);
+ info(udev_monitor->udev, "sender uid=%d, message ignored", cred->uid);
return NULL;
}
/* skip header */
bufpos = strlen(buf) + 1;
if (bufpos < sizeof("a@/d") || bufpos >= sizeof(buf)) {
- log_info(udev_monitor->udev, "invalid message length");
+ info(udev_monitor->udev, "invalid message length");
return NULL;
}
/* check message header */
if (strstr(buf, "@/") == NULL) {
- log_info(udev_monitor->udev, "unrecognized message header");
+ info(udev_monitor->udev, "unrecognized message header");
return NULL;
}
bufpos += keylen + 1;
if (strncmp(key, "DEVPATH=", 8) == 0) {
- udev_device->devpath = strdup(&key[8]);
+ device_set_devpath(udev_device, &key[8]);
} else if (strncmp(key, "SUBSYSTEM=", 10) == 0) {
- udev_device->subsystem = strdup(&key[10]);
+ device_set_subsystem(udev_device, &key[10]);
} else if (strncmp(key, "DEVNAME=", 8) == 0) {
- udev_device->devname = strdup(&key[8]);
+ device_set_devname(udev_device, &key[8]);
} else if (strncmp(key, "DEVLINKS=", 9) == 0) {
char *slink = &key[9];
char *next = strchr(slink, ' ');
while (next != NULL) {
next[0] = '\0';
- name_list_add(&udev_device->link_list, slink, 0);
+ device_add_devlink(udev_device, slink);
slink = &next[1];
next = strchr(slink, ' ');
}
if (slink[0] != '\0')
- name_list_add(&udev_device->link_list, slink, 0);
+ device_add_devlink(udev_device, slink);
}
- name_list_add(&udev_device->env_list, key, 0);
+ device_add_property(udev_device, key);
}
return udev_device;