Fincer
/
pam_usb
mirror of https://github.com/Fincer/pam_usb
1
0
Fork 0
Code Issues 0 Releases 4 Wiki Activity
Browse Source

Migrated core lib to UDisks. Completely removed HAL dependency.

master
aluzzardi 13 years ago
parent
de5be5d58c
commit
7a0214d293
14 changed files with 287 additions and 9298 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +2
    -2
      Makefile
  2. +0
    -2137
      deps/libhal-storage.c
  3. +0
    -374
      deps/libhal-storage.h
  4. +0
    -5228
      deps/libhal.c
  5. +0
    -793
      deps/libhal.h
  6. +0
    -605
      deps/uthash.h
  7. +12
    -32
      src/device.c
  8. +195
    -59
      src/hal.c
  9. +7
    -5
      src/hal.h
  10. +7
    -12
      src/pad.c
  11. +1
    -1
      src/pad.h
  12. +1
    -1
      src/version.h
  13. +59
    -47
      src/volume.c
  14. +3
    -2
      src/volume.h

+ 2
- 2
Makefile View File

@ -4,9 +4,9 @@ DEBUG := no
# compiler/linker options # compiler/linker options
CC := gcc CC := gcc
CFLAGS := $(CFLAGS) -Wall -fPIC `pkg-config --cflags libxml-2.0` \ CFLAGS := $(CFLAGS) -Wall -fPIC `pkg-config --cflags libxml-2.0` \
`pkg-config --cflags hal-storage`
`pkg-config --cflags dbus-1`
LIBS := `pkg-config --libs libxml-2.0` \ LIBS := `pkg-config --libs libxml-2.0` \
`pkg-config --libs hal-storage`
`pkg-config --libs dbus-1`
# common source files # common source files
SRCS := src/conf.c \ SRCS := src/conf.c \


+ 0
- 2137
deps/libhal-storage.c
File diff suppressed because it is too large
View File


+ 0
- 374
deps/libhal-storage.h View File

@ -1,374 +0,0 @@
/***************************************************************************
* CVSID: $Id$
*
* libhal-storage.h : HAL convenience library for storage devices and volumes
*
* Copyright (C) 2004 Red Hat, Inc.
*
* Author: David Zeuthen <davidz@redhat.com>
*
* Licensed under the Academic Free License version 2.1
*
* 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 Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
**************************************************************************/
#ifndef LIBHAL_STORAGE_H
#define LIBHAL_STORAGE_H
#include <libhal.h>
#if defined(__cplusplus)
extern "C" {
#if 0
} /* shut up emacs indenting */
#endif
#endif
struct LibHalDrive_s;
typedef struct LibHalDrive_s LibHalDrive;
struct LibHalVolume_s;
typedef struct LibHalVolume_s LibHalVolume;
struct LibHalStoragePolicy_s;
typedef struct LibHalStoragePolicy_s LibHalStoragePolicy;
typedef enum {
LIBHAL_STORAGE_ICON_DRIVE_REMOVABLE_DISK = 0x10000,
LIBHAL_STORAGE_ICON_DRIVE_REMOVABLE_DISK_IDE = 0x10001,
LIBHAL_STORAGE_ICON_DRIVE_REMOVABLE_DISK_SCSI = 0x10002,
LIBHAL_STORAGE_ICON_DRIVE_REMOVABLE_DISK_USB = 0x10003,
LIBHAL_STORAGE_ICON_DRIVE_REMOVABLE_DISK_IEEE1394 = 0x10004,
LIBHAL_STORAGE_ICON_DRIVE_DISK = 0x10100,
LIBHAL_STORAGE_ICON_DRIVE_DISK_IDE = 0x10101,
LIBHAL_STORAGE_ICON_DRIVE_DISK_SCSI = 0x10102,
LIBHAL_STORAGE_ICON_DRIVE_DISK_USB = 0x10103,
LIBHAL_STORAGE_ICON_DRIVE_DISK_IEEE1394 = 0x10104,
LIBHAL_STORAGE_ICON_DRIVE_CDROM = 0x10200,
LIBHAL_STORAGE_ICON_DRIVE_CDROM_IDE = 0x10201,
LIBHAL_STORAGE_ICON_DRIVE_CDROM_SCSI = 0x10202,
LIBHAL_STORAGE_ICON_DRIVE_CDROM_USB = 0x10203,
LIBHAL_STORAGE_ICON_DRIVE_CDROM_IEEE1394 = 0x10204,
LIBHAL_STORAGE_ICON_DRIVE_FLOPPY = 0x10300,
LIBHAL_STORAGE_ICON_DRIVE_FLOPPY_IDE = 0x10301,
LIBHAL_STORAGE_ICON_DRIVE_FLOPPY_SCSI = 0x10302,
LIBHAL_STORAGE_ICON_DRIVE_FLOPPY_USB = 0x10303,
LIBHAL_STORAGE_ICON_DRIVE_FLOPPY_IEEE1394 = 0x10304,
LIBHAL_STORAGE_ICON_DRIVE_TAPE = 0x10400,
LIBHAL_STORAGE_ICON_DRIVE_COMPACT_FLASH = 0x10500,
LIBHAL_STORAGE_ICON_DRIVE_MEMORY_STICK = 0x10600,
LIBHAL_STORAGE_ICON_DRIVE_SMART_MEDIA = 0x10700,
LIBHAL_STORAGE_ICON_DRIVE_SD_MMC = 0x10800,
LIBHAL_STORAGE_ICON_DRIVE_CAMERA = 0x10900,
LIBHAL_STORAGE_ICON_DRIVE_PORTABLE_AUDIO_PLAYER = 0x10a00,
LIBHAL_STORAGE_ICON_DRIVE_ZIP = 0x10b00,
LIBHAL_STORAGE_ICON_DRIVE_JAZ = 0x10c00,
LIBHAL_STORAGE_ICON_DRIVE_FLASH_KEY = 0x10d00,
LIBHAL_STORAGE_ICON_VOLUME_REMOVABLE_DISK = 0x20000,
LIBHAL_STORAGE_ICON_VOLUME_REMOVABLE_DISK_IDE = 0x20001,
LIBHAL_STORAGE_ICON_VOLUME_REMOVABLE_DISK_SCSI = 0x20002,
LIBHAL_STORAGE_ICON_VOLUME_REMOVABLE_DISK_USB = 0x20003,
LIBHAL_STORAGE_ICON_VOLUME_REMOVABLE_DISK_IEEE1394 = 0x20004,
LIBHAL_STORAGE_ICON_VOLUME_DISK = 0x20100,
LIBHAL_STORAGE_ICON_VOLUME_DISK_IDE = 0x20101,
LIBHAL_STORAGE_ICON_VOLUME_DISK_SCSI = 0x20102,
LIBHAL_STORAGE_ICON_VOLUME_DISK_USB = 0x20103,
LIBHAL_STORAGE_ICON_VOLUME_DISK_IEEE1394 = 0x20104,
LIBHAL_STORAGE_ICON_VOLUME_CDROM = 0x20200,
LIBHAL_STORAGE_ICON_VOLUME_CDROM_IDE = 0x20201,
LIBHAL_STORAGE_ICON_VOLUME_CDROM_SCSI = 0x20202,
LIBHAL_STORAGE_ICON_VOLUME_CDROM_USB = 0x20203,
LIBHAL_STORAGE_ICON_VOLUME_CDROM_IEEE1394 = 0x20204,
LIBHAL_STORAGE_ICON_VOLUME_FLOPPY = 0x20300,
LIBHAL_STORAGE_ICON_VOLUME_FLOPPY_IDE = 0x20301,
LIBHAL_STORAGE_ICON_VOLUME_FLOPPY_SCSI = 0x20302,
LIBHAL_STORAGE_ICON_VOLUME_FLOPPY_USB = 0x20303,
LIBHAL_STORAGE_ICON_VOLUME_FLOPPY_IEEE1394 = 0x20304,
LIBHAL_STORAGE_ICON_VOLUME_TAPE = 0x20400,
LIBHAL_STORAGE_ICON_VOLUME_COMPACT_FLASH = 0x20500,
LIBHAL_STORAGE_ICON_VOLUME_MEMORY_STICK = 0x20600,
LIBHAL_STORAGE_ICON_VOLUME_SMART_MEDIA = 0x20700,
LIBHAL_STORAGE_ICON_VOLUME_SD_MMC = 0x20800,
LIBHAL_STORAGE_ICON_VOLUME_CAMERA = 0x20900,
LIBHAL_STORAGE_ICON_VOLUME_PORTABLE_AUDIO_PLAYER = 0x20a00,
LIBHAL_STORAGE_ICON_VOLUME_ZIP = 0x20b00,
LIBHAL_STORAGE_ICON_VOLUME_JAZ = 0x20c00,
LIBHAL_STORAGE_ICON_VOLUME_FLASH_KEY = 0x20d00,
LIBHAL_STORAGE_ICON_DISC_CDROM = 0x30000,
LIBHAL_STORAGE_ICON_DISC_CDR = 0x30001,
LIBHAL_STORAGE_ICON_DISC_CDRW = 0x30002,
LIBHAL_STORAGE_ICON_DISC_DVDROM = 0x30003,
LIBHAL_STORAGE_ICON_DISC_DVDRAM = 0x30004,
LIBHAL_STORAGE_ICON_DISC_DVDR = 0x30005,
LIBHAL_STORAGE_ICON_DISC_DVDRW = 0x30006,
LIBHAL_STORAGE_ICON_DISC_DVDPLUSR = 0x30007,
LIBHAL_STORAGE_ICON_DISC_DVDPLUSRW = 0x30008,
LIBHAL_STORAGE_ICON_DISC_DVDPLUSRWDL = 0x30009,
LIBHAL_STORAGE_ICON_DISC_BDROM = 0x3000a,
LIBHAL_STORAGE_ICON_DISC_BDR = 0x3000b,
LIBHAL_STORAGE_ICON_DISC_BDRE = 0x3000c,
LIBHAL_STORAGE_ICON_DISC_HDDVDROM = 0x3000d,
LIBHAL_STORAGE_ICON_DISC_HDDVDR = 0x3000e,
LIBHAL_STORAGE_ICON_DISC_HDDVDRW = 0x3000f,
LIBHAL_STORAGE_ICON_DISC_MRW = 0x30010,
LIBHAL_STORAGE_ICON_DISC_MRWW = 0x30011,
LIBHAL_STORAGE_ICON_DISC_MO = 0x30012
} LibHalStoragePolicyIcon;
typedef struct {
LibHalStoragePolicyIcon icon;
const char *icon_path;
} LibHalStoragePolicyIconPair;
LibHalStoragePolicy *libhal_storage_policy_new (void) LIBHAL_DEPRECATED;
void libhal_storage_policy_free (LibHalStoragePolicy *policy) LIBHAL_DEPRECATED;
void libhal_storage_policy_set_icon_path (LibHalStoragePolicy *policy,
LibHalStoragePolicyIcon icon,
const char *path) LIBHAL_DEPRECATED;
void libhal_storage_policy_set_icon_mapping (LibHalStoragePolicy *policy,
LibHalStoragePolicyIconPair *pairs) LIBHAL_DEPRECATED;
const char *libhal_storage_policy_lookup_icon (LibHalStoragePolicy *policy,
LibHalStoragePolicyIcon icon) LIBHAL_DEPRECATED;
typedef enum {
LIBHAL_DRIVE_BUS_UNKNOWN = 0x00,
LIBHAL_DRIVE_BUS_IDE = 0x01,
LIBHAL_DRIVE_BUS_SCSI = 0x02,
LIBHAL_DRIVE_BUS_USB = 0x03,
LIBHAL_DRIVE_BUS_IEEE1394 = 0x04,
LIBHAL_DRIVE_BUS_CCW = 0x05
} LibHalDriveBus;
typedef enum {
LIBHAL_DRIVE_TYPE_REMOVABLE_DISK = 0x00,
LIBHAL_DRIVE_TYPE_DISK = 0x01,
LIBHAL_DRIVE_TYPE_CDROM = 0x02,
LIBHAL_DRIVE_TYPE_FLOPPY = 0x03,
LIBHAL_DRIVE_TYPE_TAPE = 0x04,
LIBHAL_DRIVE_TYPE_COMPACT_FLASH = 0x05,
LIBHAL_DRIVE_TYPE_MEMORY_STICK = 0x06,
LIBHAL_DRIVE_TYPE_SMART_MEDIA = 0x07,
LIBHAL_DRIVE_TYPE_SD_MMC = 0x08,
LIBHAL_DRIVE_TYPE_CAMERA = 0x09,
LIBHAL_DRIVE_TYPE_PORTABLE_AUDIO_PLAYER = 0x0a,
LIBHAL_DRIVE_TYPE_ZIP = 0x0b,
LIBHAL_DRIVE_TYPE_JAZ = 0x0c,
LIBHAL_DRIVE_TYPE_FLASHKEY = 0x0d,
LIBHAL_DRIVE_TYPE_MO = 0x0e
} LibHalDriveType;
typedef enum {
LIBHAL_DRIVE_CDROM_CAPS_CDROM = 0x00001,
LIBHAL_DRIVE_CDROM_CAPS_CDR = 0x00002,
LIBHAL_DRIVE_CDROM_CAPS_CDRW = 0x00004,
LIBHAL_DRIVE_CDROM_CAPS_DVDRAM = 0x00008,
LIBHAL_DRIVE_CDROM_CAPS_DVDROM = 0x00010,
LIBHAL_DRIVE_CDROM_CAPS_DVDR = 0x00020,
LIBHAL_DRIVE_CDROM_CAPS_DVDRW = 0x00040,
LIBHAL_DRIVE_CDROM_CAPS_DVDPLUSR = 0x00080,
LIBHAL_DRIVE_CDROM_CAPS_DVDPLUSRW = 0x00100,
LIBHAL_DRIVE_CDROM_CAPS_DVDPLUSRDL = 0x00200,
LIBHAL_DRIVE_CDROM_CAPS_DVDPLUSRWDL = 0x00400,
LIBHAL_DRIVE_CDROM_CAPS_BDROM = 0x00800,
LIBHAL_DRIVE_CDROM_CAPS_BDR = 0x01000,
LIBHAL_DRIVE_CDROM_CAPS_BDRE = 0x02000,
LIBHAL_DRIVE_CDROM_CAPS_HDDVDROM = 0x04000,
LIBHAL_DRIVE_CDROM_CAPS_HDDVDR = 0x08000,
LIBHAL_DRIVE_CDROM_CAPS_HDDVDRW = 0x10000,
LIBHAL_DRIVE_CDROM_CAPS_MRW = 0x20000,
LIBHAL_DRIVE_CDROM_CAPS_MRWW = 0x40000,
LIBHAL_DRIVE_CDROM_CAPS_MO = 0x80000
} LibHalDriveCdromCaps;
LibHalDrive *libhal_drive_from_udi (LibHalContext *hal_ctx,
const char *udi);
LibHalDrive *libhal_drive_from_device_file (LibHalContext *hal_ctx,
const char *device_file);
void libhal_drive_free (LibHalDrive *drive);
dbus_bool_t libhal_drive_is_hotpluggable (LibHalDrive *drive);
dbus_bool_t libhal_drive_uses_removable_media (LibHalDrive *drive);
dbus_bool_t libhal_drive_is_media_detected (LibHalDrive *drive);
dbus_bool_t libhal_drive_is_media_detection_automatic (LibHalDrive *drive);
dbus_uint64_t libhal_drive_get_size (LibHalDrive *drive);
dbus_uint64_t libhal_drive_get_media_size (LibHalDrive *drive);
const char *libhal_drive_get_partition_scheme (LibHalDrive *drive);
dbus_bool_t libhal_drive_no_partitions_hint (LibHalDrive *drive);
dbus_bool_t libhal_drive_requires_eject (LibHalDrive *drive);
LibHalDriveType libhal_drive_get_type (LibHalDrive *drive);
LibHalDriveBus libhal_drive_get_bus (LibHalDrive *drive);
LibHalDriveCdromCaps libhal_drive_get_cdrom_caps (LibHalDrive *drive);
unsigned int libhal_drive_get_device_major (LibHalDrive *drive);
unsigned int libhal_drive_get_device_minor (LibHalDrive *drive);
const char *libhal_drive_get_type_textual (LibHalDrive *drive);
const char *libhal_drive_get_device_file (LibHalDrive *drive);
const char *libhal_drive_get_udi (LibHalDrive *drive);
const char *libhal_drive_get_serial (LibHalDrive *drive);
const char *libhal_drive_get_firmware_version (LibHalDrive *drive);
const char *libhal_drive_get_model (LibHalDrive *drive);
const char *libhal_drive_get_vendor (LibHalDrive *drive);
const char *libhal_drive_get_physical_device_udi (LibHalDrive *drive);
const char *libhal_drive_get_dedicated_icon_drive (LibHalDrive *drive);
const char *libhal_drive_get_dedicated_icon_volume (LibHalDrive *drive);
char *libhal_drive_policy_compute_display_name (LibHalDrive *drive,
LibHalVolume *volume,
LibHalStoragePolicy *policy) LIBHAL_DEPRECATED;
char *libhal_drive_policy_compute_icon_name (LibHalDrive *drive,
LibHalVolume *volume,
LibHalStoragePolicy *policy) LIBHAL_DEPRECATED;
dbus_bool_t libhal_drive_policy_is_mountable (LibHalDrive *drive,
LibHalStoragePolicy *policy) LIBHAL_DEPRECATED;
const char *libhal_drive_policy_get_desired_mount_point (LibHalDrive *drive,
LibHalStoragePolicy *policy) LIBHAL_DEPRECATED;
const char *libhal_drive_policy_get_mount_options (LibHalDrive *drive,
LibHalStoragePolicy *policy) LIBHAL_DEPRECATED;
const char *libhal_drive_policy_get_mount_fs (LibHalDrive *drive,
LibHalStoragePolicy *policy) LIBHAL_DEPRECATED;
char **libhal_drive_find_all_volumes (LibHalContext *hal_ctx,
LibHalDrive *drive,
int *num_volumes);
char *libhal_drive_policy_default_get_mount_root (LibHalContext *hal_ctx) LIBHAL_DEPRECATED;
dbus_bool_t libhal_drive_policy_default_use_managed_keyword (LibHalContext *hal_ctx) LIBHAL_DEPRECATED;
char *libhal_drive_policy_default_get_managed_keyword_primary (LibHalContext *hal_ctx) LIBHAL_DEPRECATED;
char *libhal_drive_policy_default_get_managed_keyword_secondary (LibHalContext *hal_ctx) LIBHAL_DEPRECATED;
typedef enum {
LIBHAL_VOLUME_USAGE_MOUNTABLE_FILESYSTEM,
LIBHAL_VOLUME_USAGE_PARTITION_TABLE,
LIBHAL_VOLUME_USAGE_RAID_MEMBER,
LIBHAL_VOLUME_USAGE_CRYPTO,
LIBHAL_VOLUME_USAGE_UNKNOWN,
LIBHAL_VOLUME_USAGE_OTHER
} LibHalVolumeUsage;
typedef enum {
LIBHAL_VOLUME_DISC_TYPE_CDROM = 0x00,
LIBHAL_VOLUME_DISC_TYPE_CDR = 0x01,
LIBHAL_VOLUME_DISC_TYPE_CDRW = 0x02,
LIBHAL_VOLUME_DISC_TYPE_DVDROM = 0x03,
LIBHAL_VOLUME_DISC_TYPE_DVDRAM = 0x04,
LIBHAL_VOLUME_DISC_TYPE_DVDR = 0x05,
LIBHAL_VOLUME_DISC_TYPE_DVDRW = 0x06,
LIBHAL_VOLUME_DISC_TYPE_DVDPLUSR = 0x07,
LIBHAL_VOLUME_DISC_TYPE_DVDPLUSRW = 0x08,
LIBHAL_VOLUME_DISC_TYPE_DVDPLUSR_DL = 0x09,
LIBHAL_VOLUME_DISC_TYPE_BDROM = 0x0a,
LIBHAL_VOLUME_DISC_TYPE_BDR = 0x0b,
LIBHAL_VOLUME_DISC_TYPE_BDRE = 0x0c,
LIBHAL_VOLUME_DISC_TYPE_HDDVDROM = 0x0d,
LIBHAL_VOLUME_DISC_TYPE_HDDVDR = 0x0e,
LIBHAL_VOLUME_DISC_TYPE_HDDVDRW = 0x0f,
LIBHAL_VOLUME_DISC_TYPE_MO = 0x10,
LIBHAL_VOLUME_DISC_TYPE_DVDR_DL = 0x11
} LibHalVolumeDiscType;
LibHalVolume *libhal_volume_from_udi (LibHalContext *hal_ctx,
const char *udi);
LibHalVolume *libhal_volume_from_device_file (LibHalContext *hal_ctx,
const char *device_file);
LibHalVolume *libhal_volume_from_mount_point (LibHalContext *hal_ctx,
const char *mount_point);
void libhal_volume_free (LibHalVolume *volume);
dbus_uint64_t libhal_volume_get_size (LibHalVolume *volume);
dbus_uint64_t libhal_volume_get_disc_capacity (LibHalVolume *volume);
const char *libhal_volume_get_udi (LibHalVolume *volume);
const char *libhal_volume_get_device_file (LibHalVolume *volume);
unsigned int libhal_volume_get_device_major (LibHalVolume *volume);
unsigned int libhal_volume_get_device_minor (LibHalVolume *volume);
const char *libhal_volume_get_fstype (LibHalVolume *volume);
const char *libhal_volume_get_fsversion (LibHalVolume *volume);
LibHalVolumeUsage libhal_volume_get_fsusage (LibHalVolume *volume);
dbus_bool_t libhal_volume_is_mounted (LibHalVolume *volume);
dbus_bool_t libhal_volume_is_mounted_read_only (LibHalVolume *volume);
dbus_bool_t libhal_volume_is_partition (LibHalVolume *volume);
dbus_bool_t libhal_volume_is_disc (LibHalVolume *volume);
const char *libhal_volume_get_partition_scheme (LibHalVolume *volume);
const char *libhal_volume_get_partition_type (LibHalVolume *volume);
const char *libhal_volume_get_partition_label (LibHalVolume *volume);
const char *libhal_volume_get_partition_uuid (LibHalVolume *volume);
const char **libhal_volume_get_partition_flags (LibHalVolume *volume);
unsigned int libhal_volume_get_partition_number (LibHalVolume *volume);
dbus_uint64_t libhal_volume_get_partition_start_offset (LibHalVolume *volume);
dbus_uint64_t libhal_volume_get_partition_media_size (LibHalVolume *volume);
const char *libhal_volume_get_label (LibHalVolume *volume);
const char *libhal_volume_get_mount_point (LibHalVolume *volume);
const char *libhal_volume_get_uuid (LibHalVolume *volume);
const char *libhal_volume_get_storage_device_udi (LibHalVolume *volume);
const char *libhal_volume_crypto_get_backing_volume_udi (LibHalVolume *volume);
char *libhal_volume_crypto_get_clear_volume_udi (LibHalContext *hal_ctx, LibHalVolume *volume);
dbus_bool_t libhal_volume_disc_has_audio (LibHalVolume *volume);
dbus_bool_t libhal_volume_disc_has_data (LibHalVolume *volume);
dbus_bool_t libhal_volume_disc_is_blank (LibHalVolume *volume);
dbus_bool_t libhal_volume_disc_is_rewritable (LibHalVolume *volume);
dbus_bool_t libhal_volume_disc_is_appendable (LibHalVolume *volume);
LibHalVolumeDiscType libhal_volume_get_disc_type (LibHalVolume *volume);
int libhal_volume_get_msdos_part_table_type (LibHalVolume *volume) LIBHAL_DEPRECATED;
dbus_uint64_t libhal_volume_get_msdos_part_table_start (LibHalVolume *volume) LIBHAL_DEPRECATED;
dbus_uint64_t libhal_volume_get_msdos_part_table_size (LibHalVolume *volume) LIBHAL_DEPRECATED;
dbus_bool_t libhal_volume_should_ignore (LibHalVolume *volume);
char *libhal_volume_policy_compute_size_as_string (LibHalVolume *volume) LIBHAL_DEPRECATED;
char *libhal_volume_policy_compute_display_name (LibHalDrive *drive,
LibHalVolume *volume,
LibHalStoragePolicy *policy) LIBHAL_DEPRECATED;
char *libhal_volume_policy_compute_icon_name (LibHalDrive *drive,
LibHalVolume *volume,
LibHalStoragePolicy *policy) LIBHAL_DEPRECATED;
dbus_bool_t libhal_volume_policy_should_be_visible (LibHalDrive *drive,
LibHalVolume *volume,
LibHalStoragePolicy *policy,
const char *target_mount_point) LIBHAL_DEPRECATED;
dbus_bool_t libhal_volume_policy_is_mountable (LibHalDrive *drive,
LibHalVolume *volume,
LibHalStoragePolicy *policy) LIBHAL_DEPRECATED;
const char *libhal_volume_policy_get_desired_mount_point (LibHalDrive *drive,
LibHalVolume *volume,
LibHalStoragePolicy *policy) LIBHAL_DEPRECATED;
const char *libhal_volume_policy_get_mount_options (LibHalDrive *drive,
LibHalVolume *volume,
LibHalStoragePolicy *policy) LIBHAL_DEPRECATED;
const char *libhal_volume_policy_get_mount_fs (LibHalDrive *drive,
LibHalVolume *volume,
LibHalStoragePolicy *policy) LIBHAL_DEPRECATED;
#if defined(__cplusplus)
}
#endif
#endif /* LIBHAL_STORAGE_H */

