mirror of
https://github.com/aaru-dps/aaruremote.git
synced 2025-12-16 19:24:37 +00:00
Fix Linux device type detection when there is no udev.
This commit is contained in:
171
linux/device.c
171
linux/device.c
@@ -41,9 +41,7 @@ int LinuxOpenDevice(const char* device_path)
|
||||
|
||||
int32_t LinuxGetDeviceType(const char* device_path)
|
||||
{
|
||||
#ifndef HAS_UDEV
|
||||
return DICMOTE_DEVICE_TYPE_UNKNOWN;
|
||||
#else
|
||||
#ifdef HAS_UDEV
|
||||
struct udev* udev;
|
||||
struct udev_device* udev_device;
|
||||
const char* tmp_string;
|
||||
@@ -123,6 +121,173 @@ int32_t LinuxGetDeviceType(const char* device_path)
|
||||
udev_unref(udev);
|
||||
|
||||
return device_type;
|
||||
#else
|
||||
int32_t dev_type = DICMOTE_DEVICE_TYPE_UNKNOWN;
|
||||
const char* dev_name;
|
||||
const char* sysfs_path;
|
||||
char* dev_path;
|
||||
char* host_no;
|
||||
char* scsi_path;
|
||||
char* iscsi_path;
|
||||
char* spi_path;
|
||||
char* fc_path;
|
||||
char* sas_path;
|
||||
int ret;
|
||||
char* chrptr;
|
||||
char* sysfs_path_scr;
|
||||
FILE* file;
|
||||
size_t len = 4096;
|
||||
|
||||
if(strlen(device_path) <= 5) return dev_type;
|
||||
|
||||
if(strstr(device_path, "nvme")) return DICMOTE_DEVICE_TYPE_NVME;
|
||||
|
||||
dev_name = device_path + 5;
|
||||
|
||||
if(strstr(device_path, "mmcblk"))
|
||||
{
|
||||
dev_type = DICMOTE_DEVICE_TYPE_MMC;
|
||||
|
||||
sysfs_path_scr = malloc(len);
|
||||
|
||||
if(sysfs_path_scr)
|
||||
{
|
||||
snprintf(sysfs_path_scr, len, "/sys/block/%s/device/scr", dev_name);
|
||||
|
||||
if(access(sysfs_path_scr, F_OK) == 0) dev_type = DICMOTE_DEVICE_TYPE_SECURE_DIGITAL;
|
||||
|
||||
free(sysfs_path_scr);
|
||||
}
|
||||
|
||||
return dev_type;
|
||||
}
|
||||
|
||||
sysfs_path = malloc(len);
|
||||
dev_path = malloc(len);
|
||||
host_no = malloc(len);
|
||||
scsi_path = malloc(len);
|
||||
iscsi_path = malloc(len);
|
||||
spi_path = malloc(len);
|
||||
fc_path = malloc(len);
|
||||
sas_path = malloc(len);
|
||||
|
||||
if(!sysfs_path || !dev_path || !host_no || !scsi_path || !iscsi_path || !spi_path || !fc_path || !sas_path)
|
||||
{
|
||||
free((void*)sysfs_path);
|
||||
free((void*)dev_path);
|
||||
free((void*)host_no);
|
||||
free((void*)iscsi_path);
|
||||
free((void*)scsi_path);
|
||||
free((void*)spi_path);
|
||||
free((void*)fc_path);
|
||||
free((void*)sas_path);
|
||||
return dev_type;
|
||||
}
|
||||
|
||||
memset((void*)sysfs_path, 0, len);
|
||||
memset((void*)dev_path, 0, len);
|
||||
memset((void*)host_no, 0, len);
|
||||
memset((void*)iscsi_path, 0, len);
|
||||
memset((void*)scsi_path, 0, len);
|
||||
memset((void*)spi_path, 0, len);
|
||||
memset((void*)fc_path, 0, len);
|
||||
memset((void*)sas_path, 0, len);
|
||||
|
||||
snprintf((char*)sysfs_path, len, "%s/%s/device", PATH_SYS_DEVBLOCK, dev_name);
|
||||
|
||||
ret = readlink(sysfs_path, dev_path, len);
|
||||
|
||||
if(ret <= 0)
|
||||
{
|
||||
free((void*)sysfs_path);
|
||||
free((void*)dev_path);
|
||||
free((void*)host_no);
|
||||
free((void*)iscsi_path);
|
||||
free((void*)scsi_path);
|
||||
free((void*)spi_path);
|
||||
free((void*)fc_path);
|
||||
free((void*)sas_path);
|
||||
return dev_type;
|
||||
}
|
||||
|
||||
ret = 0;
|
||||
chrptr = strchr(dev_path, ':') - 1;
|
||||
|
||||
while(chrptr != dev_path)
|
||||
{
|
||||
if(chrptr[0] == '/')
|
||||
{
|
||||
chrptr++;
|
||||
break;
|
||||
}
|
||||
|
||||
ret++;
|
||||
chrptr--;
|
||||
}
|
||||
|
||||
memcpy((void*)host_no, chrptr, ret);
|
||||
|
||||
snprintf(spi_path, len, "/sys/class/spi_host/host%s", host_no);
|
||||
snprintf(fc_path, len, "/sys/class/fc_host/host%s", host_no);
|
||||
snprintf(sas_path, len, "/sys/class/sas_host/host%s", host_no);
|
||||
snprintf(iscsi_path, len, "/sys/class/iscsi_host/host%s", host_no);
|
||||
snprintf(scsi_path, len, "/sys/class/scsi_host/host%s", host_no);
|
||||
|
||||
if(access(spi_path, F_OK) == 0 || access(fc_path, F_OK) == 0 || access(sas_path, F_OK) == 0 ||
|
||||
access(iscsi_path, F_OK) == 0)
|
||||
dev_type = DICMOTE_DEVICE_TYPE_SCSI;
|
||||
else if(access(scsi_path, F_OK) == 0)
|
||||
{
|
||||
dev_type = DICMOTE_DEVICE_TYPE_SCSI;
|
||||
memset(scsi_path, 0, len);
|
||||
snprintf(scsi_path, len, "/sys/class/scsi_host/host%s/proc_name", host_no);
|
||||
if(access(scsi_path, F_OK) == 0)
|
||||
{
|
||||
file = fopen(scsi_path, "r");
|
||||
if(file)
|
||||
{
|
||||
memset(scsi_path, 0, len);
|
||||
ret = getline(&scsi_path, &len, file);
|
||||
|
||||
len = 4096;
|
||||
|
||||
fclose(file);
|
||||
|
||||
if(ret > 0)
|
||||
{
|
||||
if(strncmp(scsi_path, "ata", 3) == 0 || strncmp(scsi_path, "sata", 4) == 0 ||
|
||||
strncmp(scsi_path, "ahci", 4) == 0)
|
||||
{
|
||||
dev_type = DICMOTE_DEVICE_TYPE_ATA;
|
||||
memset(scsi_path, 0, len);
|
||||
snprintf(scsi_path, len, "%s/%s/removable", PATH_SYS_DEVBLOCK, dev_name);
|
||||
|
||||
file = fopen(scsi_path, "r");
|
||||
if(file)
|
||||
{
|
||||
ret = (size_t)fread(scsi_path, 1, 1, file);
|
||||
if(ret == 1)
|
||||
{
|
||||
if(scsi_path[0] == '1') dev_type = DICMOTE_DEVICE_TYPE_ATAPI;
|
||||
}
|
||||
fclose(file);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
free((void*)sysfs_path);
|
||||
free((void*)dev_path);
|
||||
free((void*)host_no);
|
||||
free((void*)iscsi_path);
|
||||
free((void*)scsi_path);
|
||||
free((void*)spi_path);
|
||||
free((void*)fc_path);
|
||||
free((void*)sas_path);
|
||||
|
||||
return dev_type;
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
@@ -42,8 +42,8 @@ DeviceInfoList* LinuxListDevices()
|
||||
char* line_str;
|
||||
size_t n, ret;
|
||||
char* chrptr;
|
||||
int has_udev = 0;
|
||||
#ifdef HAS_UDEV
|
||||
int has_udev;
|
||||
struct udev* udev;
|
||||
struct udev_device* udev_device;
|
||||
|
||||
@@ -134,6 +134,86 @@ DeviceInfoList* LinuxListDevices()
|
||||
}
|
||||
}
|
||||
}
|
||||
#else // Use sysfs
|
||||
if(!has_udev && !strstr(dirent->d_name, "loop"))
|
||||
{
|
||||
tmp_string = malloc(1024);
|
||||
memset((void*)tmp_string, 0, 1024);
|
||||
snprintf((char*)tmp_string, 1024, "/dev/%s", dirent->d_name);
|
||||
|
||||
switch(GetDeviceType(tmp_string))
|
||||
{
|
||||
case DICMOTE_DEVICE_TYPE_ATA: strncpy(list_next->this.bus, "ATA", 256); break;
|
||||
case DICMOTE_DEVICE_TYPE_ATAPI: strncpy(list_next->this.bus, "ATAPI", 256); break;
|
||||
case DICMOTE_DEVICE_TYPE_MMC:
|
||||
case DICMOTE_DEVICE_TYPE_SECURE_DIGITAL: strncpy(list_next->this.bus, "MMC/SD", 256); break;
|
||||
case DICMOTE_DEVICE_TYPE_NVME: strncpy(list_next->this.bus, "NVMe", 256); break;
|
||||
case DICMOTE_DEVICE_TYPE_SCSI:
|
||||
memset((void*)tmp_string, 0, 1024);
|
||||
snprintf((char*)tmp_string, 1024, "%s/%s/device", PATH_SYS_DEVBLOCK, dirent->d_name);
|
||||
line_str = malloc(1024);
|
||||
memset(line_str, 0, 1024);
|
||||
|
||||
ret = readlink(tmp_string, line_str, 1024);
|
||||
|
||||
if(ret > 0)
|
||||
{
|
||||
ret = 0;
|
||||
chrptr = strchr(line_str, ':') - 1;
|
||||
|
||||
while(chrptr != line_str)
|
||||
{
|
||||
if(chrptr[0] == '/')
|
||||
{
|
||||
chrptr++;
|
||||
break;
|
||||
}
|
||||
|
||||
ret++;
|
||||
chrptr--;
|
||||
}
|
||||
|
||||
memset((void*)tmp_string, 0, 1024);
|
||||
memcpy((void*)tmp_string, chrptr, ret);
|
||||
snprintf((char*)line_str, 1024, "/sys/class/scsi_host/host%s/proc_name", tmp_string);
|
||||
memset((void*)tmp_string, 0, 1024);
|
||||
|
||||
file = fopen(line_str, "r");
|
||||
if(file)
|
||||
{
|
||||
n = 1024;
|
||||
ret = getline(&line_str, &n, file);
|
||||
|
||||
if(ret > 0)
|
||||
{
|
||||
if(strncmp(line_str, "sbp2", 4) == 0) strncpy(list_next->this.bus, "FireWire", 256);
|
||||
else if(strncmp(line_str, "usb-storage", 11) == 0)
|
||||
strncpy(list_next->this.bus, "USB", 256);
|
||||
else
|
||||
strncpy(list_next->this.bus, "SCSI", 256);
|
||||
}
|
||||
else
|
||||
strncpy(list_next->this.bus, "SCSI", 256);
|
||||
|
||||
fclose(file);
|
||||
}
|
||||
else
|
||||
strncpy(list_next->this.bus, "SCSI", 256);
|
||||
|
||||
free(line_str);
|
||||
}
|
||||
else
|
||||
{
|
||||
strncpy(list_next->this.bus, "SCSI", 256);
|
||||
free(line_str);
|
||||
}
|
||||
|
||||
break;
|
||||
default: memset(&list_next->this.bus, 0, 256); break;
|
||||
}
|
||||
|
||||
free((void*)tmp_string);
|
||||
}
|
||||
#endif
|
||||
|
||||
tmp_string = malloc(1024);
|
||||
|
||||
Reference in New Issue
Block a user