By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release.

[patch] Concrete my path for allow events watch direct from UDEV.

hal-0.5.15-udev.patch (text/plain), 11.95 KB, created by Roman Savochenko on 2013-08-23 02:58:23 CDT

(hide)

Description: Concrete my path for allow events watch direct from UDEV.

Filename:

MIME Type:

Creator: Roman Savochenko

Created: 2013-08-23 02:58:23 CDT

Size: 11.95 KB

patch

obsolete

>--- hal-0.5.15/hald/linux/coldplug.c~ 2013-04-27 19:47:52.929443602 +0300 >+++ hal-0.5.15/hald/linux/coldplug.c 2013-04-27 19:49:12.713833648 +0300 >@@ -55,7 +55,7 @@ > > static GHashTable *sysfs_to_udev_map; > static GSList *device_list; >-static char dev_root[HAL_PATH_MAX]; >+static char dev_root[HAL_PATH_MAX] = "/dev"; > static gchar *udevinfo_stdout = NULL; > static unsigned long long coldplug_seqnum = 0; > typedef struct _UdevInfo UdevInfo; >@@ -155,7 +155,6 @@ > hal_util_init_sysfs_to_udev_map (void) > { > char *udevdb_export_argv[] = { "/sbin/udevadm", "info", "-e", NULL }; >- char *udevroot_argv[] = { "/sbin/udevadm", "info", "-r", NULL }; > int udevinfo_exitcode; > UdevInfo *info = NULL; > char *p; >@@ -163,25 +162,6 @@ > > sysfs_to_udev_map = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, udev_info_free); > >- /* get udevroot */ >- if (g_spawn_sync ("/", udevroot_argv, NULL, G_SPAWN_LEAVE_DESCRIPTORS_OPEN, NULL, NULL, >- &udevinfo_stdout, >- NULL, >- &udevinfo_exitcode, >- NULL) != TRUE) { >- HAL_ERROR (("Couldn't invoke %s", udevroot_argv[0])); >- goto error; >- } >- if (udevinfo_exitcode != 0) { >- HAL_ERROR (("%s returned %d", udevroot_argv[0], udevinfo_exitcode)); >- goto error; >- } >- >- g_strlcpy(dev_root, udevinfo_stdout, sizeof(dev_root)); >- p = strchr(dev_root, '\n'); >- if (p != NULL) >- p[0] = '\0'; >- g_free(udevinfo_stdout); > HAL_INFO (("dev_root is %s", dev_root)); > > /* get udevdb export */ >--- hal-0.5.14/hald/linux/osspec.c~ 2009-12-01 00:19:48.000000000 +0200 >+++ hal-0.5.14/hald/linux/osspec.c 2013-04-06 22:22:18.877266584 +0300 >@@ -48,6 +48,8 @@ > #include <dbus/dbus.h> > #include <dbus/dbus-glib.h> > >+#include <libudev.h> >+ > #include "../device_info.h" > #include "../hald.h" > #include "../hald_dbus.h" >@@ -68,154 +70,59 @@ > #include "osspec_linux.h" > > static gboolean hald_done_synthesizing_coldplug = FALSE; >+struct udev *udev = NULL; >+struct udev_monitor *mon = NULL; > > static gboolean > hald_udev_data (GIOChannel *source, GIOCondition condition, gpointer user_data) > { >- int fd; >- int retval; >- struct msghdr smsg; >- struct cmsghdr *cmsg; >- struct iovec iov; >- struct ucred *cred; >- char cred_msg[CMSG_SPACE(sizeof(struct ucred))]; >- >- char buf[4096]; >- size_t bufpos = 0; > const char *action = NULL; > HotplugEvent *hotplug_event; > >- memset(buf, 0x00, sizeof (buf)); >- >- fd = g_io_channel_unix_get_fd (source); >- >- iov.iov_base = &buf; >- iov.iov_len = sizeof (buf); >- >- memset(&smsg, 0x00, sizeof (struct msghdr)); >- smsg.msg_iov = &iov; >- smsg.msg_iovlen = 1; >- smsg.msg_control = cred_msg; >- smsg.msg_controllen = sizeof (cred_msg); >- >- retval = recvmsg (fd, &smsg, 0); >- if (retval < 0) { >- if (errno != EINTR) >- HAL_INFO (("Unable to receive message, errno=%d", errno)); >- goto out; >- } >- cmsg = CMSG_FIRSTHDR (&smsg); >- cred = (struct ucred *) CMSG_DATA (cmsg); >- >- if (cmsg == NULL || cmsg->cmsg_type != SCM_CREDENTIALS) { >- HAL_INFO (("No sender credentials received, message ignored")); >- goto out; >- } >- >- if (cred->uid != 0) { >- HAL_INFO (("Sender uid=%i, message ignored", cred->uid)); >- goto out; >- } >- >- if (!strstr(buf, "@/")) { >- HAL_INFO (("invalid message format")); >- goto out; >- } >- > hotplug_event = g_slice_new0 (HotplugEvent); > hotplug_event->type = HOTPLUG_EVENT_SYSFS; > >- while (bufpos < sizeof (buf)) { >- size_t keylen; >- char *key; >- char *str, *dstr; >- >- key = &buf[bufpos]; >- keylen = strlen(key); >- if (keylen == 0) >- break; >- bufpos += keylen + 1; >- >- if (strncmp(key, "ACTION=", 7) == 0) >- action = &key[7]; >- else if (strncmp(key, "DEVPATH=", 8) == 0) { >- >- /* md devices are handled via looking at /proc/mdstat */ >- if (g_str_has_prefix (key + 8, "/block/md")) { >- HAL_INFO (("skipping md event for %s", key + 8)); >- goto invalid; >- } >- >- g_snprintf (hotplug_event->sysfs.sysfs_path, sizeof (hotplug_event->sysfs.sysfs_path), >- "/sys%s", &key[8]); >- } else if (strncmp(key, "DEVPATH_OLD=", 12) == 0) { >- >- /* md devices are handled via looking at /proc/mdstat */ >- if (g_str_has_prefix (key + 12, "/block/md")) { >- HAL_INFO (("skipping md event for %s", key + 8)); >- goto invalid; >- } >- >- g_snprintf (hotplug_event->sysfs.sysfs_path_old, sizeof (hotplug_event->sysfs.sysfs_path_old), >- "/sys%s", &key[12]); >- } else if (strncmp(key, "SUBSYSTEM=", 10) == 0) >- g_strlcpy (hotplug_event->sysfs.subsystem, &key[10], sizeof (hotplug_event->sysfs.subsystem)); >- else if (strncmp(key, "DEVNAME=", 8) == 0) >- g_strlcpy (hotplug_event->sysfs.device_file, &key[8], sizeof (hotplug_event->sysfs.device_file)); >- else if (strncmp(key, "SEQNUM=", 7) == 0) >- hotplug_event->sysfs.seqnum = strtoull(&key[7], NULL, 10); >- else if (strncmp(key, "IFINDEX=", 8) == 0) >- hotplug_event->sysfs.net_ifindex = strtoul(&key[8], NULL, 10); >- else if (strncmp(key, "ID_VENDOR=", 10) == 0) { >- if ((str = hal_util_strdup_valid_utf8(&key[10])) != NULL ) { >- g_strlcpy (hotplug_event->sysfs.vendor, str, sizeof(hotplug_event->sysfs.vendor)); >- g_free (str); >- } >- } else if (strncmp(key, "ID_MODEL=", 9) == 0) { >- if ((str = hal_util_strdup_valid_utf8(&key[9])) != NULL ) { >- g_strlcpy (hotplug_event->sysfs.model, str, sizeof(hotplug_event->sysfs.model)); >- g_free (str); >- } >- } else if (strncmp(key, "ID_REVISION=", 12) == 0) { >- if ((str = hal_util_strdup_valid_utf8(&key[12])) != NULL ) { >- g_strlcpy (hotplug_event->sysfs.revision, str, sizeof(hotplug_event->sysfs.revision)); >- g_free (str); >- } >- } else if (strncmp(key, "ID_SERIAL=", 10) == 0) { >- if ((str = hal_util_strdup_valid_utf8(&key[10])) != NULL ) { >- g_strlcpy (hotplug_event->sysfs.serial, str, sizeof(hotplug_event->sysfs.serial)); >- g_free (str); >- } >- } else if (strncmp(key, "ID_FS_USAGE=", 12) == 0) { >- if ((str = hal_util_strdup_valid_utf8(&key[12])) != NULL ) { >- g_strlcpy (hotplug_event->sysfs.fsusage, str, sizeof(hotplug_event->sysfs.fsusage)); >- g_free (str); >- } >- } else if (strncmp(key, "ID_FS_TYPE=", 11) == 0) { >- if ((str = hal_util_strdup_valid_utf8(&key[11])) != NULL ) { >- g_strlcpy (hotplug_event->sysfs.fstype, str, sizeof(hotplug_event->sysfs.fstype)); >- g_free (str); >- } >- } else if (strncmp(key, "ID_FS_VERSION=", 14) == 0) { >- if ((str = hal_util_strdup_valid_utf8(&key[14])) != NULL ) { >- g_strlcpy (hotplug_event->sysfs.fsversion, str, sizeof(hotplug_event->sysfs.fsversion)); >- g_free (str); >- } >- } else if (strncmp(key, "ID_FS_UUID=", 11) == 0) { >- if ((str = hal_util_strdup_valid_utf8(&key[11])) != NULL ) { >- g_strlcpy (hotplug_event->sysfs.fsuuid, str, sizeof(hotplug_event->sysfs.fsuuid)); >- g_free (str); >- } >- } else if (strncmp(key, "ID_FS_LABEL_ENC=", 16) == 0) { >- dstr = g_malloc0 (keylen - 15); >- hal_util_decode_escape (&key[16], dstr, sizeof(hotplug_event->sysfs.fslabel)); >- >- if ((str = hal_util_strdup_valid_utf8(dstr)) != NULL ) { >- g_strlcpy (hotplug_event->sysfs.fslabel, str, sizeof(hotplug_event->sysfs.fslabel)); >- g_free (str); >- } >- g_free (dstr); >- } >+ struct udev_device *dev = NULL; >+ if((dev=udev_monitor_receive_device(mon))) >+ { >+ char *str, *dstr; >+ action = udev_device_get_action(dev); >+ >+ // md devices are handled via looking at /proc/mdstat >+ if (g_str_has_prefix (udev_device_get_devpath(dev), "/block/md")) { >+ HAL_INFO (("skipping md event for %s", udev_device_get_devpath(dev))); >+ goto invalid; >+ } >+ g_snprintf (hotplug_event->sysfs.sysfs_path, sizeof(hotplug_event->sysfs.sysfs_path), "/sys%s", udev_device_get_devpath(dev)); >+ g_strlcpy (hotplug_event->sysfs.subsystem, udev_device_get_subsystem(dev), sizeof(hotplug_event->sysfs.subsystem)); >+ g_strlcpy (hotplug_event->sysfs.device_file, udev_device_get_property_value(dev,"DEVNAME"), sizeof(hotplug_event->sysfs.device_file)); >+ hotplug_event->sysfs.seqnum = udev_device_get_seqnum(dev); >+ if((str=udev_device_get_property_value(dev,"IFINDEX"))) >+ hotplug_event->sysfs.net_ifindex = strtoul(str, NULL, 10); >+ if((str=udev_device_get_property_value(dev,"ID_VENDOR")) && (str=hal_util_strdup_valid_utf8(str))) >+ { g_strlcpy (hotplug_event->sysfs.vendor, str, sizeof(hotplug_event->sysfs.vendor)); g_free (str); } >+ if((str=udev_device_get_property_value(dev,"ID_MODEL")) && (str=hal_util_strdup_valid_utf8(str))) >+ { g_strlcpy (hotplug_event->sysfs.model, str, sizeof(hotplug_event->sysfs.model)); g_free (str); } >+ if((str=udev_device_get_property_value(dev,"ID_REVISION")) && (str=hal_util_strdup_valid_utf8(str))) >+ { g_strlcpy (hotplug_event->sysfs.revision, str, sizeof(hotplug_event->sysfs.revision)); g_free (str); } >+ if((str=udev_device_get_property_value(dev,"ID_SERIAL")) && (str=hal_util_strdup_valid_utf8(str))) >+ { g_strlcpy (hotplug_event->sysfs.serial, str, sizeof(hotplug_event->sysfs.serial)); g_free (str); } >+ if((str=udev_device_get_property_value(dev,"ID_FS_USAGE")) && (str=hal_util_strdup_valid_utf8(str))) >+ { g_strlcpy (hotplug_event->sysfs.fsusage, str, sizeof(hotplug_event->sysfs.fsusage)); g_free (str); } >+ if((str=udev_device_get_property_value(dev,"ID_FS_TYPE")) && (str=hal_util_strdup_valid_utf8(str))) >+ { g_strlcpy (hotplug_event->sysfs.fstype, str, sizeof(hotplug_event->sysfs.fstype)); g_free (str); } >+ if((str=udev_device_get_property_value(dev,"ID_FS_VERSION")) && (str=hal_util_strdup_valid_utf8(str))) >+ { g_strlcpy (hotplug_event->sysfs.fsversion, str, sizeof(hotplug_event->sysfs.fsversion)); g_free (str); } >+ if((str=udev_device_get_property_value(dev,"ID_FS_UUID")) && (str=hal_util_strdup_valid_utf8(str))) >+ { g_strlcpy (hotplug_event->sysfs.fsuuid, str, sizeof(hotplug_event->sysfs.fsuuid)); g_free (str); } >+ if((str=udev_device_get_property_value(dev,"ID_FS_LABEL_ENC"))) >+ { >+ dstr = g_malloc0(strlen(str)+1); >+ hal_util_decode_escape(str, dstr, sizeof(hotplug_event->sysfs.fslabel)); >+ if((str=hal_util_strdup_valid_utf8(dstr))) >+ { g_strlcpy (hotplug_event->sysfs.fslabel, str, sizeof(hotplug_event->sysfs.fslabel)); g_free (str); } >+ g_free(dstr); >+ } > } > > if (!action) { >@@ -284,7 +191,7 @@ > > invalid: > g_slice_free (HotplugEvent, hotplug_event); >- >+ if(dev) udev_device_unref(dev); > out: > return TRUE; > } >@@ -430,9 +337,11 @@ > exit (1); > } > /* enable receiving of the sender credentials */ >- setsockopt(udev_socket, SOL_SOCKET, SO_PASSCRED, &on, sizeof(on)); >+ udev = udev_new(); >+ mon = udev_monitor_new_from_netlink(udev, "udev"); >+ udev_monitor_enable_receiving(mon); > >- udev_channel = g_io_channel_unix_new (udev_socket); >+ udev_channel = g_io_channel_unix_new (udev_monitor_get_fd(mon)); > g_io_add_watch (udev_channel, G_IO_IN, hald_udev_data, NULL); > g_io_channel_unref (udev_channel); > >--- hal-0.5.14/configure.in~ 2013-04-06 22:41:10.824643391 +0300 >+++ hal-0.5.14/configure.in 2013-04-06 22:46:13.444945077 +0300 >@@ -14,6 +14,7 @@ > > glib_module="glib-2.0 >= 2.10.0 gobject-2.0 > 2.10.0 dbus-glib-1 >= 0.61" > dbus_module="dbus-1 >= 0.61" >+udev_module="libudev >= 168" > blkid_module="blkid >= 2.15" > volume_id_module="libvolume_id >= 0.77" > polkit_module="polkit >= 0.5" >@@ -692,6 +693,11 @@ > AC_SUBST(DBUS_CFLAGS) > AC_SUBST(DBUS_LIBS) > >+# udev libs >+PKG_CHECK_MODULES(UDEVLIB, [$udev_module]) >+AC_SUBST(UDEVLIB_CFLAGS) >+AC_SUBST(UDEVLIB_LIBS) >+ > # glib libs > PKG_CHECK_MODULES(GLIB, [$glib_module]) > AC_SUBST(GLIB_CFLAGS) >--- hal-0.5.14/hald/Makefile.am~ 2013-04-06 22:47:14.178613170 +0300 >+++ hal-0.5.14/hald/Makefile.am 2013-04-06 22:47:44.131436101 +0300 >@@ -74,7 +74,7 @@ > hald_SOURCES += ck-tracker.h ck-tracker.c > endif > >-hald_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ @POLKIT_LIBS@ -lm @HALD_OS_LIBS@ $(top_builddir)/hald/$(HALD_BACKEND)/libhald_$(HALD_BACKEND).la >+hald_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ @POLKIT_LIBS@ -lm @HALD_OS_LIBS@ $(top_builddir)/hald/$(HALD_BACKEND)/libhald_$(HALD_BACKEND).la @UDEVLIB_LIBS@ > > #### Init scripts fun > SCRIPT_IN_FILES=haldaemon.in View Attachment As Diff View Attachment As Raw

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    [x]
  • | Forgot Password
    Login: [x]