+ 0
- 5228
deps/libhal.c
File diff suppressed because it is too large
View File


+ 0
- 793
deps/libhal.h View File

@ -1,793 +0,0 @@
/***************************************************************************
* CVSID: $Id$
*
* libhal.h : HAL daemon C convenience library headers
*
* Copyright (C) 2003 David Zeuthen, <david@fubar.dk>
* Copyright (C) 2007 Codethink Ltd. Author Rob Taylor <rob.taylor@codethink.co.uk>
*
* Licensed under the Academic Free License version 2.1
*
* 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 Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
**************************************************************************/
#ifndef LIBHAL_H
#define LIBHAL_H
#ifndef DBUS_API_SUBJECT_TO_CHANGE
#define DBUS_API_SUBJECT_TO_CHANGE
#endif
#include <dbus/dbus.h>
#if defined(__cplusplus)
extern "C" {
#if 0
} /* shut up emacs indenting */
#endif
#endif
#if defined(__GNUC__)
#define LIBHAL_DEPRECATED __attribute__ ((deprecated))
#else
#define LIBHAL_DEPRECATED
#endif
/**
* LIBHAL_LIBHAL_FREE_DBUS_ERROR:
* @_dbus_error_: the DBusError
*
* Handy macro for checking whether a DBusError is set and free the error if
* the error is set.
*/
#define LIBHAL_FREE_DBUS_ERROR(_dbus_error_) \
do { \
if (dbus_error_is_set(_dbus_error_)) \
dbus_error_free (_dbus_error_); \
} while (0)
/**
* LIBHAL_CHECK_LIBHALCONTEXT:
* @_ctx_: the context
* @_ret_: what to use for return value if context is invalid
*
* Handy macro for checking whether a context is valid.
*/
#define LIBHAL_CHECK_LIBHALCONTEXT(_ctx_, _ret_) \
do { \
if (_ctx_ == NULL) { \
fprintf (stderr, \
"%s %d : LibHalContext *ctx is NULL\n", \
__FILE__, __LINE__); \
return _ret_; \
} \
} while(0)
/**
* LibHalPropertyType:
*
* Possible types for properties on hal device objects
*/
typedef enum {
/** Used to report error condition */
LIBHAL_PROPERTY_TYPE_INVALID = DBUS_TYPE_INVALID,
/** Type for 32-bit signed integer property */
LIBHAL_PROPERTY_TYPE_INT32 = DBUS_TYPE_INT32,
/** Type for 64-bit unsigned integer property */
LIBHAL_PROPERTY_TYPE_UINT64 = DBUS_TYPE_UINT64,
/** Type for double precision floating point property */
LIBHAL_PROPERTY_TYPE_DOUBLE = DBUS_TYPE_DOUBLE,
/** Type for boolean property */
LIBHAL_PROPERTY_TYPE_BOOLEAN = DBUS_TYPE_BOOLEAN,
/** Type for UTF-8 string property */
LIBHAL_PROPERTY_TYPE_STRING = DBUS_TYPE_STRING,
/** Type for list of UTF-8 strings property */
LIBHAL_PROPERTY_TYPE_STRLIST = ((int) (DBUS_TYPE_STRING<<8)+('l'))
} LibHalPropertyType;
typedef struct LibHalContext_s LibHalContext;
typedef struct LibHalProperty_s LibHalProperty;
typedef struct LibHalPropertySet_s LibHalPropertySet;
/**
* LibHalIntegrateDBusIntoMainLoop:
* @ctx: context for connection to hald
* @dbus_connection: DBus connection to use in ctx
*
* Type for function in application code that integrates a
* DBusConnection object into its own mainloop.
*/
typedef void (*LibHalIntegrateDBusIntoMainLoop) (LibHalContext *ctx,
DBusConnection *dbus_connection);
/**
* LibHalDeviceAdded:
* @ctx: context for connection to hald
* @udi: the Unique Device Id
*
* Type for callback when a device is added.
*/
typedef void (*LibHalDeviceAdded) (LibHalContext *ctx,
const char *udi);
/**
* LibHalDeviceRemoved:
* @ctx: context for connection to hald
* @udi: the Unique Device Id
*
* Type for callback when a device is removed.
*/
typedef void (*LibHalDeviceRemoved) (LibHalContext *ctx,
const char *udi);
/**
* LibHalDeviceNewCapability:
* @ctx: context for connection to hald
* @udi: the Unique Device Id
* @capability: capability of the device
*
* Type for callback when a device gains a new capability.
*
*/
typedef void (*LibHalDeviceNewCapability) (LibHalContext *ctx,
const char *udi,
const char *capability);
/**
* LibHalDeviceLostCapability:
* @ctx: context for connection to hald
* @udi: the Unique Device Id
* @capability: capability of the device
*
* Type for callback when a device loses a capability.
*
*/
typedef void (*LibHalDeviceLostCapability) (LibHalContext *ctx,
const char *udi,
const char *capability);
/**
* LibHalDevicePropertyModified:
* @ctx: context for connection to hald
* @udi: the Unique Device Id
* @key: name of the property that has changed
* @is_removed: whether or not property was removed
* @is_added: whether or not property was added
*
* Type for callback when a property of a device changes.
*/
typedef void (*LibHalDevicePropertyModified) (LibHalContext *ctx,
const char *udi,
const char *key,
dbus_bool_t is_removed,
dbus_bool_t is_added);
/**
* LibHalDeviceCondition:
* @ctx: context for connection to hald
* @udi: the Unique Device Id
* @condition_name: name of the condition, e.g. ProcessorOverheating. Consult the HAL spec for details
* @condition_detail: detail of condition
*
* Type for callback when a non-continuous condition occurs on a device.
*/
typedef void (*LibHalDeviceCondition) (LibHalContext *ctx,
const char *udi,
const char *condition_name,
const char *condition_detail);
/**
* LibHalGlobalInterfaceLockAcquired:
* @ctx: context for connection to hald
* @interface_name: the name of the interface
* @lock_owner: what service acquired the lock
* @num_locks: number of locks on the interface
*
* Type for callback when someone acquires a global lock.
*/
typedef void (*LibHalGlobalInterfaceLockAcquired) (LibHalContext *ctx,
const char *interface_name,
const char *lock_owner,
int num_locks);
/**
* LibHalGlobalInterfaceLockReleased:
* @ctx: context for connection to hald
* @interface_name: the name of the interface
* @lock_owner: what service released the lock
* @num_locks: number of locks on the interface
*
* Type for callback when someone releases a global lock.
*/
typedef void (*LibHalGlobalInterfaceLockReleased) (LibHalContext *ctx,
const char *interface_name,
const char *lock_owner,
int num_locks);
/**
* LibHalInterfaceLockAcquired:
* @ctx: context for connection to hald
* @udi: the Unique Device Id
* @interface_name: the name of the interface
* @lock_owner: what service acquired the lock
* @num_locks: number of locks on the interface
*
* Type for callback when someone acquires a lock on a device.
*/
typedef void (*LibHalInterfaceLockAcquired) (LibHalContext *ctx,
const char *udi,
const char *interface_name,
const char *lock_owner,
int num_locks);
/**
* LibHalInterfaceLockReleased:
* @ctx: context for connection to hald
* @udi: the Unique Device Id
* @interface_name: the name of the interface
* @lock_owner: what service released the lock
* @num_locks: number of locks on the interface
*
* Type for callback when someone acquires a lock on a device.
*/
typedef void (*LibHalInterfaceLockReleased) (LibHalContext *ctx,
const char *udi,
const char *interface_name,
const char *lock_owner,
int num_locks);
/**
* LibHalSingletonDeviceAdded:
* @ctx: context for connection to hald
* @udi: the Unique Device Id
* @properties: the device's properties
*
* Type for callback for addon singletons when a device is added
*/
typedef void (*LibHalSingletonDeviceAdded) (LibHalContext *ctx,
const char *udi,
const LibHalPropertySet *properties);
/**
* LibHalSingletonDeviceRemoved:
* @ctx: context for connection to hald
* @udi: the Unique Device Id
* @properties: the device's properties
*
* Type for callback for addon singletons when a device is added
*/
typedef void (*LibHalSingletonDeviceRemoved) (LibHalContext *ctx,
const char *udi,
const LibHalPropertySet *properties);
/* Create a new context for a connection with hald */
LibHalContext *libhal_ctx_new (void);
/* Enable or disable caching */
dbus_bool_t libhal_ctx_set_cache (LibHalContext *ctx, dbus_bool_t use_cache);
/* Set DBus connection to use to talk to hald. */
dbus_bool_t libhal_ctx_set_dbus_connection (LibHalContext *ctx, DBusConnection *conn);
/* Get DBus connection to use to talk to hald. */
DBusConnection *libhal_ctx_get_dbus_connection (LibHalContext *ctx);
/* Set user data for the context */
dbus_bool_t libhal_ctx_set_user_data (LibHalContext *ctx, void *user_data);
/* Get user data for the context */
void* libhal_ctx_get_user_data (LibHalContext *ctx);
/* Set the callback for when a device is added */
dbus_bool_t libhal_ctx_set_device_added (LibHalContext *ctx, LibHalDeviceAdded callback);
/* Set the callback for when a device is removed */
dbus_bool_t libhal_ctx_set_device_removed (LibHalContext *ctx, LibHalDeviceRemoved callback);
/* Set the callback for when a device gains a new capability */
dbus_bool_t libhal_ctx_set_device_new_capability (LibHalContext *ctx, LibHalDeviceNewCapability callback);
/* Set the callback for when a device loses a capability */
dbus_bool_t libhal_ctx_set_device_lost_capability (LibHalContext *ctx, LibHalDeviceLostCapability callback);
/* Set the callback for when a property is modified on a device */
dbus_bool_t libhal_ctx_set_device_property_modified (LibHalContext *ctx, LibHalDevicePropertyModified callback);
/* Set the callback for when a device emits a condition */
dbus_bool_t libhal_ctx_set_device_condition (LibHalContext *ctx, LibHalDeviceCondition callback);
/* Set the callback for when a global interface lock is acquired */
dbus_bool_t libhal_ctx_set_global_interface_lock_acquired (LibHalContext *ctx, LibHalGlobalInterfaceLockAcquired callback);
/* Set the callback for when a global interface lock is released */
dbus_bool_t libhal_ctx_set_global_interface_lock_released (LibHalContext *ctx, LibHalGlobalInterfaceLockReleased callback);
/* Set the callback for when an interface lock is acquired */
dbus_bool_t libhal_ctx_set_interface_lock_acquired (LibHalContext *ctx, LibHalInterfaceLockAcquired callback);
/* Set the callback for when an interface lock is released */
dbus_bool_t libhal_ctx_set_interface_lock_released (LibHalContext *ctx, LibHalInterfaceLockReleased callback);
/* Set the callback for addon singleton device added */
dbus_bool_t libhal_ctx_set_singleton_device_added (LibHalContext *ctx, LibHalSingletonDeviceAdded callback);
/* Set the callback for addon singleton device removed*/
dbus_bool_t libhal_ctx_set_singleton_device_removed (LibHalContext *ctx, LibHalSingletonDeviceRemoved callback);
/* Initialize the connection to hald */
dbus_bool_t libhal_ctx_init (LibHalContext *ctx, DBusError *error);
/* Shut down a connection to hald */
dbus_bool_t libhal_ctx_shutdown (LibHalContext *ctx, DBusError *error);
/* Free a LibHalContext resource */
dbus_bool_t libhal_ctx_free (LibHalContext *ctx);
/* Create an already initialized connection to hald */
LibHalContext *libhal_ctx_init_direct (DBusError *error);
/* Get all devices in the Global Device List (GDL). */
char **libhal_get_all_devices (LibHalContext *ctx, int *num_devices, DBusError *error);
/* Determine if a device exists. */
dbus_bool_t libhal_device_exists (LibHalContext *ctx, const char *udi, DBusError *error);
/* Print a device to stdout; useful for debugging. */
dbus_bool_t libhal_device_print (LibHalContext *ctx, const char *udi, DBusError *error);
/* Determine if a property on a device exists. */
dbus_bool_t libhal_device_property_exists (LibHalContext *ctx,
const char *udi,
const char *key,
DBusError *error);
/* Get the value of a property of type string. */
char *libhal_device_get_property_string (LibHalContext *ctx,
const char *udi,
const char *key,
DBusError *error);
/* Get the value of a property of type signed integer. */
dbus_int32_t libhal_device_get_property_int (LibHalContext *ctx,
const char *udi,
const char *key,
DBusError *error);
/* Get the value of a property of type unsigned integer. */
dbus_uint64_t libhal_device_get_property_uint64 (LibHalContext *ctx,
const char *udi,
const char *key,
DBusError *error);
/* Get the value of a property of type double. */
double libhal_device_get_property_double (LibHalContext *ctx,
const char *udi,
const char *key,
DBusError *error);
/* Get the value of a property of type bool. */
dbus_bool_t libhal_device_get_property_bool (LibHalContext *ctx,
const char *udi,
const char *key,
DBusError *error);
/* Get the value of a property of type string list. */
char **libhal_device_get_property_strlist (LibHalContext *ctx,
const char *udi,
const char *key,
DBusError *error);
/* Set a property of type string. */
dbus_bool_t libhal_device_set_property_string (LibHalContext *ctx,
const char *udi,
const char *key,
const char *value,
DBusError *error);
/* Set a property of type signed integer. */
dbus_bool_t libhal_device_set_property_int (LibHalContext *ctx,
const char *udi,
const char *key,
dbus_int32_t value,
DBusError *error);
/* Set a property of type unsigned integer. */
dbus_bool_t libhal_device_set_property_uint64 (LibHalContext *ctx,
const char *udi,
const char *key,
dbus_uint64_t value,
DBusError *error);
/* Set a property of type double. */
dbus_bool_t libhal_device_set_property_double (LibHalContext *ctx,
const char *udi,
const char *key,
double value,
DBusError *error);
/* Set a property of type bool. */
dbus_bool_t libhal_device_set_property_bool (LibHalContext *ctx,
const char *udi,
const char *key,
dbus_bool_t value,
DBusError *error);
/* Append to a property of type strlist. */
dbus_bool_t libhal_device_property_strlist_append (LibHalContext *ctx,
const char *udi,
const char *key,
const char *value,
DBusError *error);
/* Prepend to a property of type strlist. */
dbus_bool_t libhal_device_property_strlist_prepend (LibHalContext *ctx,
const char *udi,
const char *key,
const char *value,
DBusError *error);
/* Remove a specified string from a property of type strlist. */
dbus_bool_t libhal_device_property_strlist_remove_index (LibHalContext *ctx,
const char *udi,
const char *key,
unsigned int idx,
DBusError *error);
/* Remove a specified string from a property of type strlist. */
dbus_bool_t libhal_device_property_strlist_remove (LibHalContext *ctx,
const char *udi,
const char *key,
const char *value,
DBusError *error);
/* Remove a property. */
dbus_bool_t libhal_device_remove_property (LibHalContext *ctx,
const char *udi,
const char *key,
DBusError *error);
/* Query a property type of a device. */
LibHalPropertyType libhal_device_get_property_type (LibHalContext *ctx,
const char *udi,
const char *key,
DBusError *error);
struct LibHalChangeSet_s;
typedef struct LibHalChangeSet_s LibHalChangeSet;
LibHalChangeSet *libhal_device_new_changeset (const char *udi);
dbus_bool_t libhal_changeset_set_property_string (LibHalChangeSet *changeset,
const char *key,
const char *value);
dbus_bool_t libhal_changeset_set_property_int (LibHalChangeSet *changeset,
const char *key,
dbus_int32_t value);
dbus_bool_t libhal_changeset_set_property_uint64 (LibHalChangeSet *changeset,
const char *key,
dbus_uint64_t value);
dbus_bool_t libhal_changeset_set_property_double (LibHalChangeSet *changeset,
const char *key,
double value);
dbus_bool_t libhal_changeset_set_property_bool (LibHalChangeSet *changeset,
const char *key,
dbus_bool_t value);
dbus_bool_t libhal_changeset_set_property_strlist (LibHalChangeSet *changeset,
const char *key,
const char **value);
dbus_bool_t libhal_device_commit_changeset (LibHalContext *ctx,
LibHalChangeSet *changeset,
DBusError *error);
void libhal_device_free_changeset (LibHalChangeSet *changeset);
/* Retrieve all the properties on a device. */
LibHalPropertySet *libhal_device_get_all_properties (LibHalContext *ctx,
const char *udi,
DBusError *error);
/* Get all devices and their properties */
dbus_bool_t libhal_get_all_devices_with_properties (LibHalContext *ctx,
int *out_num_devices,
char ***out_udi,
LibHalPropertySet ***out_properties,
DBusError *error);
/* sort all properties according to property name */
void libhal_property_set_sort (LibHalPropertySet *set);
/* Free a property set earlier obtained with libhal_device_get_all_properties(). */
void libhal_free_property_set (LibHalPropertySet *set);
/* Get the number of properties in a property set. */
unsigned int libhal_property_set_get_num_elems (LibHalPropertySet *set);
/* Get type of property. */
LibHalPropertyType libhal_ps_get_type (const LibHalPropertySet *set, const char *key);
/* Get the value of a property of type string. */
const char *libhal_ps_get_string (const LibHalPropertySet *set, const char *key);
/* Get the value of a property of type signed integer. */
dbus_int32_t libhal_ps_get_int32 (const LibHalPropertySet *set, const char *key);
/* Get the value of a property of type unsigned integer. */
dbus_uint64_t libhal_ps_get_uint64 (const LibHalPropertySet *set, const char *key);
/* Get the value of a property of type double. */
double libhal_ps_get_double (const LibHalPropertySet *set, const char *key);
/* Get the value of a property of type bool. */
dbus_bool_t libhal_ps_get_bool (const LibHalPropertySet *set, const char *key);
/* Get the value of a property of type string list. */
const char * const *libhal_ps_get_strlist (const LibHalPropertySet *set, const char *key);
/**
* LibHalPropertySetIterator:
*
* Iterator for inspecting all properties. Do not access any members;
* use the libhal_psi_* family of functions instead.
*/
struct LibHalPropertySetIterator_s {
LibHalPropertySet *set; /**< Property set we are iterating over */
unsigned int idx; /**< Index into current element */
LibHalProperty *cur_prop; /**< Current property being visited */
void *reservered0; /**< Reserved for future use */
void *reservered1; /**< Reserved for future use */
};
typedef struct LibHalPropertySetIterator_s LibHalPropertySetIterator;
/* Initialize a property set iterator. */
void libhal_psi_init (LibHalPropertySetIterator *iter, LibHalPropertySet *set);
/* Determine whether there are more properties to iterate over */
dbus_bool_t libhal_psi_has_more (LibHalPropertySetIterator *iter);
/* Advance iterator to next property. */
void libhal_psi_next (LibHalPropertySetIterator *iter);
/* Get type of property. */
LibHalPropertyType libhal_psi_get_type (LibHalPropertySetIterator *iter);
/* Get the key of a property. */
char *libhal_psi_get_key (LibHalPropertySetIterator *iter);
/* Get the value of a property of type string. */
char *libhal_psi_get_string (LibHalPropertySetIterator *iter);
/* Get the value of a property of type signed integer. */
dbus_int32_t libhal_psi_get_int (LibHalPropertySetIterator *iter);
/* Get the value of a property of type unsigned integer. */
dbus_uint64_t libhal_psi_get_uint64 (LibHalPropertySetIterator *iter);
/* Get the value of a property of type double. */
double libhal_psi_get_double (LibHalPropertySetIterator *iter);
/* Get the value of a property of type bool. */
dbus_bool_t libhal_psi_get_bool (LibHalPropertySetIterator *iter);
/* Get the value of a property of type string list. */
char **libhal_psi_get_strlist (LibHalPropertySetIterator *iter);
/* Get the length of an array of strings */
unsigned int libhal_string_array_length (char **str_array);
/* Frees a NULL-terminated array of strings. If passed NULL, does nothing. */
void libhal_free_string_array (char **str_array);
/* Frees a nul-terminated string */
void libhal_free_string (char *str);
/* Create a new device object which will be hidden from applications
* until the CommitToGdl(), ie. libhal_device_commit_to_gdl(), method is called.
*/
char *libhal_new_device (LibHalContext *ctx, DBusError *error);
/* When a hidden device has been built using the NewDevice method, ie.
* libhal_new_device(), and the org.freedesktop.Hal.Device interface
* this function will commit it to the global device list.
*/
dbus_bool_t libhal_device_commit_to_gdl (LibHalContext *ctx,
const char *temp_udi,
const char *udi,
DBusError *error);
/* This method can be invoked when a device is removed. The HAL daemon
* will shut down the device. Note that the device may still be in the device
* list if the Persistent property is set to true.
*/
dbus_bool_t libhal_remove_device (LibHalContext *ctx,
const char *udi,
DBusError *error);
/* Merge properties from one device to another. */
dbus_bool_t libhal_merge_properties (LibHalContext *ctx,
const char *target_udi,
const char *source_udi,
DBusError *error);
/* Check a set of properties for two devices matches. */
dbus_bool_t libhal_device_matches (LibHalContext *ctx,
const char *udi1,
const char *udi2,
const char *property_namespace,
DBusError *error);
/* Find a device in the GDL where a single string property matches a
* given value.
*/
char **libhal_manager_find_device_string_match (LibHalContext *ctx,
const char *key,
const char *value,
int *num_devices,
DBusError *error);
/* Assign a capability to a device. */
dbus_bool_t libhal_device_add_capability (LibHalContext *ctx,
const char *udi,
const char *capability,
DBusError *error);
/* Check if a device has a capability. The result is undefined if the
* device doesn't exist.
*/
dbus_bool_t libhal_device_query_capability (LibHalContext *ctx,
const char *udi,
const char *capability,
DBusError *error);
/* Find devices with a given capability. */
char **libhal_find_device_by_capability (LibHalContext *ctx,
const char *capability,
int *num_devices,
DBusError *error);
/* Watch all devices, ie. the device_property_changed callback is
* invoked when the properties on any device changes.
*/
dbus_bool_t libhal_device_property_watch_all (LibHalContext *ctx,
DBusError *error);
/* Remove a watch of all devices.
*/
dbus_bool_t libhal_device_property_remove_watch_all (LibHalContext *ctx,
DBusError *error);
/* Add a watch on a device, so the device_property_changed callback is
* invoked when the properties on the given device changes.
*/
dbus_bool_t libhal_device_add_property_watch (LibHalContext *ctx,
const char *udi,
DBusError *error);
/* Remove a watch on a device */
dbus_bool_t libhal_device_remove_property_watch (LibHalContext *ctx,
const char *udi,
DBusError *error);
/* Take an advisory lock on the device. */
dbus_bool_t libhal_device_lock (LibHalContext *ctx,
const char *udi,
const char *reason_to_lock,
char **reason_why_locked,
DBusError *error);
/* Release an advisory lock on the device. */
dbus_bool_t libhal_device_unlock (LibHalContext *ctx,
const char *udi,
DBusError *error);
dbus_bool_t libhal_device_rescan (LibHalContext *ctx,
const char *udi,
DBusError *error);
dbus_bool_t libhal_device_reprobe (LibHalContext *ctx,
const char *udi,
DBusError *error);
/* Emit a condition from a device (for hald helpers only) */
dbus_bool_t libhal_device_emit_condition (LibHalContext *ctx,
const char *udi,
const char *condition_name,
const char *condition_details,
DBusError *error);
/* Claim an interface for a device (for hald helpers only) */
dbus_bool_t libhal_device_claim_interface (LibHalContext *ctx,
const char *udi,
const char *interface_name,
const char *introspection_xml,
DBusError *error);
/* hald waits for all addons to call this function before announcing the addon (for hald helpers only) */
dbus_bool_t libhal_device_addon_is_ready (LibHalContext *ctx, const char *udi, DBusError *error);
dbus_bool_t libhal_device_singleton_addon_is_ready (LibHalContext *ctx, const char *command_line, DBusError *error);
/* Take a mandatory lock on an interface on a device. */
dbus_bool_t libhal_device_acquire_interface_lock (LibHalContext *ctx,
const char *udi,
const char *interface,
dbus_bool_t exclusive,
DBusError *error);
/* Release a mandatory lock on an interface on a device. */
dbus_bool_t libhal_device_release_interface_lock (LibHalContext *ctx,
const char *udi,
const char *interface,
DBusError *error);
/* Take a mandatory lock on an interface (the lock affects all devices the caller have access to). */
dbus_bool_t libhal_acquire_global_interface_lock (LibHalContext *ctx,
const char *interface,
dbus_bool_t exclusive,
DBusError *error);
/* Release a mandatory lock on an interface (affects all devices the caller have access to). */
dbus_bool_t libhal_release_global_interface_lock (LibHalContext *ctx,
const char *interface,
DBusError *error);
/* Determine if a given caller is locked out of a given interface on a given device */
dbus_bool_t libhal_device_is_caller_locked_out (LibHalContext *ctx,
const char *udi,
const char *interface,
const char *caller,
DBusError *error);
/* Determines whether a determines other processes than the caller holds a lock on the given device. */
dbus_bool_t libhal_device_is_locked_by_others (LibHalContext *ctx,
const char *udi,
const char *interface,
DBusError *error);
/* Determine if a given caller is privileged (requires HAL to be built with PolicyKit support) */
char* libhal_device_is_caller_privileged (LibHalContext *ctx,
const char *udi,
const char *action,
const char *caller,
DBusError *error);
#if defined(__cplusplus)
}
#endif
#endif /* LIBHAL_H */

