From e512c756586d5509ac11759bae40f7911fe0f948 Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Mon, 18 Apr 2011 02:13:18 +0200 Subject: uniformed formatting... --- src/sysinfo.cpp | 330 +++++++++++++++++++++++++++++--------------------------- 1 file changed, 170 insertions(+), 160 deletions(-) (limited to 'src/sysinfo.cpp') diff --git a/src/sysinfo.cpp b/src/sysinfo.cpp index 569fd06..ef7dc04 100644 --- a/src/sysinfo.cpp +++ b/src/sysinfo.cpp @@ -1,16 +1,17 @@ #include "sysinfo.h" - // ------------------------------------------------------------------------------------------------ /** * A empty constructor. */ -SysInfo::SysInfo(){} +SysInfo::SysInfo() { +} // ------------------------------------------------------------------------------------------------ /** * A empty destructor. */ -SysInfo::~SysInfo(){} +SysInfo::~SysInfo() { +} // ------------------------------------------------------------------------------------------------ /** * This method returns system informations. @@ -32,23 +33,23 @@ SysInfo::~SysInfo(){} * * @see JavascriptInterface::getSysInfo(const QString& info) */ -const QString SysInfo::getInfo(const QString& infoName){ - qxtLog->debug() << "[sysinfo] requested " << infoName; - if (infoName == QString("mac")) - return getMACAddress(); - else if (infoName == QString("ip")) - return getIPAddress(); - else if (infoName == QString("all")) - return getAllInfos(); - else if (infoName == QString("mbserial")) - return getMainboardSerial(); - else if (infoName == QString("usb")) - return getUsbVendorIdProductIdSerialNumber(); - else if (infoName == QString("json")) - return getNames(); - /* unknown code */ - qxtLog->debug() << "[sysinfo] unknown requested"; - return "info_error"; +const QString SysInfo::getInfo(const QString& infoName) { + qxtLog->debug() << "[sysinfo] requested " << infoName; + if (infoName == QString("mac")) + return getMACAddress(); + else if (infoName == QString("ip")) + return getIPAddress(); + else if (infoName == QString("all")) + return getAllInfos(); + else if (infoName == QString("mbserial")) + return getMainboardSerial(); + else if (infoName == QString("usb")) + return getUsbVendorIdProductIdSerialNumber(); + else if (infoName == QString("json")) + return getNames(); + /* unknown code */ + qxtLog->debug() << "[sysinfo] unknown requested"; + return "info_error"; } // ------------------------------------------------------------------------------------------------ /** @@ -66,15 +67,17 @@ const QString SysInfo::getInfo(const QString& infoName){ * @see fbgui::generatePOSTData() * @see SysInfo::getInfo(const QString& infoName) */ -const QString SysInfo::getMACAddress(){ - // Returns MAC address of eth0 for now - QNetworkInterface qni = QNetworkInterface::interfaceFromName(QString("eth0")); - if (!qni.isValid()){ - qxtLog->debug() << "[sysinfo] MAC Address: No interface matching \"eth0\" found."; - return "no_eth0"; - } - //eth0_index = qni.index(); - return qni.hardwareAddress(); +const QString SysInfo::getMACAddress() { + // Returns MAC address of eth0 for now + QNetworkInterface qni = QNetworkInterface::interfaceFromName( + QString("eth0")); + if (!qni.isValid()) { + qxtLog->debug() + << "[sysinfo] MAC Address: No interface matching \"eth0\" found."; + return "no_eth0"; + } + //eth0_index = qni.index(); + return qni.hardwareAddress(); } // ------------------------------------------------------------------------------------------------ /** @@ -90,61 +93,64 @@ const QString SysInfo::getMACAddress(){ * * @see SysInfo::getInfo(const QString& infoName) */ -const QString SysInfo::getIPAddress(){ - // Again for eth0 only at the moment. - // TODO: this doesn't quite work yet... - QNetworkInterface qni = QNetworkInterface::interfaceFromName(QString("eth0")); - QList addrlist = qni.allAddresses(); - // This is does not return the right IP atm... - foreach(QHostAddress addr, addrlist){ - if (addr.protocol() == QAbstractSocket::IPv4Protocol && addr != QHostAddress::LocalHost){ - return addr.toString(); - } - } - // still here? - qxtLog->debug() << "[sysinfo] IP Address: ip_error"; - return "ip_error"; +const QString SysInfo::getIPAddress() { + // Again for eth0 only at the moment. + // TODO: this doesn't quite work yet... + QNetworkInterface qni = QNetworkInterface::interfaceFromName( + QString("eth0")); + QList addrlist = qni.allAddresses(); + // This is does not return the right IP atm... + foreach(QHostAddress addr, addrlist) + { + if (addr.protocol() == QAbstractSocket::IPv4Protocol && addr + != QHostAddress::LocalHost) { + return addr.toString(); + } + } + // still here? + qxtLog->debug() << "[sysinfo] IP Address: ip_error"; + return "ip_error"; } // ------------------------------------------------------------------------------------------------ /** * just a test method for json. */ -const QByteArray SysInfo::getNames(){ +const QByteArray SysInfo::getNames() { - QVariantMap foo; - foo.insert("name", "foo"); - foo.insert("type", 123); + QVariantMap foo; + foo.insert("name", "foo"); + foo.insert("type", 123); - QVariantMap fooo; - fooo.insert("name", "boo"); - fooo.insert("type", 321); + QVariantMap fooo; + fooo.insert("name", "boo"); + fooo.insert("type", 321); - QVariantList jsonV; - jsonV << foo << fooo; + QVariantList jsonV; + jsonV << foo << fooo; - QJson::Serializer serializer; - QByteArray json = serializer.serialize(jsonV); + QJson::Serializer serializer; + QByteArray json = serializer.serialize(jsonV); - qxtLog->debug() << json; - return json; + qxtLog->debug() << json; + return json; } // ------------------------------------------------------------------------------------------------ /** * just a test method for json. */ -QString SysInfo::getAllInfos(){ - QVariantMap infos; - infos.insert("mac", getMACAddress()); - infos.insert("ip", getIPAddress()); - infos.insert("whoami", getScriptOutput("whoami")); - //infos.insert("pwd", getScriptOutput("pwd")); +QString SysInfo::getAllInfos() { + QVariantMap infos; + infos.insert("mac", getMACAddress()); + infos.insert("ip", getIPAddress()); + infos.insert("whoami", getScriptOutput("whoami")); + //infos.insert("pwd", getScriptOutput("pwd")); - //QJson::Serializer serializer; - QByteArray json = serializer.serialize(infos); + //QJson::Serializer serializer; + QByteArray json = serializer.serialize(infos); - qxtLog->debug() << json; - return json; + qxtLog->debug() << json; + return json; } // ------------------------------------------------------------------------------------------------ @@ -163,26 +169,28 @@ QString SysInfo::getAllInfos(){ * @see fbgui::generatePOSTData() * @see SysInfo::getInfo(const QString& infoName) */ -const QString SysInfo::getMainboardSerial(){ - QString out = ""; - struct sysfs_class_device *class_device = sysfs_open_class_device("dmi","id"); - struct dlist *attrlist = sysfs_get_classdev_attributes(class_device); - struct sysfs_device *device = sysfs_get_classdev_device(class_device); +const QString SysInfo::getMainboardSerial() { + QString out = ""; + struct sysfs_class_device *class_device = sysfs_open_class_device("dmi", + "id"); + struct dlist *attrlist = sysfs_get_classdev_attributes(class_device); + struct sysfs_device *device = sysfs_get_classdev_device(class_device); - if(attrlist != NULL){ - struct sysfs_attribute *attr = NULL; - dlist_for_each_data(attrlist, attr, struct sysfs_attribute) { - QVariantMap a; - if(QString(attr->name) == QString("board_serial")){ - out = QString(attr->value); - } - } - qxtLog->debug()<< "[sysinfo] Mainboard Serial: " + out; - return out; - } - qxtLog->debug()<< "[sysinfo] Mainboard Serial: attrlist is null! return: mainboard_serial_error"; - sysfs_close_class_device(class_device); - return "mainboard_serial_error"; + if (attrlist != NULL) { + struct sysfs_attribute *attr = NULL; + dlist_for_each_data(attrlist, attr, struct sysfs_attribute) { + QVariantMap a; + if(QString(attr->name) == QString("board_serial")) { + out = QString(attr->value); + } + } + qxtLog->debug() << "[sysinfo] Mainboard Serial: " + out; + return out; + } + qxtLog->debug() + << "[sysinfo] Mainboard Serial: attrlist is null! return: mainboard_serial_error"; + sysfs_close_class_device(class_device); + return "mainboard_serial_error"; } // ------------------------------------------------------------------------------------------------ /** @@ -206,74 +214,77 @@ const QString SysInfo::getMainboardSerial(){ * * @see SysInfo::getInfo(const QString& infoName) */ -const QString SysInfo::getUsbVendorIdProductIdSerialNumber() -{ - QString tag = "[sysinfo] Usb Serial:"; - QString out = ""; - QVariantList list; +const QString SysInfo::getUsbVendorIdProductIdSerialNumber() { + QString tag = "[sysinfo] Usb Serial:"; + QString out = ""; + QVariantList list; - libusb_device **devs; - libusb_context *ctx = NULL; //a libusb session - ssize_t cnt; //holding number of devices in list - int r = 1; - r = libusb_init(&ctx); - if(r<0){ - qxtLog->debug()<< tag + "failed to initialise libusb"; - return "error"; - } - cnt = libusb_get_device_list(ctx, &devs); //get the list of devices - if(cnt < 0) { - qxtLog->debug()<< tag + "Get Device Error"; //there was an error - } - qxtLog->debug()<< tag + cnt + " Devices in list."; //print total number of usb devices - ssize_t i; //for iterating through the list# - for(i=0; i < cnt; i++){ - //printdev(devs[i]); //print specs of this device - QVariantMap infos; - libusb_device *dev = devs[i]; - libusb_device_descriptor desc; - int re = libusb_get_device_descriptor(dev, &desc); - if (re < 0) { - qxtLog->debug()<< tag + "failed to get device descriptor"; - return "error"; - } - infos.insert("vendorId",desc.idVendor); - infos.insert("productId",desc.idProduct); - unsigned char string[256]; - libusb_device_handle *handle; - re = libusb_open(dev, &handle); - if (re != 0) { - qxtLog->debug()<< tag + "failed to get handler / fail to open device"; - return "error"; - } - re = libusb_get_string_descriptor_ascii(handle,desc.iSerialNumber, string, sizeof(string)); - if (re < 0) { - qxtLog->debug()<< tag + "failed to get SerialNumber"; - return "error"; - } - infos.insert("serialnumber",QString((const char *)string)); - re = libusb_get_string_descriptor_ascii(handle,desc.iProduct, string, sizeof(string)); - if (re < 0) { - qxtLog->debug()<< tag + "failed to get Product"; - return "error"; - } - infos.insert("product",QString((const char *)string)); - re = libusb_get_string_descriptor_ascii(handle,desc.iManufacturer, string, sizeof(string)); - if (re < 0) { - qxtLog->debug()<< tag + "failed to get Product"; - return "error"; - } - infos.insert("manuacturer",QString((const char *)string)); + libusb_device **devs; + libusb_context *ctx = NULL; //a libusb session + ssize_t cnt; //holding number of devices in list + int r = 1; + r = libusb_init(&ctx); + if (r < 0) { + qxtLog->debug() << tag + "failed to initialise libusb"; + return "error"; + } + cnt = libusb_get_device_list(ctx, &devs); //get the list of devices + if (cnt < 0) { + qxtLog->debug() << tag + "Get Device Error"; //there was an error + } + qxtLog->debug() << tag + cnt + " Devices in list."; //print total number of usb devices + ssize_t i; //for iterating through the list# + for (i = 0; i < cnt; i++) { + //printdev(devs[i]); //print specs of this device + QVariantMap infos; + libusb_device *dev = devs[i]; + libusb_device_descriptor desc; + int re = libusb_get_device_descriptor(dev, &desc); + if (re < 0) { + qxtLog->debug() << tag + "failed to get device descriptor"; + return "error"; + } + infos.insert("vendorId", desc.idVendor); + infos.insert("productId", desc.idProduct); + unsigned char string[256]; + libusb_device_handle *handle; + re = libusb_open(dev, &handle); + if (re != 0) { + qxtLog->debug() << tag + + "failed to get handler / fail to open device"; + return "error"; + } + re = libusb_get_string_descriptor_ascii(handle, desc.iSerialNumber, + string, sizeof(string)); + if (re < 0) { + qxtLog->debug() << tag + "failed to get SerialNumber"; + return "error"; + } + infos.insert("serialnumber", QString((const char *) string)); + re = libusb_get_string_descriptor_ascii(handle, desc.iProduct, string, + sizeof(string)); + if (re < 0) { + qxtLog->debug() << tag + "failed to get Product"; + return "error"; + } + infos.insert("product", QString((const char *) string)); + re = libusb_get_string_descriptor_ascii(handle, desc.iManufacturer, + string, sizeof(string)); + if (re < 0) { + qxtLog->debug() << tag + "failed to get Product"; + return "error"; + } + infos.insert("manuacturer", QString((const char *) string)); - list << infos; - libusb_close(handle); - } - libusb_free_device_list(devs, 1); //free the list, unref the devices in it - libusb_exit(ctx); //close the session + list << infos; + libusb_close(handle); + } + libusb_free_device_list(devs, 1); //free the list, unref the devices in it + libusb_exit(ctx); //close the session - QByteArray json = serializer.serialize(list); - qxtLog->debug()<< tag + "json object: " + json; - return json; + QByteArray json = serializer.serialize(list); + qxtLog->debug() << tag + "json object: " + json; + return json; } // ------------------------------------------------------------------------------------------------ @@ -290,28 +301,27 @@ const QString SysInfo::getUsbVendorIdProductIdSerialNumber() * @return QString * output of the script. */ -QString SysInfo::getScriptOutput(QString cmd) -{ +QString SysInfo::getScriptOutput(QString cmd) { QProcess *process = new QProcess(); - qxtLog->debug()<<"[sysinfo] Script Output: try to open: "<debug() << "[sysinfo] Script Output: try to open: " << cmd; process->start(cmd, QIODevice::ReadOnly); - if (!process->waitForStarted() ) - qxtLog->debug()<<"[sysinfo] Script Output: process couldn't get opened"; + if (!process->waitForStarted()) + qxtLog->debug() + << "[sysinfo] Script Output: process couldn't get opened"; QString output; process->waitForFinished(); QTextStream *txt_stream = new QTextStream(process); - while(!txt_stream->atEnd() ) - { - qxtLog->debug()<<"[sysinfo] Script Output: read output: "; + while (!txt_stream->atEnd()) { + qxtLog->debug() << "[sysinfo] Script Output: read output: "; QString tmp_str = txt_stream->readLine(); output += tmp_str; - qxtLog->debug()<< "[sysinfo] Script Output: " <debug() << "[sysinfo] Script Output: " << tmp_str; } - qxtLog->debug()<<"[sysinfo] Script Output: process finished: "; + qxtLog->debug() << "[sysinfo] Script Output: process finished: "; return output; } -- cgit v1.2.3-55-g7522