use shared pointer; begin freefaretag

CMakeLists.txt

@@ -3,7 +3,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/CMakeMod
 set(PROJECT_NAME mifare-tools)
 project(${PROJECT_NAME})
 find_package(GTest)
-set(LIBS ${LIBS} nfc)
+set(LIBS ${LIBS} nfc freefare)
 add_subdirectory(src)
 if (GTEST_FOUND)
     enable_testing()

src/CMakeLists.txt

@@ -13,7 +13,7 @@ set(SOURCE_FILES
   DataAccess/LibNfc.cpp
   DataAccess/LibNfc.h
         DataAccess/NfcDevice.cpp
-        DataAccess/NfcDevice.h DataAccess/FreeFareDevice.cpp DataAccess/FreeFareDevice.h)
+        DataAccess/NfcDevice.h DataAccess/FreeFareDevice.cpp DataAccess/FreeFareDevice.h DataAccess/FreeFareTag.cpp DataAccess/FreeFareTag.h)
 
 add_executable(${PROJECT_NAME} ${SOURCE_FILES})
 target_link_libraries(${PROJECT_NAME} ${LIBS})

src/DataAccess/FreeFareDevice.cpp

@@ -4,7 +4,23 @@
 
 #include "FreeFareDevice.h"
 
-FreeFareDevice::FreeFareDevice(NfcDevice *device)
+FreeFareDevice::FreeFareDevice(std::shared_ptr<NfcDevice> device)
     : _device(device)
 {
 }
+
+Result<std::vector<std::shared_ptr<FreeFareTag>>> FreeFareDevice::getTags()
+{
+    if (!_device->isOpened()) {
+        return Result<std::vector<std::shared_ptr<FreeFareTag>>>::error("Device is not opened");
+    }
+    FreefareTag* tags = freefare_get_tags(_device->getDevice());
+    if (!tags) {
+        return Result<std::vector<std::shared_ptr<FreeFareTag>>>::error("Failed to get MIFARE tags");
+    }
+    std::vector<std::shared_ptr<FreeFareTag>> tagList;
+    for (size_t i = 0; tags[i] != 0; ++i) {
+        tagList.push_back(std::make_shared<FreeFareTag>(tags[i]));
+    }
+    return Result<std::vector<std::shared_ptr<FreeFareTag>>>::ok(tagList);
+}

src/DataAccess/FreeFareDevice.h

@@ -6,16 +6,19 @@
 #define MIFARE_TOOLS_FREEFAREDEVICE_H
 
 
-#include "NfcDevice.h"
 #include <freefare.h>
+#include "NfcDevice.h"
+#include "FreeFareTag.h"
 
 class FreeFareDevice
 {
 public:
-    FreeFareDevice(NfcDevice* device);
+    FreeFareDevice(std::shared_ptr<NfcDevice> device);
+
+    Result<std::vector<std::shared_ptr<FreeFareTag>>> getTags();
 
 private:
-    NfcDevice* _device;
+    std::shared_ptr<NfcDevice> _device;
 };
 
 

src/DataAccess/FreeFareTag.cpp

@@ -0,0 +1,32 @@
+//
+// Created by robin on 6/19/16.
+//
+
+#include "FreeFareTag.h"
+
+FreeFareTag::FreeFareTag(FreefareTag tag)
+    : _tag(tag)
+{
+    _type = freefare_get_tag_type(tag);
+    _uid = freefare_get_tag_uid(tag);
+}
+
+FreeFareTag::~FreeFareTag()
+{
+    freefare_free_tag(_tag);
+}
+
+const freefare_tag *FreeFareTag::getTag() const
+{
+    return _tag;
+}
+
+freefare_tag_type FreeFareTag::getType() const
+{
+    return _type;
+}
+
+const std::string &FreeFareTag::getUid() const
+{
+    return _uid;
+}

src/DataAccess/FreeFareTag.h

@@ -0,0 +1,32 @@
+//
+// Created by robin on 6/19/16.
+//
+
+#ifndef MIFARE_TOOLS_FREEFARETAG_H
+#define MIFARE_TOOLS_FREEFARETAG_H
+
+#include <freefare.h>
+#include <string>
+
+class FreeFareTag
+{
+public:
+    FreeFareTag(FreefareTag tag);
+    ~FreeFareTag();
+
+    const freefare_tag * getTag() const;
+
+    freefare_tag_type getType() const;
+
+    const std::string & getUid() const;
+
+private:
+    FreefareTag _tag;
+
+    freefare_tag_type _type;
+
+    std::string _uid;
+};
+
+
+#endif //MIFARE_TOOLS_FREEFARETAG_H