+ 0
- 605
deps/uthash.h View File

@ -1,605 +0,0 @@
/*
Copyright (c) 2003-2006, Troy Hanson http://uthash.sourceforge.net
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in
the documentation and/or other materials provided with the
distribution.
* Neither the name of the copyright holder nor the names of its
contributors may be used to endorse or promote products derived
from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <string.h> /* memcmp,strlen */
#ifndef UTHASH_H
#define UTHASH_H
#define uthash_fatal(msg) exit(-1) /* fatal error (out of memory,etc) */
#define uthash_bkt_malloc(sz) malloc(sz) /* malloc fcn for UT_hash_bucket's */
#define uthash_bkt_free(ptr) free(ptr) /* free fcn for UT_hash_bucket's */
#define uthash_tbl_malloc(sz) malloc(sz) /* malloc fcn for UT_hash_table */
#define uthash_tbl_free(ptr) free(ptr) /* free fcn for UT_hash_table */
#define uthash_noexpand_fyi(tbl) /* can be defined to log noexpand */
#define uthash_expand_fyi(tbl) /* can be defined to log expands */
/* initial number of buckets */
#define HASH_INITIAL_NUM_BUCKETS 32 /* initial number of buckets */
#define HASH_BKT_CAPACITY_THRESH 10 /* expand when bucket count reaches */
#define HASH_FIND(hh,head,keyptr,keylen_in,out) \
do { \
out=head; \
if (head) { \
(head)->hh.tbl->key = (char*)(keyptr); \
(head)->hh.tbl->keylen = keylen_in; \
HASH_FCN((head)->hh.tbl->key,(head)->hh.tbl->keylen, \
(head)->hh.tbl->num_buckets,(head)->hh.tbl->bkt, \
(head)->hh.tbl->i, (head)->hh.tbl->j,(head)->hh.tbl->k); \
HASH_FIND_IN_BKT(hh, (head)->hh.tbl->buckets[ (head)->hh.tbl->bkt], \
keyptr,keylen_in,out); \
} \
} while (0)
#define HASH_ADD(hh,head,fieldname,keylen_in,add) \
HASH_ADD_KEYPTR(hh,head,&add->fieldname,keylen_in,add)
#define HASH_ADD_KEYPTR(hh,head,keyptr,keylen_in,add) \
do { \
add->hh.next = NULL; \
add->hh.key = (char*)keyptr; \
add->hh.keylen = keylen_in; \
add->hh.elmt = add; \
if (!(head)) { \
head = add; \
(head)->hh.prev = NULL; \
(head)->hh.tbl = (UT_hash_table*)uthash_tbl_malloc( \
sizeof(UT_hash_table)); \
if (!((head)->hh.tbl)) { uthash_fatal( "out of memory"); } \
(head)->hh.tbl->name = #head; \
(head)->hh.tbl->tail = &(add->hh); \
(head)->hh.tbl->noexpand = 0; \
(head)->hh.tbl->hash_q = 1<<16; \
(head)->hh.tbl->num_buckets = HASH_INITIAL_NUM_BUCKETS; \
(head)->hh.tbl->num_items = 0; \
(head)->hh.tbl->hho = ((long)(&add->hh) - (long)(add)); \
(head)->hh.tbl->buckets = (UT_hash_bucket*)uthash_bkt_malloc( \
HASH_INITIAL_NUM_BUCKETS*sizeof(struct UT_hash_bucket)); \
if (! (head)->hh.tbl->buckets) { uthash_fatal( "out of memory"); } \
memset((head)->hh.tbl->buckets, 0, \
HASH_INITIAL_NUM_BUCKETS*sizeof(struct UT_hash_bucket)); \
} else { \
(head)->hh.tbl->tail->next = add; \
add->hh.prev = (head)->hh.tbl->tail->elmt; \
(head)->hh.tbl->tail = &(add->hh); \
} \
(head)->hh.tbl->num_items++; \
add->hh.tbl = (head)->hh.tbl; \
(head)->hh.tbl->key = (char*)keyptr; \
(head)->hh.tbl->keylen = keylen_in; \
HASH_FCN((head)->hh.tbl->key,(head)->hh.tbl->keylen, \
(head)->hh.tbl->num_buckets, \
(head)->hh.tbl->bkt, \
(head)->hh.tbl->i, (head)->hh.tbl->j, (head)->hh.tbl->k ); \
HASH_ADD_TO_BKT(hh,(head)->hh.tbl->buckets[(head)->hh.tbl->bkt],add); \
HASH_EMIT_KEY(hh,head,keyptr,keylen_in); \
HASH_FSCK(head); \
} while(0)
#define HASH_DELETE(hh,head,delptr) \
do { \
if ( ((delptr)->hh.prev == NULL) && ((delptr)->hh.next == NULL) ) { \
uthash_bkt_free((head)->hh.tbl->buckets ); \
uthash_tbl_free((head)->hh.tbl); \
head = NULL; \
} else { \
if ((delptr) == (head)->hh.tbl->tail->elmt) { \
(head)->hh.tbl->tail = (void*)(((long)((delptr)->hh.prev)) + \
(head)->hh.tbl->hho); \
} \
if ((delptr)->hh.prev) { \
((UT_hash_handle*)(((long)((delptr)->hh.prev)) + \
(head)->hh.tbl->hho))->next = (delptr)->hh.next; \
} else { \
head = (delptr)->hh.next; \
} \
if ((delptr)->hh.next) { \
((UT_hash_handle*)(((long)((delptr)->hh.next)) + \
(head)->hh.tbl->hho))->prev = (delptr)->hh.prev; \
} \
(head)->hh.tbl->key = (char*)((delptr)->hh.key); \
(head)->hh.tbl->keylen = (delptr)->hh.keylen; \
HASH_FCN((head)->hh.tbl->key,(head)->hh.tbl->keylen, \
(head)->hh.tbl->num_buckets,(head)->hh.tbl->bkt, \
(head)->hh.tbl->i,(head)->hh.tbl->j,(head)->hh.tbl->k ); \
HASH_DEL_IN_BKT(hh,(head)->hh.tbl->buckets[(head)->hh.tbl->bkt], \
delptr); \
(head)->hh.tbl->num_items--; \
} \
HASH_FSCK(head); \
} while (0)
/* convenience forms of HASH_FIND/HASH_ADD/HASH_DEL */
#define HASH_FIND_STR(head,findstr,out) \
HASH_FIND(hh,head,findstr,strlen(findstr),out)
#define HASH_ADD_STR(head,strfield,add) \
HASH_ADD(hh,head,strfield,strlen(add->strfield),add)
#define HASH_FIND_INT(head,findint,out) \
HASH_FIND(hh,head,findint,sizeof(int),out)
#define HASH_ADD_INT(head,intfield,add) \
HASH_ADD(hh,head,intfield,sizeof(int),add)
#define HASH_DEL(head,delptr) \
HASH_DELETE(hh,head,delptr)
/* HASH_FSCK checks hash integrity on every add/delete when HASH_DEBUG is defined.
* This is for uthash developer only; it compiles away if HASH_DEBUG isn't defined.
* This function misuses fields in UT_hash_table for its bookkeeping variables.
*/
#ifdef HASH_DEBUG
#define HASH_OOPS(...) do { fprintf(stderr,__VA_ARGS__); exit(-1); } while (0)
#define HASH_FSCK(head) \
do { \
if (head) { \
(head)->hh.tbl->keylen = 0; /* item counter */ \
for( (head)->hh.tbl->bkt_i = 0; \
(head)->hh.tbl->bkt_i < (head)->hh.tbl->num_buckets; \
(head)->hh.tbl->bkt_i++) \
{ \
(head)->hh.tbl->bkt_ideal = 0; /* bkt item counter */ \
(head)->hh.tbl->hh = \
(head)->hh.tbl->buckets[(head)->hh.tbl->bkt_i].hh_head; \
(head)->hh.tbl->key = NULL; /* hh_prev */ \
while ((head)->hh.tbl->hh) { \
if ((head)->hh.tbl->key != \
(char*)((head)->hh.tbl->hh->hh_prev)) { \
HASH_OOPS("invalid hh_prev %x, actual %x\n", \
(head)->hh.tbl->hh->hh_prev, \
(head)->hh.tbl->key ); \
} \
(head)->hh.tbl->bkt_ideal++; \
(head)->hh.tbl->key = (char*)((head)->hh.tbl->hh); \
(head)->hh.tbl->hh = (head)->hh.tbl->hh->hh_next; \
} \
(head)->hh.tbl->keylen += (head)->hh.tbl->bkt_ideal; \
if ((head)->hh.tbl->buckets[(head)->hh.tbl->bkt_i].count \
!= (head)->hh.tbl->bkt_ideal) { \
HASH_OOPS("invalid bucket count %d, actual %d\n", \
(head)->hh.tbl->buckets[(head)->hh.tbl->bkt_i].count, \
(head)->hh.tbl->bkt_ideal); \
} \
} \
if ((head)->hh.tbl->keylen != (head)->hh.tbl->num_items) { \
HASH_OOPS("invalid hh item count %d, actual %d\n", \
(head)->hh.tbl->num_items, (head)->hh.tbl->keylen ); \
} \
/* traverse hh in app order; check next/prev integrity, count */ \
(head)->hh.tbl->keylen = 0; /* item counter */ \
(head)->hh.tbl->key = NULL; /* app prev */ \
(head)->hh.tbl->hh = &(head)->hh; \
while ((head)->hh.tbl->hh) { \
(head)->hh.tbl->keylen++; \
if ((head)->hh.tbl->key !=(char*)((head)->hh.tbl->hh->prev)) {\
HASH_OOPS("invalid prev %x, actual %x\n", \
(head)->hh.tbl->hh->prev, \
(head)->hh.tbl->key ); \
} \
(head)->hh.tbl->key = (head)->hh.tbl->hh->elmt; \
(head)->hh.tbl->hh = ( (head)->hh.tbl->hh->next ? \
(UT_hash_handle*)((long)((head)->hh.tbl->hh->next) + \
(head)->hh.tbl->hho) \
: NULL ); \
} \
if ((head)->hh.tbl->keylen != (head)->hh.tbl->num_items) { \
HASH_OOPS("invalid app item count %d, actual %d\n", \
(head)->hh.tbl->num_items, (head)->hh.tbl->keylen ); \
} \
} \
} while (0)
#else
#define HASH_FSCK(head)
#endif
/* When compiled with -DHASH_EMIT_KEYS, length-prefixed keys are emitted to
* the descriptor to which this macro is defined for tuning the hash function.
* The app can #include <unistd.h> to get the prototype for write(2). */
#ifdef HASH_EMIT_KEYS
#define HASH_EMIT_KEY(hh,head,keyptr,fieldlen) \
(head)->hh.tbl->keylen = fieldlen; \
write(HASH_EMIT_KEYS, &((head)->hh.tbl->keylen), sizeof(int)); \
write(HASH_EMIT_KEYS, keyptr, fieldlen);
#else
#define HASH_EMIT_KEY(hh,head,keyptr,fieldlen)
#endif
/* default to Jenkins unless specified e.g. DHASH_FUNCTION=HASH_SAX */
#ifdef HASH_FUNCTION
#define HASH_FCN HASH_FUNCTION
#else
#define HASH_FCN HASH_JEN
#endif
/* The Bernstein hash function, used in Perl prior to v5.6 */
#define HASH_BER(key,keylen,num_bkts,bkt,i,j,k) \
bkt = 0; \
while (keylen--) bkt = (bkt * 33) + *key++; \
bkt &= (num_bkts-1);
/* SAX/FNV/OAT/JEN/JSW hash functions are macro variants of those listed at
* http://eternallyconfuzzled.com/tuts/hashing.html (thanks Julienne Walker) */
#define HASH_SAX(key,keylen,num_bkts,bkt,i,j,k) \
bkt = 0; \
for(i=0; i < keylen; i++) \
bkt ^= (bkt << 5) + (bkt >> 2) + key[i]; \
bkt &= (num_bkts-1);
#define HASH_FNV(key,keylen,num_bkts,bkt,i,j,k) \
bkt = 2166136261UL; \
for(i=0; i < keylen; i++) \
bkt = (bkt * 16777619) ^ key[i]; \
bkt &= (num_bkts-1);
#define HASH_OAT(key,keylen,num_bkts,bkt,i,j,k) \
bkt = 0; \
for(i=0; i < keylen; i++) { \
bkt += key[i]; \
bkt += (bkt << 10); \
bkt ^= (bkt >> 6); \
} \
bkt += (bkt << 3); \
bkt ^= (bkt >> 11); \
bkt += (bkt << 15); \
bkt &= (num_bkts-1);
#define HASH_JEN_MIX(a,b,c) \
{ \
a -= b; a -= c; a ^= ( c >> 13 ); \
b -= c; b -= a; b ^= ( a << 8 ); \
c -= a; c -= b; c ^= ( b >> 13 ); \
a -= b; a -= c; a ^= ( c >> 12 ); \
b -= c; b -= a; b ^= ( a << 16 ); \
c -= a; c -= b; c ^= ( b >> 5 ); \
a -= b; a -= c; a ^= ( c >> 3 ); \
b -= c; b -= a; b ^= ( a << 10 ); \
c -= a; c -= b; c ^= ( b >> 15 ); \
}
#define HASH_JEN(key,keylen,num_bkts,bkt,i,j,k) \
bkt = 0xfeedbeef; \
i = j = 0x9e3779b9; \
k = keylen; \
while (k >= 12) { \
i += (key[0] + ( (unsigned)key[1] << 8 ) \
+ ( (unsigned)key[2] << 16 ) \
+ ( (unsigned)key[3] << 24 ) ); \
j += (key[4] + ( (unsigned)key[5] << 8 ) \
+ ( (unsigned)key[6] << 16 ) \
+ ( (unsigned)key[7] << 24 ) ); \
bkt += (key[8] + ( (unsigned)key[9] << 8 ) \
+ ( (unsigned)key[10] << 16 ) \
+ ( (unsigned)key[11] << 24 ) ); \
\
HASH_JEN_MIX(i, j, bkt); \
\
key += 12; \
k -= 12; \
} \
bkt += keylen; \
switch ( k ) { \
case 11: bkt += ( (unsigned)key[10] << 24 ); \
case 10: bkt += ( (unsigned)key[9] << 16 ); \
case 9: bkt += ( (unsigned)key[8] << 8 ); \
case 8: j += ( (unsigned)key[7] << 24 ); \
case 7: j += ( (unsigned)key[6] << 16 ); \
case 6: j += ( (unsigned)key[5] << 8 ); \
case 5: j += key[4]; \
case 4: i += ( (unsigned)key[3] << 24 ); \
case 3: i += ( (unsigned)key[2] << 16 ); \
case 2: i += ( (unsigned)key[1] << 8 ); \
case 1: i += key[0]; \
} \
HASH_JEN_MIX(i, j, bkt); \
bkt &= (num_bkts-1);
#define HASH_JSW(key,keylen,num_bkts,bkt,i,j,k) \
bkt = 16777551; \
for(i=0; i < keylen; i++) { \
bkt = (bkt << 1 | bkt >> 31) ^ \
*(int*)((long)( \
"\xe9\x81\x51\xe4\x84\x9d\x32\xd9\x2d\xda\xca\x94\xa7\x85\x1e" \
"\x28\xfe\xa3\x18\x60\x28\x45\xa6\x48\x67\xdb\xd5\xa2\x91\x4d" \
"\x1a\x2f\x97\x37\x82\xd8\xe9\x1c\xb7\x7b\x3c\xa5\x4c\x23\x2" \
"\x42\x85\x20\x78\x6c\x6\x67\x6f\xa5\xcb\x53\x8c\xe1\x1f\x12" \
"\x66\xcb\xa0\xbe\x47\x59\x8\x20\xd5\x31\xd9\xdc\xcc\x27\xc3" \
"\x4d\x8\x9f\xb3\x50\x8\x90\x4f\x1f\x20\x60\xb8\xe2\x7b\x63" \
"\x49\xc0\x64\xc7\xaf\xc9\x81\x9c\x5f\x7d\x45\xc5\xe4\xe4\x86" \
"\xaf\x1a\x15\x6c\x9b\xc3\x7c\xc5\x88\x2b\xf3\xd9\x72\x76\x47" \
"\x56\xe6\x8c\xd1\x6c\x94\x41\x59\x4d\xe2\xd7\x44\x9a\x55\x5e" \
"\xee\x9d\x7c\x8f\x21\x57\x10\x77\xf7\x4b\xd8\x7e\xc0\x4d\xba" \
"\x1f\x96\x2a\x60\x13\xae\xab\x58\x70\xe5\x23\x62\x2b\x63\xb6" \
"\x42\x8e\x8f\x57\xf2\xfa\x47\x37\x91\xac\x11\x3d\x9a\x85\x73" \
"\x9e\x39\x65\xc8\xd4\x5b\xaa\x35\x72\x5f\x40\x31\x9a\xb0\xdd" \
"\xa9\x2c\x16\xa3\x32\xef\xcb\x8c\x80\x33\x60\xd\x85\xce\x22" \
"\x8c\x28\x6\x7f\xff\xf6\x8a\x5f\x21\x8e\xf2\xd0\xd9\x63\x66" \
"\x22\xe8\xe6\x3\x39\xfd\x10\x69\xce\x6c\xc4\xde\xf3\x87\x56" \
"\xc8\x4a\x31\x51\x58\xc5\x62\x30\x8e\xd\xd5\x2f\x7c\x24\xca" \
"\xd1\x12\x1b\x3a\x3e\x95\x99\xa\x7\xc1\x83\xd0\x4f\x97\x8c" \
"\xf1\xb0\x9c\xd8\xb9\x72\xd7\x3e\x6b\x66\x83\x8e\xe9\x86\xad" \
"\xfa\xc2\xe\x4\xb5\x7b\x5d\x0\xbc\x47\xbe\x4\x69\xfa\xd1" \
"\x29\x5c\x77\x38\xfc\x88\xeb\xd5\xe1\x17\x54\xf6\xe5\xb3\xae" \
"\xc7\x14\xb6\x4b\xa6\x42\x4b\xa3\xdf\xa5\xcf\xdb\xad\xcd\x2c" \
"\xa3\x3\x13\xc0\x42\x5d\x6e\x3c\xfe\xd8\xeb\xa7\x96\x47\x2b" \
"\x61\xb3\x70\xc9\x6d\xff\x1a\x82\x65\xdc\x92\x4b\x1a\x52\x75" \
"\xa5\x61\x55\x2b\xe\x7\xde\x1e\x71\xc5\x12\x34\x59\x4f\x19" \
"\x2\x9\xb6\x5\xe6\x7b\xad\xb6\x92\xfb\x84\x32\xf1\x45\x6c" \
"\xec\x1a\xcb\x39\x32\x2\x47\x51\xd6\xc8\x9d\xd0\xb1\xdb\xa8" \
"\x90\x4c\x65\x5a\x77\x1f\xca\x74\x8e\x3b\xce\x76\x55\x8b\x78" \
"\x3c\xf3\x19\x8f\xe1\xc3\xa9\x8a\xc8\xf3\x14\x30\x4e\x77\xe9" \
"\xd5\x6a\xcb\x96\x2f\x31\x35\xff\x6b\x10\x92\xf7\xc4\x33\xb8" \
"\x76\x35\x6\xf\x82\x1c\xfa\x1f\x92\x47\xa1\xf9\x7e\xe5\x51" \
"\xee\x63\xaa\x9a\x38\xa3\xa1\x86\xbf\xf0\xe8\x29\xe1\x19\x83" \
"\xff\x36\x3c\x26\x15\x89\x36\x22\x93\x41\x3e\x63\x36\x34\x4c" \
"\xda\x18\xd4\x18\xd8\xc8\x8a\x10\x1f\x14\x4c\x7f\x79\xfc\x46" \
"\xbb\xc8\x24\x51\xc7\xe4\xfb\xc0\x78\xb1\xe9\xac\xf1\x3d\x55" \
"\x51\x9c\x8\xf0\xa6\x3\xcb\x91\xc6\xf4\xe2\xd4\xe5\x18\x61" \
"\xfc\x8f\x8a\xce\x89\x33\xcd\xf\x7d\x50\xa0\x7d\x3f\xac\x49" \
"\xe1\x71\x92\xc7\x8d\xc0\xd0\x6e\xe4\xf7\xcd\xc1\x47\x9f\x99" \
"\xd5\x7\x20\xad\x64\xdb\xab\x44\xd4\x8\xc6\x9a\xa4\xa7\x7c" \
"\x9b\x13\xe4\x9c\x88\xec\xc4\xcb\xe1\x3f\x5\x5\xf\xd\x3a" \
"\x75\xed\xfa\xc0\x23\x34\x74\xfd\xca\x1c\x74\x77\x29\xc8\xb6" \
"\xe2\xbb\xa1\xa\x2e\xae\x65\x3e\xcb\xf5\x5e\xe0\x29\x4c\xfa" \
"\xab\x35\xea\x7\x9f\xb3\x3b\x9c\x4e\x86\xe8\x5b\x76\x11\xf1" \
"\xbf\x7f\x73\x34\x71\x9\x2d\x2a\x60\x8f\x14\x12\xba\x26\x84" \
"\xb9\x94\xa9\x59\x38\x25\xfd\x77\xc3\xe5\x86\xc4\x3\xda\x32" \
"\x30\xd8\x84\x81\x83\x14\x8c\x24\xee\x51\xa9\x92\x61\xb2\xeb" \
"\xce\xac\x34\xc1\xad\x24\x74\xce\xf9\xce\x5c\xfd\x45\x69\x1d" \
"\xc6\xc2\xaf\x7c\x8d\x5\x52\xb5\x88\x2f\x9f\xee\x6b\x5f\xbd" \
"\xfe\x22\x6\x47\xa2\xc8\x25\x37\x67\x44\x4c\xe\xfe\x7e\x5a" \
"\x36\x7f\x18\x83\x8f\x82\x87\x3b\xbf\xb8\xd2\x37\xff\x52\x60" \
"\xb5\xf3\xd\x20\x80\xcc\xb2\x7a\xdd\xc2\x94\xbc\xe3\xb1\x87" \
"\x3e\x49\x57\xcc\xe9\x5a\xea\xb4\xe\xdf\xa6\x8f\x70\x60\x32" \
"\xb\x7d\x74\xf5\x46\xb6\x93\xc2\x5\x92\x72\xfc\xd9\xd2\xe5" \
"\x90\x36\x2a\xd4\xf9\x50\x33\x52\xa5\xcc\xcf\x14\x9e\xdc\x4f" \
"\xb7\x7d\xcf\x25\xdb\xc0\x46\xdb\xea\xe\x27\xc8\x18\x40\x39" \
"\xbd\xec\x48\xa3\xfa\x87\xa3\x18\x68\xfc\x7a\x44\xa8\xc5\x8c" \
"\x45\x81\x70\x72\x14\x70\xf9\x40\xc8\xe7\x41\xcb\xde\xd\x4e" \
"\x35\x4d\xcd\xe2\x40\xa3\x2e\xbb\xb7\x50\x6c\x26\xb8\xbe\x2a" \
"\x36\x8e\x23\xb\xa\xfe\xed\xa\xe7\xa0\x16\x73\xad\x24\x51" \
"\x7f\xda\x9d\xd7\x9f\x18\xe6\xa8\xe4\x98\xbc\x62\x77\x55\x60" \
"\x88\x16\x25\xbf\x95\xad\xea\xe1\x87\x18\x35\x9e\x7c\x51\xee" \
"\xc0\x80\x8b\xb8\x37\xfd\x95\xfe\x87\x15\xf4\x97\xd5\x61\x4f" \
"\x97\xfa\xaf\x48\xd\x5b\x84\x2d\xdb\x15\xf2\xb4\x17\x4f\x41" \
"\x31\x58\x32\x93\xc1\x52\x34\xa6\x17\xd\x56\x5\xee\xfb\xfb" \
"\x2d\x69\x14\xbe\x24\x94\x8\xb0\xfc\x9f\x2\x95\x88\x7d\xd6" \
"\xe7\xa4\x5b\xbb\xf2\x7d\xd8\xa5\xd2\x7c\x9\x62\x22\x5\x53" \
"\xd0\x67\xeb\x68\xfc\x82\x80\xf\xc9\x73\x76\x36\xb8\x13\x9f" \
"\xb1\xf1\xee\x61\x12\xe7\x5d\x75\x65\xb8\x84\x17\xb\x7b\x28" \
"\x4c\xb7\xda\xbb" ) \
+ ( (unsigned char)key[i] * sizeof(int) )); \
} \
bkt &= (num_bkts-1);
/* key comparison function; return 0 if keys equal */
#define HASH_KEYCMP(a,b,len) memcmp(a,b,len)
/* iterate over items in a known bucket to find desired item */
#define HASH_FIND_IN_BKT(hh,head,keyptr,keylen_in,out) \
out = (head.hh_head) ? (head.hh_head->elmt) : NULL; \
while (out) { \
if (out->hh.keylen == keylen_in) { \
if ((HASH_KEYCMP(out->hh.key,keyptr,keylen_in)) == 0) break; \
} \
out= (out->hh.hh_next) ? (out->hh.hh_next->elmt) : NULL; \
}
/* add an item to a bucket */
#define HASH_ADD_TO_BKT(hh,head,add) \
head.count++; \
add->hh.hh_next = head.hh_head; \
add->hh.hh_prev = NULL; \
if (head.hh_head) head.hh_head->hh_prev = &add->hh; \
head.hh_head=&add->hh; \
if (head.count >= ((head.expand_mult+1) * HASH_BKT_CAPACITY_THRESH) \
&& add->hh.tbl->noexpand != 1) { \
HASH_EXPAND_BUCKETS(add->hh.tbl) \
}
/* remove an item from a given bucket */
#define HASH_DEL_IN_BKT(hh,head,delptr) \
(head).count--; \
if ((head).hh_head->elmt == delptr) { \
(head).hh_head = delptr->hh.hh_next; \
} \
if (delptr->hh.hh_prev) { \
delptr->hh.hh_prev->hh_next = delptr->hh.hh_next; \
} \
if (delptr->hh.hh_next) { \
delptr->hh.hh_next->hh_prev = delptr->hh.hh_prev; \
}
#define HASH_EXPAND_BUCKETS(tbl) \
tbl->new_buckets = (UT_hash_bucket*)uthash_bkt_malloc( \
2 * tbl->num_buckets * sizeof(struct UT_hash_bucket)); \
if (!tbl->new_buckets) { uthash_fatal( "out of memory"); } \
memset(tbl->new_buckets, 0, \
2 * tbl->num_buckets * sizeof(struct UT_hash_bucket)); \
tbl->bkt_ideal= (tbl->num_items / tbl->num_buckets*2) + \
((tbl->num_items % (tbl->num_buckets*2)) ? 1 : 0);\
tbl->sum_of_deltas = 0; \
for(tbl->bkt_i = 0; tbl->bkt_i < tbl->num_buckets; tbl->bkt_i++) \
{ \
tbl->hh = tbl->buckets[ tbl->bkt_i ].hh_head; \
while (tbl->hh) { \
tbl->hh_nxt = tbl->hh->hh_next; \
tbl->key = tbl->hh->key; \
tbl->keylen = tbl->hh->keylen; \
HASH_FCN(tbl->key,tbl->keylen,tbl->num_buckets*2,tbl->bkt,\
tbl->i,tbl->j,tbl->k); \
tbl->newbkt = &(tbl->new_buckets[ tbl->bkt ]); \
if (++(tbl->newbkt->count) > tbl->bkt_ideal) { \
tbl->sum_of_deltas++; \
tbl->newbkt->expand_mult = tbl->newbkt->count / \
tbl->bkt_ideal; \
} \
tbl->hh->hh_prev = NULL; \
tbl->hh->hh_next = tbl->newbkt->hh_head; \
if (tbl->newbkt->hh_head) tbl->newbkt->hh_head->hh_prev = \
tbl->hh; \
tbl->newbkt->hh_head = tbl->hh; \
tbl->hh = tbl->hh_nxt; \
} \
} \
tbl->num_buckets *= 2; \
uthash_bkt_free( tbl->buckets ); \
tbl->buckets = tbl->new_buckets; \
tbl->new_hash_q = (1<<16) - ((tbl->sum_of_deltas << 16) / tbl->num_items); \
if (tbl->hash_q < (1<<15) && tbl->new_hash_q < (1<<15)) { \
tbl->noexpand=1; \
uthash_noexpand_fyi(tbl); \
} \
tbl->hash_q = tbl->new_hash_q; \
uthash_expand_fyi(tbl);
/* This is an adaptation of Simon Tatham's O(n log(n)) mergesort */
#define HASH_SORT(head,cmpfcn) \
if (head) { \
(head)->hh.tbl->insize = 1; \
(head)->hh.tbl->looping = 1; \
(head)->hh.tbl->list = &((head)->hh); \
while ((head)->hh.tbl->looping) { \
(head)->hh.tbl->p = (head)->hh.tbl->list; \
(head)->hh.tbl->list = NULL; \
(head)->hh.tbl->tale = NULL; \
(head)->hh.tbl->nmerges = 0; \
while ((head)->hh.tbl->p) { \
(head)->hh.tbl->nmerges++; \
(head)->hh.tbl->q = (head)->hh.tbl->p; \
(head)->hh.tbl->psize = 0; \
for ( (head)->hh.tbl->i = 0; \
(head)->hh.tbl->i < (head)->hh.tbl->insize; \
(head)->hh.tbl->i++ ) { \
(head)->hh.tbl->psize++; \
(head)->hh.tbl->q = (((head)->hh.tbl->q->next) ? \
((void*)(((long)((head)->hh.tbl->q->next)) + \
(head)->hh.tbl->hho)) : NULL); \
if (! ((head)->hh.tbl->q) ) break; \
} \
(head)->hh.tbl->qsize = (head)->hh.tbl->insize; \
while (((head)->hh.tbl->psize > 0) || \
(((head)->hh.tbl->qsize > 0) && (head)->hh.tbl->q )) { \
if ((head)->hh.tbl->psize == 0) { \
(head)->hh.tbl->e = (head)->hh.tbl->q; \
(head)->hh.tbl->q = (((head)->hh.tbl->q->next) ? \
((void*)(((long)((head)->hh.tbl->q->next)) + \
(head)->hh.tbl->hho)) : NULL); \
(head)->hh.tbl->qsize--; \
} else if ( ((head)->hh.tbl->qsize == 0) || \
!((head)->hh.tbl->q) ) { \
(head)->hh.tbl->e = (head)->hh.tbl->p; \
(head)->hh.tbl->p = (((head)->hh.tbl->p->next) ? \
((void*)(((long)((head)->hh.tbl->p->next)) + \
(head)->hh.tbl->hho)) : NULL); \
(head)->hh.tbl->psize--; \
} else if (( \
cmpfcn((head)->hh.tbl->p->elmt,(head)->hh.tbl->q->elmt)) \
<= 0) { \
(head)->hh.tbl->e = (head)->hh.tbl->p; \
(head)->hh.tbl->p = (((head)->hh.tbl->p->next) ? \
((void*)(((long)((head)->hh.tbl->p->next)) + \
(head)->hh.tbl->hho)) : NULL); \
(head)->hh.tbl->psize--; \
} else { \
(head)->hh.tbl->e = (head)->hh.tbl->q; \
(head)->hh.tbl->q = (((head)->hh.tbl->q->next) ? \
((void*)(((long)((head)->hh.tbl->q->next)) + \
(head)->hh.tbl->hho)) : NULL); \
(head)->hh.tbl->qsize--; \
} \
if ( (head)->hh.tbl->tale ) { \
(head)->hh.tbl->tale->next = (((head)->hh.tbl->e) ? \
((head)->hh.tbl->e->elmt) : NULL); \
} else { \
(head)->hh.tbl->list = (head)->hh.tbl->e; \
} \
(head)->hh.tbl->e->prev = (((head)->hh.tbl->tale) ? \
((head)->hh.tbl->tale->elmt) : NULL); \
(head)->hh.tbl->tale = (head)->hh.tbl->e; \
} \
(head)->hh.tbl->p = (head)->hh.tbl->q; \
} \
(head)->hh.tbl->tale->next = NULL; \
if ( (head)->hh.tbl->nmerges <= 1 ) { \
(head)->hh.tbl->looping=0; \
(head)->hh.tbl->tail = (head)->hh.tbl->tale; \
(head) = (head)->hh.tbl->list->elmt; \
} \
(head)->hh.tbl->insize *= 2; \
} \
HASH_FSCK(head); \
}
typedef struct UT_hash_bucket {
struct UT_hash_handle *hh_head;
unsigned count;
unsigned expand_mult;
} UT_hash_bucket;
typedef struct UT_hash_table {
UT_hash_bucket *buckets;
unsigned num_buckets;
unsigned num_items;
int noexpand; /* when set, inhibits expansion of buckets for this hash */
int hash_q; /* measures the evenness of the items among buckets (0-1) */
struct UT_hash_handle *tail; /* tail hh in app order, for fast append */
char *name; /* macro-stringified name of list head, used by libut */
int hho;
/* scratch */
unsigned bkt;
char *key;
size_t keylen;
int i,j,k;
/* scratch for bucket expansion */
UT_hash_bucket *new_buckets, *newbkt;
struct UT_hash_handle *hh, *hh_nxt;
unsigned bkt_i, bkt_ideal, sum_of_deltas;
int new_hash_q;
/* scratch for sort */
int looping,nmerges,insize,psize,qsize;
struct UT_hash_handle *p, *q, *e, *list, *tale;
} UT_hash_table;
typedef struct UT_hash_handle {
struct UT_hash_table *tbl;
void *elmt; /* ptr to enclosing element */
void *prev; /* prev element in app order */
void *next; /* next element in app order */
struct UT_hash_handle *hh_prev; /* previous hh in bucket order */
struct UT_hash_handle *hh_next; /* next hh in bucket order */
void *key; /* ptr to enclosing struct's key */
size_t keylen; /* enclosing struct's key len */
} UT_hash_handle;
#endif /* UTHASH_H */

