added more fields

Author: tihmstar

orbisFSTool/OrbisFSFormat.h

@@ -61,7 +61,7 @@ typedef struct {
     uint64_t unk3_is_0;         //is expected to be 0
     char     devpath[0x100];
     uint32_t inodesInRootFolder;//all the child iNodes inside /
-    uint32_t unk5_is_0xffffffff;//is expected to be 0xFFFFFFFF
+    uint32_t rdev_is_0xffffffff;//is expected to be 0xFFFFFFFF
     uint32_t highestUsedInode;  //not neccessarily in use now, but was in use at some point
     uint8_t _pad2[0x34];
     uint64_t blocksUsed;
@@ -83,18 +83,21 @@ typedef struct {
     uint32_t uid;
     uint32_t gid;
     uint32_t unk1;
-    uint32_t unk2;
-    uint32_t unk3;
+    uint32_t _pad2;
+    union {
+        uint32_t children;      //only valid for directories??
+        uint32_t unk2;          //used for non-directories
+    };
     uint64_t filesize;
-    uint32_t unk4;
-    uint32_t unk5;
+    uint32_t usedBlocks;
+    uint32_t flags;     //only on '/user/app/NPXS40172/app.pkg' the value is 2, on all the other files it is 0
     uint64_t unk6;
     uint64_t createDate;
-    uint64_t _pad2;         //should be zero
-    uint64_t modDate;
     uint64_t _pad3;         //should be zero
-    uint64_t accessDate;
+    uint64_t modDate;
     uint64_t _pad4;         //should be zero
+    uint64_t accessDate;
+    uint64_t _pad5;         //should be zero
     OrbisFSChainLink_t resourceLnk[4];
     OrbisFSChainLink_t dataLnk[0x20];
 } ATTRIBUTE_PACKED OrbisFSInode_t;

orbisFSTool/OrbisFSImage.cpp

@@ -186,7 +186,7 @@ void OrbisFSImage::init(){
     printf("\tunk3              : 0x%llx\n",_diskinfoblock->unk3_is_0);
     printf("\tdevpath           : '%.*s'\n",(int)sizeof(_diskinfoblock->devpath),_diskinfoblock->devpath);
     printf("\tinodesInRootFolder: 0x%x (%d)\n",_diskinfoblock->inodesInRootFolder,_diskinfoblock->inodesInRootFolder);
-    printf("\tunk5              : 0x%x\n",_diskinfoblock->unk5_is_0xffffffff);
+    printf("\trdev              : 0x%x\n",_diskinfoblock->rdev_is_0xffffffff);
     printf("\thighestUsedInode  : 0x%x (%d)\n",_diskinfoblock->highestUsedInode,_diskinfoblock->highestUsedInode);
     printf("\tblocksUsed        : 0x%llx\n",_diskinfoblock->blocksUsed);
     printf("\tblocksAvailable   : 0x%llx\n",_diskinfoblock->blocksAvailable);
@@ -201,7 +201,7 @@ void OrbisFSImage::init(){
     retassure(_diskinfoblock->unk1_is_2 == 2, "unexpected value for unk1");
     retassure(_diskinfoblock->unk2_is_0x40 == 0x40, "unexpected value for unk2");
     retassure(_diskinfoblock->unk3_is_0 == 0, "unexpected value for unk3");
-    retassure(_diskinfoblock->unk5_is_0xffffffff == 0xFFFFFFFF, "unexpected value for unk5");
+    retassure(_diskinfoblock->rdev_is_0xffffffff == 0xFFFFFFFF, "unexpected value for rdev_is_0xffffffff");
     retassure(memvcmp(_diskinfoblock->_pad2, sizeof(_diskinfoblock->_pad2), 0x00), "_pad2 is not zero");
     retassure(!memcmp(&_diskinfoblock->diskinfoLnk, &_superblock->diskinfoLnk, sizeof(_superblock->diskinfoLnk)), "diskinfoLnk mismatch between superblock and diskinfoblock");
     retassure(_diskinfoblock->inodedirLnk.type == ORBIS_FS_CHAINLINK_TYPE_LINK, "Unexpected inodedirLnk.type");

orbisFSTool/OrbisFSInodeDirectory.cpp

@@ -117,6 +117,7 @@ OrbisFSInode_t *OrbisFSInodeDirectory::findInode(uint32_t inodeNum){
     retassure(memvcmp(&ret->_pad2, sizeof(ret->_pad2), 0x00), "inode %d entry _pad2 is not zero",inodeNum);
     retassure(memvcmp(&ret->_pad3, sizeof(ret->_pad3), 0x00), "inode %d entry _pad3 is not zero",inodeNum);
     retassure(memvcmp(&ret->_pad4, sizeof(ret->_pad4), 0x00), "inode %d entry _pad4 is not zero",inodeNum);
+    retassure(memvcmp(&ret->_pad5, sizeof(ret->_pad5), 0x00), "inode %d entry _pad5 is not zero",inodeNum);
     return ret;
 }
 

orbisFSTool/main.cpp

@@ -327,11 +327,14 @@ int main_r(int argc, const char * argv[]) {
                 printf("\tuid               : %d\n",node.uid);
                 printf("\tgid               : %d\n",node.gid);
                 printf("\tunk1              : %d\n",node.unk1);
-                printf("\tunk2              : %d\n",node.unk2);
-                printf("\tunk3              : %d\n",node.unk3);
+                if (S_ISDIR(node.fileMode)) {
+                    printf("\tchildren          : %d\n",node.children);
+                }else{
+                    printf("\tunk2              : %d\n",node.unk2);
+                }
                 printf("\tfilesize          : 0x%016llx (%lld)\n",node.filesize,node.filesize);
-                printf("\tunk4              : %d\n",node.unk4);
-                printf("\tunk5              : %d\n",node.unk5);
+                printf("\tusedBlocks        : %d\n",node.usedBlocks);
+                printf("\tflags             : %d\n",node.flags);
                 printf("\tunk6              : %lld\n",node.unk6);
                 printf("\tcreateDate        : %10lld (%s)\n",node.createDate,strForDate(node.createDate).c_str());
                 printf("\tmodDate           : %10lld (%s)\n",node.modDate,strForDate(node.modDate).c_str());