src/DataAccess/LibNfc.cpp

@@ -2,6 +2,7 @@
 // Created by robin on 6/19/16.
 //
 
+#include <boost/shared_ptr.hpp>
 #include "LibNfc.h"
 
 LibNfc::LibNfc()
@@ -44,21 +45,21 @@ void LibNfc::clean()
     }
 }
 
-Result<std::vector<NfcDevice*>> LibNfc::getDevices()
+Result<std::vector<std::shared_ptr<NfcDevice>>> LibNfc::getDevices()
 {
     if (!isInitialized()) {
-        return Result<std::vector<NfcDevice*>>::error("LibNfc is not initialized");
+        return Result<std::vector<std::shared_ptr<NfcDevice>>>::error("LibNfc is not initialized");
     }
     nfc_connstring devices[16];
     size_t count = nfc_list_devices(_context, devices, sizeof(devices));
     if (count < 0) {
-        return Result<std::vector<NfcDevice*>>::error("Failed to list NFC devices");
+        return Result<std::vector<std::shared_ptr<NfcDevice>>>::error("Failed to list NFC devices");
     }
-    std::vector<NfcDevice*> devicesList;
+    std::vector<std::shared_ptr<NfcDevice>> devicesList;
     for (size_t i = 0; i < count; ++i) {
-        devicesList.push_back(new NfcDevice(this, devices[i]));
+        devicesList.push_back(std::make_shared<NfcDevice>(this, devices[i]));
     }
-    return Result<std::vector<NfcDevice*>>::ok(devicesList);
+    return Result<std::vector<std::shared_ptr<NfcDevice>>>::ok(devicesList);
 }
 
 nfc_context *LibNfc::getContext() const

src/DataAccess/LibNfc.h

@@ -5,6 +5,7 @@
 #ifndef MIFARE_TOOLS_LIBNFC_H
 #define MIFARE_TOOLS_LIBNFC_H
 
+#include <memory>
 #include <nfc/nfc.h>
 #include "NfcDevice.h"
 #include "DBO/Result.h"
@@ -23,7 +24,7 @@ public:
 
     bool isInitialized();
 
-    Result<std::vector<NfcDevice*>> getDevices();
+    Result<std::vector<std::shared_ptr<NfcDevice>>> getDevices();
 
     static std::string getVersion();
 

src/DataAccess/NfcDevice.cpp

@@ -40,3 +40,18 @@ void NfcDevice::close()
         _device = 0;
     }
 }
+
+nfc_device *NfcDevice::getDevice() const
+{
+    return _device;
+}
+
+void NfcDevice::setConnStr(const std::string &connStr)
+{
+    _connStr = connStr;
+}
+
+const std::string &NfcDevice::getConnStr() const
+{
+    return _connStr;
+}

src/DataAccess/NfcDevice.h

@@ -25,15 +25,11 @@ public:
 
     bool isOpened();
 
-    const std::string &getConnStr() const
-    {
-        return _connStr;
-    }
-
-    void setConnStr(const std::string &connStr)
-    {
-        _connStr = connStr;
-    }
+    const std::string & getConnStr() const;
+
+    void setConnStr(const std::string &connStr);
+
+    nfc_device * getDevice() const;
 
 private:
     std::string _connStr;

src/Interface/MainClass.cpp

@@ -6,6 +6,7 @@
 #include <sysexits.h>
 #include <DBO/Result.h>
 #include <DataAccess/LibNfc.h>
+#include <DataAccess/FreeFareDevice.h>
 #include "CommandLineParser.h"
 #include "MainClass.h"
 
@@ -40,9 +41,6 @@ int MainClass::main()
     for (size_t i = 0; i < devices.getData().size(); ++i) {
         std::cout << devices.getData()[i]->getConnStr() << std::endl;
     }
-    for (size_t i = 1; i < devices.getData().size(); ++i) {
-        delete devices.getData()[i];
-    }
 
     auto device = devices.getData()[0];
     auto open = device->open();
@@ -51,9 +49,23 @@ int MainClass::main()
         return 4;
     }
 
+    FreeFareDevice freeFareDevice(device);
+    auto tags = freeFareDevice.getTags();
+    if (!tags) {
+        tags.print();
+        return 5;
+    }
 
+    std::cout << "Found " << tags.getData().size() << " tags:" << std::endl;
+    for (size_t i = 0; i < tags.getData().size(); ++i) {
+        auto tag = tags.getData()[i];
+        std::cout << "UID: " << tag->getUid() << std::endl;
+
+    }
 
     device->close();
 
+    libNfc.clean();
+
     return 0;
 }