fixed block read

cli/Interface/MainClass.cpp

@@ -63,12 +63,19 @@ int MainClass::main()
     for (size_t i = 0; i < tags.getData().size(); ++i) {
         auto tag = tags.getData()[i];
         std::cout << "UID: " << tag->getUid() << std::endl;
-        auto sector = tag->readSector(1, StringUtils::humanToRaw("8829da9daf76").getData(), MFC_KEY_A);
-        if (!sector) {
-            sector.print();
-            return 6;
+        std::cout << "Type: " << tag->getType() << std::endl;
+        for(int i = 0; i < 16; ++i) {
+            std::cout << "+Sector: " << i << std::endl;
+            for (int j = 0; j < 4; ++j) {
+                auto sector = tag->readBlock(i, j, StringUtils::humanToRaw("8829da9daf76").getData(), MFC_KEY_A);
+                if (!sector) {
+                    sector.print();
+                }
+                else {
+                    std::cout << StringUtils::rawToHuman(sector.getData()) << std::endl;
+                }
+            }
         }
-        std::cout << "Sector 1: " << StringUtils::rawToHuman(sector.getData()) << std::endl;
     }
 
     device->close();

src/Business/FreeFareTagBusiness.cpp

@@ -22,7 +22,8 @@ ResultString FreeFareTagBusiness::readBlock(int sector, int block, std::string k
 ResultString FreeFareTagBusiness::readSector(int sector, std::string key, int keyType)
 {
     std::string res;
-    for (int i = 0; i < 4; ++i) {
+    int lastBlock = _tag->getSectorBlockCount(sector);
+    for (int i = 0; i < lastBlock; ++i) {
         auto data = readBlock(sector, i, key, keyType);
         if (data) {
             res += data.getData();
@@ -39,7 +40,12 @@ const std::string &FreeFareTagBusiness::getUid() const
     return _tag->getUid();
 }
 
+freefare_tag_type FreeFareTagBusiness::getType() const
+{
+    return _tag->getType();
+}
+
 std::shared_ptr<FreeFareTag> FreeFareTagBusiness::getTag() const
 {
     return _tag;
-}
+}

src/Business/FreeFareTagBusiness.h

@@ -22,6 +22,8 @@ public:
 
     const std::string & getUid() const;
 
+    freefare_tag_type getType() const;
+
     std::shared_ptr<FreeFareTag> getTag() const;
 
 protected:

src/DataAccess/FreeFareTag.cpp

@@ -18,21 +18,6 @@ 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;
-}
-
 ResultBool FreeFareTag::authenticate(int sector, int block, std::string key, int keyType)
 {
     if (mifare_classic_connect(_tag) != 0) {
@@ -54,7 +39,7 @@ ResultString FreeFareTag::readBlock(int sector, int block, std::string key, int
         return ResultString::error("Failed to connect to MIFARE tag");
     }
 
-    block = mifare_classic_sector_last_block((MifareClassicBlockNumber)sector) + block;
+    block = mifare_classic_sector_first_block((MifareClassicBlockNumber)sector) + block;
     if (mifare_classic_authenticate(_tag, (MifareClassicBlockNumber)block, (const unsigned char*)key.c_str(),
                                     (MifareClassicKeyType)keyType) != 0) {
         return ResultString::error("Failed to authenticate to MIFARE tag");
@@ -68,3 +53,33 @@ ResultString FreeFareTag::readBlock(int sector, int block, std::string key, int
     mifare_classic_disconnect(_tag);
     return ResultString::ok(std::string((const char*)data, sizeof(data)));
 }
+
+const freefare_tag *FreeFareTag::getTag() const
+{
+    return _tag;
+}
+
+int FreeFareTag::getFirstBlock(int sector) const
+{
+    return mifare_classic_sector_first_block(sector);
+}
+
+int FreeFareTag::getLastBlock(int sector) const
+{
+    return mifare_classic_sector_last_block(sector);
+}
+
+int FreeFareTag::getSectorBlockCount(int sector)
+{
+    return mifare_classic_sector_block_count(sector);
+}
+
+freefare_tag_type FreeFareTag::getType() const
+{
+    return _type;
+}
+
+const std::string &FreeFareTag::getUid() const
+{
+    return _uid;
+}

src/DataAccess/FreeFareTag.h

@@ -20,6 +20,12 @@ public:
 
     ResultString readBlock(int sector, int block, std::string key, int keyType);
 
+    int getFirstBlock(int sector) const;
+
+    int getLastBlock(int sector) const;
+
+    int getSectorBlockCount(int sector);
+
     const freefare_tag * getTag() const;
 
     freefare_tag_type getType() const;