+ 12
- 32
src/device.c View File

@ -16,44 +16,33 @@
*/ */
#include <unistd.h> #include <unistd.h>
#include <stdlib.h>
#include <string.h> #include <string.h>
#include <dbus/dbus.h> #include <dbus/dbus.h>
#include <libhal-storage.h>
#include "conf.h" #include "conf.h"
#include "hal.h" #include "hal.h"
#include "log.h" #include "log.h"
#include "pad.h" #include "pad.h"
#include "device.h" #include "device.h"
static int pusb_device_connected(t_pusb_options *opts, LibHalContext *ctx)
static int pusb_device_connected(t_pusb_options *opts, DBusConnection *dbus)
{ {
char *udi = NULL; char *udi = NULL;
log_debug("Searching for \"%s\" in the hardware database...\n", log_debug("Searching for \"%s\" in the hardware database...\n",
opts->device.name); opts->device.name);
udi = pusb_hal_find_item(ctx,
"storage.serial", opts->device.serial,
"storage.vendor", opts->device.vendor,
"info.product", opts->device.model,
udi = pusb_hal_find_item(dbus,
"DriveSerial", opts->device.serial,
"DriveVendor", opts->device.vendor,
"DriveModel", opts->device.model,
NULL); NULL);
if (!udi) if (!udi)
{ {
/* Backward compatibility with older versions (0.4.1) */
udi = pusb_hal_find_item(ctx,
"usb_device.serial", opts->device.serial,
"usb_device.vendor", opts->device.vendor,
"info.product", opts->device.model,
NULL);
if (!udi)
{
log_error("Device \"%s\" is not connected.\n",
opts->device.name);
return (0);
}
log_error("Warning: The configuration file has been " \
"generated by an older version of pamusb-conf\n");
log_error("Device \"%s\" is not connected.\n",
opts->device.name);
return (0);
} }
libhal_free_string(udi);
free(udi);
log_info("Device \"%s\" is connected (good).\n", opts->device.name); log_info("Device \"%s\" is connected (good).\n", opts->device.name);
return (1); return (1);
} }
@ -62,30 +51,22 @@ int pusb_device_check(t_pusb_options *opts,
const char *user) const char *user)
{ {
DBusConnection *dbus = NULL; DBusConnection *dbus = NULL;
LibHalContext *ctx = NULL;
int retval = 0; int retval = 0;
log_debug("Connecting to HAL...\n"); log_debug("Connecting to HAL...\n");
if (!(dbus = pusb_hal_dbus_connect())) if (!(dbus = pusb_hal_dbus_connect()))
return (0); return (0);
if (!(ctx = pusb_hal_init(dbus)))
if (!pusb_device_connected(opts, dbus))
{ {
pusb_hal_dbus_disconnect(dbus); pusb_hal_dbus_disconnect(dbus);
return (0); return (0);
} }
if (!pusb_device_connected(opts, ctx))
{
pusb_hal_dbus_disconnect(dbus);
libhal_ctx_free(ctx);
return (0);
}
if (opts->one_time_pad) if (opts->one_time_pad)
{ {
log_info("Performing one time pad verification...\n"); log_info("Performing one time pad verification...\n");
retval = pusb_pad_check(opts, ctx, user);
retval = pusb_pad_check(opts, dbus, user);
} }
else else
{ {
@ -94,6 +75,5 @@ int pusb_device_check(t_pusb_options *opts,
} }
pusb_hal_dbus_disconnect(dbus); pusb_hal_dbus_disconnect(dbus);
libhal_ctx_free(ctx);
return (retval); return (retval);
} }

+ 195
- 59
src/hal.c View File

@ -15,13 +15,13 @@
* Place, Suite 330, Boston, MA 02111-1307 USA * Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#include <stdlib.h>
#include <string.h> #include <string.h>
#include <stdarg.h> #include <stdarg.h>
#include <unistd.h> #include <unistd.h>
#include <sys/types.h> #include <sys/types.h>
#include <dbus/dbus.h>
#include <libhal-storage.h>
#include "log.h" #include "log.h"
#include "hal.h"
DBusConnection *pusb_hal_dbus_connect(void) DBusConnection *pusb_hal_dbus_connect(void)
{ {
@ -58,57 +58,182 @@ void pusb_hal_dbus_disconnect(DBusConnection *dbus)
dbus_connection_unref(dbus); dbus_connection_unref(dbus);
} }
LibHalContext *pusb_hal_init(DBusConnection *dbus)
void pusb_hal_free_string_array(char **str_array, int length)
{ {
DBusError error;
LibHalContext *ctx = NULL;
int i;
dbus_error_init(&error);
if (!(ctx = libhal_ctx_new()))
if (str_array == NULL)
return ;
for (i = 0; i < length; ++i)
free(str_array[i]);
free(str_array);
}
char **pusb_hal_get_string_array_from_iter(DBusMessageIter *iter, int *num_elements)
{
int count;
char **buffer;
count = 0;
buffer = (char **)malloc(sizeof(char *) * 8);
buffer[0] = NULL;
while (dbus_message_iter_get_arg_type(iter) == DBUS_TYPE_STRING ||
dbus_message_iter_get_arg_type(iter) == DBUS_TYPE_OBJECT_PATH)
{ {
log_error("Failed to create a HAL context\n");
const char *value;
if ((count % 8) == 0 && count != 0) {
buffer = realloc(buffer, sizeof (char *) * (count + 8));
}
dbus_message_iter_get_basic(iter, &value);
buffer[count] = strdup(value);
dbus_message_iter_next(iter);
count++;
}
if (num_elements != NULL)
*num_elements = count;
return buffer;
}
DBusMessage *pusb_hal_get_raw_property(DBusConnection *dbus,
const char *udi,
const char *name)
{
DBusMessage *message;
DBusMessage *reply;
DBusMessageIter iter;
DBusError error;
char *iface = "org.freedesktop.UDisks.Device";
message = dbus_message_new_method_call("org.freedesktop.UDisks", udi,
"org.freedesktop.DBus.Properties",
"Get");
if (message == NULL) {
log_error("Could not allocate D-BUS message\n");
return (NULL); return (NULL);
} }
if (!libhal_ctx_set_dbus_connection(ctx, dbus))
{
log_error("Failed to attach dbus connection to hal\n");
libhal_ctx_free(ctx);
dbus_message_iter_init_append(message, &iter);
dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, &iface);
dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, &name);
dbus_error_init(&error);
reply = dbus_connection_send_with_reply_and_block(dbus,
message, -1,
&error);
dbus_message_unref(message);
if (dbus_error_is_set(&error)) {
log_error("Error communicating with D-BUS\n");
return (NULL); return (NULL);
} }
if (!libhal_ctx_init(ctx, &error))
dbus_error_free(&error);
return (reply);
}
char *pusb_hal_get_string_property(DBusConnection *dbus,
const char *udi,
const char *name)
{
DBusMessage *reply;
DBusMessageIter reply_iter;
char *data;
char *dbus_str;
reply = pusb_hal_get_raw_property(dbus, udi, name);
if (reply == NULL) {
return (NULL);
}
dbus_message_iter_init(reply, &reply_iter);
if (dbus_message_iter_get_arg_type(&reply_iter) != DBUS_TYPE_VARIANT)
{ {
log_error("libhal_ctx_init: %s\n", error.name, error.message);
libhal_ctx_free(ctx);
dbus_message_unref(reply);
return (NULL); return (NULL);
} }
return (ctx);
DBusMessageIter subiter;
dbus_message_iter_recurse(&reply_iter, &subiter);
dbus_message_iter_get_basic(&subiter, &dbus_str);
if (dbus_str != NULL)
data = strdup(dbus_str);
dbus_message_unref(reply);
return (data);
} }
void pusb_hal_destroy(LibHalContext *ctx)
char **pusb_hal_get_string_array_property(DBusConnection *dbus,
const char *udi,
const char *name,
int *n_items)
{ {
libhal_ctx_free(ctx);
DBusMessage *reply;
DBusMessageIter reply_iter;
char **items;
reply = pusb_hal_get_raw_property(dbus, udi, name);
if (reply == NULL) {
return (NULL);
}
dbus_message_iter_init(reply, &reply_iter);
if (dbus_message_iter_get_arg_type(&reply_iter) != DBUS_TYPE_VARIANT)
{
dbus_message_unref(reply);
return (NULL);
}
DBusMessageIter subiter, subsubiter;
dbus_message_iter_recurse(&reply_iter, &subiter);
dbus_message_iter_recurse(&subiter, &subsubiter);
items = pusb_hal_get_string_array_from_iter(&subsubiter, n_items);
dbus_message_unref(reply);
if (!*n_items)
{
pusb_hal_free_string_array(items, *n_items);
return (NULL);
}
return (items);
} }
char *pusb_hal_get_property(LibHalContext *ctx,
const char *udi,
const char *name)
int pusb_hal_get_bool_property(DBusConnection *dbus,
const char *udi,
const char *name,
dbus_bool_t *value)
{ {
DBusError error;
char *data;
DBusMessage *reply;
DBusMessageIter reply_iter;
dbus_error_init(&error);
data = libhal_device_get_property_string(ctx, udi,
name, &error);
if (!data)
reply = pusb_hal_get_raw_property(dbus, udi, name);
if (reply == NULL) {
return (0);
}
dbus_message_iter_init(reply, &reply_iter);
if (dbus_message_iter_get_arg_type(&reply_iter) !=
DBUS_TYPE_VARIANT)
{ {
log_debug("%s\n", error.message);
dbus_error_free(&error);
return (NULL);
dbus_message_unref(reply);
return (0);
} }
return (data);
DBusMessageIter subiter;
dbus_message_iter_recurse(&reply_iter, &subiter);
dbus_message_iter_get_basic(&subiter, value);
dbus_message_unref(reply);
return (1);
} }
int pusb_hal_check_property(LibHalContext *ctx,
int pusb_hal_check_property(DBusConnection *dbus,
const char *udi, const char *udi,
const char *name, const char *name,
const char *value) const char *value)
@ -116,50 +241,63 @@ int pusb_hal_check_property(LibHalContext *ctx,
char *data; char *data;
int retval; int retval;
data = pusb_hal_get_property(ctx, udi, name);
data = pusb_hal_get_string_property(dbus, udi, name);
if (!data) if (!data)
return (0); return (0);
retval = (strcmp(data, value) == 0); retval = (strcmp(data, value) == 0);
libhal_free_string(data);
free(data);
return (retval); return (retval);
} }
char **pusb_hal_find_all_items(LibHalContext *ctx,
const char *property,
const char *value,
int *count)
char **pusb_hal_find_all_items(DBusConnection *dbus, int *count)
{ {
DBusError error; DBusError error;
DBusMessage *message;
DBusMessage *reply;
DBusMessageIter iter_array, reply_iter;
char **devices; char **devices;
int n_devices; int n_devices;
dbus_error_init(&error);
*count = 0; *count = 0;
devices = libhal_manager_find_device_string_match(ctx,
property,
value,
&n_devices,
&error);
if (!devices)
message = dbus_message_new_method_call("org.freedesktop.UDisks",
"/org/freedesktop/UDisks",
"org.freedesktop.UDisks",
"EnumerateDevices");
if (message == NULL)
{ {
log_error("Unable to find item \"%s\": %s\n", property,
error.message);
dbus_error_free(&error);
log_error("Couldn't allocate D-BUS message\n");
return (NULL);
}
dbus_error_init(&error);
reply = dbus_connection_send_with_reply_and_block(dbus,
message, -1,
&error);
dbus_message_unref(message);
if (dbus_error_is_set(&error)) {
log_error("Error communicating with D-BUS\n");
return (NULL);
}
if (reply == NULL) {
return (NULL);
}
dbus_message_iter_init(reply, &reply_iter);
if (dbus_message_iter_get_arg_type(&reply_iter) != DBUS_TYPE_ARRAY) {
log_error("Malformed D-BUS reply");
return (NULL); return (NULL);
} }
dbus_message_iter_recurse(&reply_iter, &iter_array);
devices = pusb_hal_get_string_array_from_iter(&iter_array, &n_devices);
dbus_message_unref(reply);
if (!n_devices) if (!n_devices)
{ {
libhal_free_string_array(devices);
pusb_hal_free_string_array(devices, n_devices);
return (NULL); return (NULL);
} }
*count = n_devices; *count = n_devices;
return (devices); return (devices);
} }
char *pusb_hal_find_item(LibHalContext *ctx,
const char *property,
const char *value,
char *pusb_hal_find_item(DBusConnection *dbus,
...) ...)
{ {
char **devices; char **devices;
@ -168,7 +306,7 @@ char *pusb_hal_find_item(LibHalContext *ctx,
va_list ap; va_list ap;
int i; int i;
devices = pusb_hal_find_all_items(ctx, property, value, &n_devices);
devices = pusb_hal_find_all_items(dbus, &n_devices);
if (!devices) if (!devices)
return (NULL); return (NULL);
if (!n_devices) if (!n_devices)
@ -179,7 +317,7 @@ char *pusb_hal_find_item(LibHalContext *ctx,
char *key = NULL; char *key = NULL;
int match = 1; int match = 1;
va_start(ap, value);
va_start(ap, dbus);
while ((key = va_arg(ap, char *))) while ((key = va_arg(ap, char *)))
{ {
char *value = NULL; char *value = NULL;
@ -187,11 +325,9 @@ char *pusb_hal_find_item(LibHalContext *ctx,
value = va_arg(ap, char *); value = va_arg(ap, char *);
if (!value || *value == 0x0) if (!value || *value == 0x0)
continue ; continue ;
if (!pusb_hal_check_property(ctx, devices[i],
if (!pusb_hal_check_property(dbus, devices[i],
key, value)) key, value))
{ {
log_debug("%s did match, but property %s didn't (expecting \"%s\")\n",
property, key, value);
match = 0; match = 0;
break; break;
} }
@ -203,6 +339,6 @@ char *pusb_hal_find_item(LibHalContext *ctx,
} }
va_end(ap); va_end(ap);
} }
libhal_free_string_array(devices);
pusb_hal_free_string_array(devices, n_devices);
return (udi); return (udi);
} }

+ 7
- 5
src/hal.h View File

@ -17,13 +17,15 @@
#ifndef PUSB_HAL_H_ #ifndef PUSB_HAL_H_
# define PUSB_HAL_H_ # define PUSB_HAL_H_
# include <dbus/dbus.h>
DBusConnection *pusb_hal_dbus_connect(void); DBusConnection *pusb_hal_dbus_connect(void);
void pusb_hal_dbus_disconnect(DBusConnection *dbus); void pusb_hal_dbus_disconnect(DBusConnection *dbus);
LibHalContext *pusb_hal_init(DBusConnection *dbus);
void pusb_hal_destroy(LibHalContext *ctx);
char *pusb_hal_get_property(LibHalContext *ctx, const char *udi, const char *name);
int pusb_hal_check_property(LibHalContext *ctx, const char *udi, const char *name, const char *value);
char *pusb_hal_find_item(LibHalContext *ctx, const char *property, const char *value, ...);
char *pusb_hal_get_string_property(DBusConnection *dbus, const char *udi, const char *name);
int pusb_hal_get_bool_property(DBusConnection *dbus, const char *udi, const char *name, dbus_bool_t *value);
char **pusb_hal_get_string_array_property(DBusConnection *dbus, const char *udi, const char *name, int *n_items);
int pusb_hal_check_property(DBusConnection *dbus, const char *udi, const char *name, const char *value);
char *pusb_hal_find_item(DBusConnection *dbus, ...);
void pusb_hal_free_string_array(char **str_array, int length);
#endif /* !PUSB_HAL_H_ */ #endif /* !PUSB_HAL_H_ */

+ 7
- 12
src/pad.c View File

@ -24,25 +24,20 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <pwd.h> #include <pwd.h>
#include <time.h> #include <time.h>
#include <libhal-storage.h>
#include "conf.h" #include "conf.h"
#include "log.h" #include "log.h"
#include "volume.h" #include "volume.h"
#include "pad.h" #include "pad.h"
static FILE *pusb_pad_open_device(t_pusb_options *opts, static FILE *pusb_pad_open_device(t_pusb_options *opts,
LibHalVolume *volume,
const char *mnt_point,
const char *user, const char *user,
const char *mode) const char *mode)
{ {
FILE *f; FILE *f;
char path[PATH_MAX]; char path[PATH_MAX];
const char *mnt_point;
struct stat sb; struct stat sb;
mnt_point = (char *)libhal_volume_get_mount_point(volume);
if (!mnt_point)
return (NULL);
memset(path, 0x00, PATH_MAX); memset(path, 0x00, PATH_MAX);
snprintf(path, PATH_MAX, "%s/%s", mnt_point, opts->device_pad_directory); snprintf(path, PATH_MAX, "%s/%s", mnt_point, opts->device_pad_directory);
if (stat(path, &sb) != 0) if (stat(path, &sb) != 0)
@ -179,7 +174,7 @@ static int pusb_pad_should_update(t_pusb_options *opts, const char *user)
} }
static void pusb_pad_update(t_pusb_options *opts, static void pusb_pad_update(t_pusb_options *opts,
LibHalVolume *volume,
const char *volume,
const char *user) const char *user)
{ {
FILE *f_device = NULL; FILE *f_device = NULL;
@ -220,7 +215,7 @@ static void pusb_pad_update(t_pusb_options *opts,
log_debug("One time pads updated.\n"); log_debug("One time pads updated.\n");
} }
static int pusb_pad_compare(t_pusb_options *opts, LibHalVolume *volume,
static int pusb_pad_compare(t_pusb_options *opts, const char *volume,
const char *user) const char *user)
{ {
FILE *f_device = NULL; FILE *f_device = NULL;
@ -248,13 +243,13 @@ static int pusb_pad_compare(t_pusb_options *opts, LibHalVolume *volume,
return (retval == 0); return (retval == 0);
} }
int pusb_pad_check(t_pusb_options *opts, LibHalContext *ctx,
int pusb_pad_check(t_pusb_options *opts, DBusConnection *dbus,
const char *user) const char *user)
{ {
LibHalVolume *volume = NULL;
int retval;
char *volume = NULL;
int retval = 0;
volume = pusb_volume_get(opts, ctx);
volume = pusb_volume_get(opts, dbus);
if (!volume) if (!volume)
return (0); return (0);
retval = pusb_pad_compare(opts, volume, user); retval = pusb_pad_compare(opts, volume, user);


+ 1
- 1
src/pad.h View File

@ -18,6 +18,6 @@
#ifndef PUSB_OTP_H_ #ifndef PUSB_OTP_H_
# define PUSB_OTP_H_ # define PUSB_OTP_H_
int pusb_pad_check(t_pusb_options *opts, LibHalContext *ctx, const char *user);
int pusb_pad_check(t_pusb_options *opts, DBusConnection *dbus, const char *user);
#endif /* !PUSB_OTP_H_ */ #endif /* !PUSB_OTP_H_ */

+ 1
- 1
src/version.h View File

@ -18,6 +18,6 @@
#ifndef PUSB_VERSION_H_ #ifndef PUSB_VERSION_H_
# define PUSB_VERSION_H_ # define PUSB_VERSION_H_
# define PUSB_VERSION "SVN"
# define PUSB_VERSION "DEV"
#endif /* !PUSB_VERSION_H_ */ #endif /* !PUSB_VERSION_H_ */

+ 59
- 47
src/volume.c View File

@ -22,60 +22,72 @@
#include <stdlib.h> #include <stdlib.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/mount.h> #include <sys/mount.h>
#include <libhal-storage.h>
#include "conf.h" #include "conf.h"
#include "log.h" #include "log.h"
#include "hal.h" #include "hal.h"
#include "volume.h" #include "volume.h"
static int pusb_volume_mount(t_pusb_options *opts, LibHalVolume **volume,
LibHalContext *ctx)
static int pusb_volume_mount(t_pusb_options *opts, char *udi,
DBusConnection *dbus)
{ {
char command[1024]; char command[1024];
char tempname[32]; char tempname[32];
const char *devname; const char *devname;
const char *udi;
const char *fs;
snprintf(tempname, sizeof(tempname), "pam_usb%d", getpid()); snprintf(tempname, sizeof(tempname), "pam_usb%d", getpid());
if (!(devname = libhal_volume_get_device_file(*volume)))
if (!(devname = pusb_hal_get_string_property(dbus, udi, "DeviceFile")))
{ {
log_error("Unable to retrieve device filename\n"); log_error("Unable to retrieve device filename\n");
return (0); return (0);
} }
fs = libhal_volume_get_fstype(*volume);
log_debug("Attempting to mount device %s with label %s\n", log_debug("Attempting to mount device %s with label %s\n",
devname, tempname); devname, tempname);
if (!fs)
snprintf(command, sizeof(command), "pmount -A -s %s %s",
devname, tempname);
else
snprintf(command, sizeof(command), "pmount -A -s -t %s %s %s",
fs, devname, tempname);
snprintf(command, sizeof(command), "pmount -A -s %s %s",
devname, tempname);
log_debug("Executing \"%s\"\n", command); log_debug("Executing \"%s\"\n", command);
if (system(command) != 0) if (system(command) != 0)
{ {
log_error("Mount failed\n"); log_error("Mount failed\n");
return (0); return (0);
} }
udi = libhal_volume_get_udi(*volume);
if (!udi)
{
log_error("Unable to retrieve volume UDI\n");
return (0);
}
udi = strdup(udi);
libhal_volume_free(*volume);
*volume = libhal_volume_from_udi(ctx, udi);
free((char *)udi);
log_debug("Mount succeeded.\n"); log_debug("Mount succeeded.\n");
return (1); return (1);
} }
static LibHalVolume *pusb_volume_probe(t_pusb_options *opts,
LibHalContext *ctx)
static char *pusb_volume_mount_path(t_pusb_options *opts, char *udi, DBusConnection* dbus)
{
dbus_bool_t is_mounted;
if (!pusb_hal_get_bool_property(dbus, udi, "DeviceIsMounted", &is_mounted))
{
return (NULL);
}
if (is_mounted != TRUE)
{
log_debug("Device %s is not mounted\n", udi);
return (NULL);
}
int n_mount;
char **mount_pathes = pusb_hal_get_string_array_property(dbus, udi, "DeviceMountPaths", &n_mount);
if (!mount_pathes)
{
log_debug("Failed to retrieve device %s mount path\n", udi);
return (NULL);
}
if (n_mount > 1)
{
log_debug("Device %s is mounted more than once\n", udi);
}
char *mount_path = strdup(mount_pathes[0]);
pusb_hal_free_string_array(mount_pathes, n_mount);
log_debug("Device %s is mounted on %s\n", udi, mount_path);
return (mount_path);
}
static char *pusb_volume_probe(t_pusb_options *opts,
DBusConnection *dbus)
{ {
LibHalVolume *volume = NULL;
int maxtries = 0; int maxtries = 0;
int i; int i;
@ -92,49 +104,49 @@ static LibHalVolume *pusb_volume_probe(t_pusb_options *opts,
if (i == 1) if (i == 1)
log_info("Probing volume (this could take a while)...\n"); log_info("Probing volume (this could take a while)...\n");
udi = pusb_hal_find_item(ctx,
"volume.uuid", opts->device.volume_uuid,
udi = pusb_hal_find_item(dbus,
"IdUuid", opts->device.volume_uuid,
NULL); NULL);
if (!udi) if (!udi)
{ {
usleep(250000); usleep(250000);
continue; continue;
} }
volume = libhal_volume_from_udi(ctx, udi);
libhal_free_string(udi);
if (!libhal_volume_should_ignore(volume))
return (volume);
libhal_volume_free(volume);
usleep(250000);
return (udi);
} }
return (NULL); return (NULL);
} }
LibHalVolume *pusb_volume_get(t_pusb_options *opts, LibHalContext *ctx)
char *pusb_volume_get(t_pusb_options *opts, DBusConnection *dbus)
{ {
LibHalVolume *volume;
char *volume_udi;
char *mount_point;
if (!(volume = pusb_volume_probe(opts, ctx)))
if (!(volume_udi = pusb_volume_probe(opts, dbus)))
return (NULL); return (NULL);
log_debug("Found volume %s\n", opts->device.volume_uuid); log_debug("Found volume %s\n", opts->device.volume_uuid);
if (libhal_volume_is_mounted(volume))
mount_point = pusb_volume_mount_path(opts, volume_udi, dbus);
if (mount_point)
{ {
log_debug("Volume is already mounted.\n"); log_debug("Volume is already mounted.\n");
return (volume);
return (mount_point);
} }
if (!pusb_volume_mount(opts, &volume, ctx))
if (!pusb_volume_mount(opts, volume_udi, dbus))
{ {
libhal_volume_free(volume);
free(volume_udi);
return (NULL); return (NULL);
} }
return (volume);
mount_point = pusb_volume_mount_path(opts, volume_udi, dbus);
if (!mount_point)
{
log_error("Unable to retrieve %s mount point\n", volume_udi);
return (NULL);
}
return (mount_point);
} }
void pusb_volume_destroy(LibHalVolume *volume)
void pusb_volume_destroy(char *mntpoint)
{ {
const char *mntpoint;
mntpoint = libhal_volume_get_mount_point(volume);
if (mntpoint && strstr(mntpoint, "pam_usb")) if (mntpoint && strstr(mntpoint, "pam_usb"))
{ {
char command[1024]; char command[1024];
@ -148,5 +160,5 @@ void pusb_volume_destroy(LibHalVolume *volume)
else else
log_error("Unable to umount %s\n", mntpoint); log_error("Unable to umount %s\n", mntpoint);
} }
libhal_volume_free(volume);
free(mntpoint);
} }

+ 3
- 2
src/volume.h View File

@ -17,8 +17,9 @@
#ifndef VOLUME_H_ #ifndef VOLUME_H_
# define VOLUME_H_ # define VOLUME_H_
# include "hal.h"
LibHalVolume *pusb_volume_get(t_pusb_options *opts, LibHalContext *ctx);
void pusb_volume_destroy(LibHalVolume *volume);
char *pusb_volume_get(t_pusb_options *opts, DBusConnection *dbus);
void pusb_volume_destroy(char *mntpoint);
#endif /* !VOLUME_H_ */ #endif /* !VOLUME_H_ */

Write Preview
Loading…
Cancel
Save