From cbc9bed8ae85af36ad8579476ab91e89c3cd310e Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 9 Jul 2009 17:16:05 +0200 Subject: move libudev based code into libapt cdrom.cc class --- apt-pkg/cdrom.cc | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 80 insertions(+), 1 deletion(-) (limited to 'apt-pkg/cdrom.cc') diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc index a31602dfa..087ee321c 100644 --- a/apt-pkg/cdrom.cc +++ b/apt-pkg/cdrom.cc @@ -16,7 +16,7 @@ #include #include #include - +#include #include "indexcopy.h" @@ -844,3 +844,82 @@ bool pkgCdrom::Add(pkgCdromStatus *log) return true; } + + +pkgUdevCdromDevices::pkgUdevCdromDevices() + : libudev_handle(NULL) +{ + +} + +bool +pkgUdevCdromDevices::Dlopen() +{ + // see if we can get libudev + void *h = ::dlopen("libudev.so.0", RTLD_LAZY); + if(h == NULL) + return false; + + // get the pointers to the udev structs + libudev_handle = h; + udev_new = (udev* (*)(void)) dlsym(h, "udev_new"); + udev_enumerate_add_match_property = (int (*)(udev_enumerate*, const char*, const char*))dlsym(h, "udev_enumerate_add_match_property"); + udev_enumerate_scan_devices = (int (*)(udev_enumerate*))dlsym(h, "udev_enumerate_scan_devices"); + udev_enumerate_get_list_entry = (udev_list_entry* (*)(udev_enumerate*))dlsym(h, "udev_enumerate_get_list_entry"); + udev_device_new_from_syspath = (udev_device* (*)(udev*, const char*))dlsym(h, "udev_device_new_from_syspath"); + udev_enumerate_get_udev = (udev* (*)(udev_enumerate*))dlsym(h, "udev_enumerate_get_udev"); + udev_list_entry_get_name = (const char* (*)(udev_list_entry*))dlsym(h, "udev_list_entry_get_name"); + udev_device_get_devnode = (const char* (*)(udev_device*))dlsym(h, "udev_device_get_devnode"); + udev_enumerate_new = (udev_enumerate* (*)(udev*))dlsym(h, "udev_enumerate_new"); + udev_list_entry_get_next = (udev_list_entry* (*)(udev_list_entry*))dlsym(h, "udev_list_entry_get_next"); + udev_device_get_property_value = (const char* (*)(udev_device *, const char *))dlsym(h, "udev_device_get_property_value"); + + return true; +} + +vector +pkgUdevCdromDevices::Scan() +{ + vector cdrom_devices; + struct udev_enumerate *enumerate; + struct udev_list_entry *l, *devices; + struct udev *udev_ctx; + + if(libudev_handle == NULL) + return cdrom_devices; + + udev_ctx = udev_new(); + enumerate = udev_enumerate_new (udev_ctx); + udev_enumerate_add_match_property(enumerate, "ID_CDROM", "1"); + + udev_enumerate_scan_devices (enumerate); + devices = udev_enumerate_get_list_entry (enumerate); + for (l = devices; l != NULL; l = udev_list_entry_get_next (l)) + { + CdromDevice cdrom; + struct udev_device *udevice; + udevice = udev_device_new_from_syspath (udev_enumerate_get_udev (enumerate), udev_list_entry_get_name (l)); + if (udevice == NULL) + continue; + const char* devnode = udev_device_get_devnode(udevice); + const char* mountpath = udev_device_get_property_value(udevice, "FSTAB_DIR"); + + // fill in the struct + cdrom.DeviceName = string(devnode); + if (mountpath) { + cdrom.MountPath = mountpath; + cdrom.Mounted = true; + } else { + cdrom.Mounted = false; + cdrom.MountPath = ""; + } + cdrom_devices.push_back(cdrom); + } + return cdrom_devices; +} + + +pkgUdevCdromDevices::~pkgUdevCdromDevices() +{ + dlclose(libudev_handle); +} -- cgit v1.2.3-70-g09d2 From be5b558134ade780e11f50dede99d041a1defd7f Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 22 Jul 2009 15:59:50 +0200 Subject: apt-pkg/cdrom.cc: make cdrom.Mounted property reliable --- apt-pkg/cdrom.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'apt-pkg/cdrom.cc') diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc index 087ee321c..517efa180 100644 --- a/apt-pkg/cdrom.cc +++ b/apt-pkg/cdrom.cc @@ -908,7 +908,8 @@ pkgUdevCdromDevices::Scan() cdrom.DeviceName = string(devnode); if (mountpath) { cdrom.MountPath = mountpath; - cdrom.Mounted = true; + string s = string(mountpath); + cdrom.Mounted = IsMounted(s); } else { cdrom.Mounted = false; cdrom.MountPath = ""; -- cgit v1.2.3-70-g09d2 From 49cb36fc56225b02b4c39aea43095de15da75217 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 22 Jul 2009 18:32:08 +0200 Subject: methods/cdrom.cc: move the scan into the loop that waits for a CD --- apt-pkg/cdrom.cc | 7 +++++- apt-pkg/cdrom.h | 2 ++ methods/cdrom.cc | 67 +++++++++++++++++++++++++++++++++----------------------- 3 files changed, 47 insertions(+), 29 deletions(-) (limited to 'apt-pkg/cdrom.cc') diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc index 517efa180..157f0ea3c 100644 --- a/apt-pkg/cdrom.cc +++ b/apt-pkg/cdrom.cc @@ -847,7 +847,7 @@ bool pkgCdrom::Add(pkgCdromStatus *log) pkgUdevCdromDevices::pkgUdevCdromDevices() - : libudev_handle(NULL) + : libudev_handle(NULL), Dlopened(false) { } @@ -855,6 +855,10 @@ pkgUdevCdromDevices::pkgUdevCdromDevices() bool pkgUdevCdromDevices::Dlopen() { + // alread open + if(Dlopened) + return true; + // see if we can get libudev void *h = ::dlopen("libudev.so.0", RTLD_LAZY); if(h == NULL) @@ -874,6 +878,7 @@ pkgUdevCdromDevices::Dlopen() udev_list_entry_get_next = (udev_list_entry* (*)(udev_list_entry*))dlsym(h, "udev_list_entry_get_next"); udev_device_get_property_value = (const char* (*)(udev_device *, const char *))dlsym(h, "udev_device_get_property_value"); + Dlopened = true; return true; } diff --git a/apt-pkg/cdrom.h b/apt-pkg/cdrom.h index 13e7203f4..74667297e 100644 --- a/apt-pkg/cdrom.h +++ b/apt-pkg/cdrom.h @@ -77,6 +77,8 @@ struct CdromDevice class pkgUdevCdromDevices { + private: + bool Dlopened; protected: // libudev dlopen stucture void *libudev_handle; diff --git a/methods/cdrom.cc b/methods/cdrom.cc index cd0d4e512..a677022ad 100644 --- a/methods/cdrom.cc +++ b/methods/cdrom.cc @@ -121,6 +121,8 @@ bool CDROMMethod::Fetch(FetchItem *Itm) FetchResult Res; bool Debug = _config->FindB("Debug::Acquire::cdrom",false); + if (Debug) + clog << "CDROMMethod::Fetch " << Itm->Uri << endl; /* All IMS queries are returned as a hit, CDROMs are readonly so time stamps never change */ @@ -156,54 +158,63 @@ bool CDROMMethod::Fetch(FetchItem *Itm) } // We already have a CD inserted, but it is the wrong one - if (CurrentID.empty() == false && Database.Find("CD::" + CurrentID) != Get.Host) + if (CurrentID.empty() == false && + CurrentID != "FAIL" && + Database.Find("CD::" + CurrentID) != Get.Host) { Fail(_("Wrong CD-ROM"),true); return true; } CDROM = _config->FindDir("Acquire::cdrom::mount","/cdrom/"); + if (Debug) + clog << "Looking for CDROM at " << CDROM << endl; - // auto-detect mode - if (CDROM == "apt-udev-auto/") + if (CDROM[0] == '.') + CDROM= SafeGetCWD() + '/' + CDROM; + string NewID; + pkgUdevCdromDevices udev; + + while (CurrentID.empty() == true) { - pkgUdevCdromDevices udev; - if(udev.Dlopen()) + // hrm, ugly the loop here + if (CDROM == "apt-udev-auto/") { - vector v = udev.Scan(); - for (unsigned int i=0; i < v.size(); i++) + if(udev.Dlopen()) { - if (!v[i].Mounted) + vector v = udev.Scan(); + for (unsigned int i=0; i < v.size(); i++) { - if (!FileExists("/media/apt")) - mkdir("/media/apt", 0755); - if(MountCdrom("/media/apt", v[i].DeviceName)) + if (Debug) + clog << "Have cdrom device " << v[i].DeviceName << endl; + if (!v[i].Mounted) { - if (IsCorrectCD(Get, "/media/apt")) + if (!FileExists("/media/apt")) + mkdir("/media/apt", 0755); + if(MountCdrom("/media/apt", v[i].DeviceName)) + { + if (IsCorrectCD(Get, "/media/apt")) + { + MountedByApt = true; + CDROM = "/media/apt"; + break; + } else { + UnmountCdrom("/media/apt"); + } + } + } else { + if (IsCorrectCD(Get, v[i].MountPath)) { - MountedByApt = true; - CDROM = "/media/apt"; + CDROM = v[i].MountPath; break; - } else { - UnmountCdrom("/media/apt"); } } - } else { - if (IsCorrectCD(Get, v[i].MountPath)) - { - CDROM = v[i].MountPath; - break; - } } + } else { + _error->WarningE("udev.Dlopen() failed","foo"); } } - } - if (CDROM[0] == '.') - CDROM= SafeGetCWD() + '/' + CDROM; - string NewID; - while (CurrentID.empty() == true) - { bool Hit = false; if(!IsMounted(CDROM)) MountedByApt = MountCdrom(CDROM); -- cgit v1.2.3-70-g09d2 From 76fe5db7153957f8fda437e3bd614312b076f19e Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 23 Jul 2009 09:47:41 +0200 Subject: methods/cdrom.cc: add AutoDetectAndMount method --- apt-pkg/cdrom.cc | 5 ++- apt-pkg/cdrom.h | 2 -- methods/cdrom.cc | 105 ++++++++++++++++++++++++++++++++----------------------- 3 files changed, 63 insertions(+), 49 deletions(-) (limited to 'apt-pkg/cdrom.cc') diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc index 157f0ea3c..8be26e2bc 100644 --- a/apt-pkg/cdrom.cc +++ b/apt-pkg/cdrom.cc @@ -847,7 +847,7 @@ bool pkgCdrom::Add(pkgCdromStatus *log) pkgUdevCdromDevices::pkgUdevCdromDevices() - : libudev_handle(NULL), Dlopened(false) + : libudev_handle(NULL) { } @@ -856,7 +856,7 @@ bool pkgUdevCdromDevices::Dlopen() { // alread open - if(Dlopened) + if(libudev_handle != NULL) return true; // see if we can get libudev @@ -878,7 +878,6 @@ pkgUdevCdromDevices::Dlopen() udev_list_entry_get_next = (udev_list_entry* (*)(udev_list_entry*))dlsym(h, "udev_list_entry_get_next"); udev_device_get_property_value = (const char* (*)(udev_device *, const char *))dlsym(h, "udev_device_get_property_value"); - Dlopened = true; return true; } diff --git a/apt-pkg/cdrom.h b/apt-pkg/cdrom.h index 74667297e..13e7203f4 100644 --- a/apt-pkg/cdrom.h +++ b/apt-pkg/cdrom.h @@ -77,8 +77,6 @@ struct CdromDevice class pkgUdevCdromDevices { - private: - bool Dlopened; protected: // libudev dlopen stucture void *libudev_handle; diff --git a/methods/cdrom.cc b/methods/cdrom.cc index a677022ad..9802eb46c 100644 --- a/methods/cdrom.cc +++ b/methods/cdrom.cc @@ -29,12 +29,16 @@ using namespace std; class CDROMMethod : public pkgAcqMethod { bool DatabaseLoaded; + bool Debug; + ::Configuration Database; string CurrentID; string CDROM; bool MountedByApt; + pkgUdevCdromDevices UdevCdroms; bool IsCorrectCD(URI want, string MountPath); + bool AutoDetectAndMount(URI); virtual bool Fetch(FetchItem *Itm); string GetID(string Name); virtual void Exit(); @@ -53,8 +57,7 @@ CDROMMethod::CDROMMethod() : pkgAcqMethod("1.0",SingleInstance | LocalOnly | DatabaseLoaded(false), MountedByApt(false) { - - + UdevCdroms.Dlopen(); }; /*}}}*/ // CDROMMethod::Exit - Unmount the disc if necessary /*{{{*/ @@ -86,13 +89,63 @@ string CDROMMethod::GetID(string Name) return string(); } /*}}}*/ +// CDROMMethod::AutoDetectAndMount /*{{{*/ +// --------------------------------------------------------------------- +/* Modifies class varaiable CDROM to the mountpoint */ +bool CDROMMethod::AutoDetectAndMount(URI Get) +{ + vector v = UdevCdroms.Scan(); + + // first check if its mounted somewhere already + for (unsigned int i=0; i < v.size(); i++) + { + if (v[i].Mounted) + { + if (Debug) + clog << "Checking mounted cdrom device " << v[i].DeviceName << endl; + if (IsCorrectCD(Get, v[i].MountPath)) + { + CDROM = v[i].MountPath; + return true; + } + } + } + + // we are not supposed to mount, exit + if (_config->FindB("APT::CDROM::NoMount",false) == true) + return false; + + // check if we have the mount point + if (!FileExists("/media/apt")) + mkdir("/media/apt", 0755); + // now try mounting + for (unsigned int i=0; i < v.size(); i++) + { + if (!v[i].Mounted) + { + if(MountCdrom("/media/apt", v[i].DeviceName)) + { + if (IsCorrectCD(Get, "/media/apt")) + { + MountedByApt = true; + CDROM = "/media/apt"; + return true; + } else { + UnmountCdrom("/media/apt"); + } + } + } + } + + return false; +} + /*}}}*/ // CDROMMethod::IsCorrectCD /*{{{*/ // --------------------------------------------------------------------- /* */ bool CDROMMethod::IsCorrectCD(URI want, string MountPath) { - bool Debug = _config->FindB("Debug::Acquire::cdrom",false); string NewID; for (unsigned int Version = 2; Version != 0; Version--) @@ -100,7 +153,7 @@ bool CDROMMethod::IsCorrectCD(URI want, string MountPath) if (IdentCdrom(MountPath,NewID,Version) == false) return false; - if (Debug == true) + if (Debug) clog << "ID " << Version << " " << NewID << endl; // A hit @@ -116,11 +169,12 @@ bool CDROMMethod::IsCorrectCD(URI want, string MountPath) /* */ bool CDROMMethod::Fetch(FetchItem *Itm) { + FetchResult Res; + URI Get = Itm->Uri; string File = Get.Path; - FetchResult Res; + Debug = _config->FindB("Debug::Acquire::cdrom", false); - bool Debug = _config->FindB("Debug::Acquire::cdrom",false); if (Debug) clog << "CDROMMethod::Fetch " << Itm->Uri << endl; @@ -173,49 +227,12 @@ bool CDROMMethod::Fetch(FetchItem *Itm) if (CDROM[0] == '.') CDROM= SafeGetCWD() + '/' + CDROM; string NewID; - pkgUdevCdromDevices udev; while (CurrentID.empty() == true) { - // hrm, ugly the loop here if (CDROM == "apt-udev-auto/") - { - if(udev.Dlopen()) - { - vector v = udev.Scan(); - for (unsigned int i=0; i < v.size(); i++) - { - if (Debug) - clog << "Have cdrom device " << v[i].DeviceName << endl; - if (!v[i].Mounted) - { - if (!FileExists("/media/apt")) - mkdir("/media/apt", 0755); - if(MountCdrom("/media/apt", v[i].DeviceName)) - { - if (IsCorrectCD(Get, "/media/apt")) - { - MountedByApt = true; - CDROM = "/media/apt"; - break; - } else { - UnmountCdrom("/media/apt"); - } - } - } else { - if (IsCorrectCD(Get, v[i].MountPath)) - { - CDROM = v[i].MountPath; - break; - } - } - } - } else { - _error->WarningE("udev.Dlopen() failed","foo"); - } - } + AutoDetectAndMount(Get); - bool Hit = false; if(!IsMounted(CDROM)) MountedByApt = MountCdrom(CDROM); -- cgit v1.2.3-70-g09d2