Changeset 846

Timestamp:

08/09/08 10:45:52 (3 years ago)

Author:

mwhitworth

Message:

Add (basic) Python client, add to socket code, add support for getting entry type in keyset.

Location:

Whitix/trunk/user/system

Files:

• Makefile (modified) (3 diffs)
• registry/Makefile (modified) (1 diff)
• registry/handle.c (modified) (4 diffs)
• registry/handle.h (modified) (1 diff)
• registry/key.c (modified) (3 diffs)
• registry/keyset.c (modified) (5 diffs)
• registry/socket.c (modified) (4 diffs)
• registry/socket.h (modified) (1 diff)
• registry/textreg (added)
• registry/textreg/Makefile (added)
• registry/textreg/main.py (added)

Whitix/trunk/user/system/Makefile

@@ -8 +8 @@
         gcc -m32 -nostdlib -L../libc -L../librtl -L../posix -L../sdk/libs ../libc/init/init.o moduleadd.o -lstdc -lrtl -lpthread -o moduleadd -Wl,-I/System/Runtime/liblinker.so
         gcc -m32 -nostdlib -L../libc -L../librtl -L../posix -L../sdk/libs ../libc/init/init.o startup.o -lstdc -lrtl -lpthread -o startup -Wl,-I/System/Runtime/liblinker.so
-        make -C registry/server
+        make -C registry
 #       make -C installer
 
@@ -15 +15 @@
         cp moduleadd ../../CdRoot/System/Modules/
         cp testm.o ../../CdRoot/System/Modules/testm.sys
-        make -C registry/server install
+        make -C registry install
 #       make -C installer install
         
@@ -21 +21 @@
         rm -f *.o
         rm -f moduleadd startup
-        make -C registry/server clean
+        make -C registry clean
 #       make -C installer clean

Whitix/trunk/user/system/registry/Makefile

@@ -15 +15 @@
 install:
         cp regserver ../../../CdRoot/System/Startup/
+        make -C textreg install
         
 clean:

Whitix/trunk/user/system/registry/handle.c

@@ -6 +6 @@
         struct RegKeySetHandle* handle;
         struct RegKeySet* set;
+        int handleId=0;
         
         set=RegKeySetGet(name);
@@ -25 +26 @@
                 
                 while (curr->next)
+                {
                         curr=curr->next;
+                        handleId++;
+                }
                         
                 curr->next=handle;
         }
+        
+        handle->handleId=handleId;
         
         return handle;
@@ -36 +42 @@
 {
         struct RegKeySetHandle* curr=list;
-        unsigned long ret=0;
         
         while (curr && curr != handle)
-        {
-                ret++;
                 curr=curr->next;
-        }
         
         if (!curr)
                 return -1;
         
-        return ret;
+        return curr->handleId;
 }
 
@@ -54 +56 @@
         struct RegKeySetHandle* curr=list;
         
-        while (curr && id--)
+        while (curr && curr->handleId != id)
                 curr=curr->next;
                 

Whitix/trunk/user/system/registry/handle.h

@@ -6 +6 @@
         struct RegKeySet* set;
         struct RegKeySetHandle* next;
+        int handleId;
 };
 

Whitix/trunk/user/system/registry/key.c

@@ -33 +33 @@
                 if (!c)
                         break;
+                
+                printf("currName = %s, length = %d\n", currName, length);
                         
                 nextSet=RegKeySetLookupOne(currSet, currName, length);
@@ -39 +41 @@
 
                 currSet=nextSet;
-
         }
         
@@ -46 +47 @@
         keySet=currSet;
         
+        printf("key = %s\n", key);
+        
         new=(struct RegKey*)malloc(sizeof(struct RegKey));
         
         new->key=strdup(key);
+        new->next=NULL;
         
         if (type)

Whitix/trunk/user/system/registry/keyset.c

@@ -76 +76 @@
 }
 
+struct RegKey* RegKeySetGetKey(struct RegKeySet* keySet, int id)
+{
+        struct RegKey* curr=keySet->keys;
+
+    while (curr && id--)
+        curr=curr->next;
+        
+    return curr;
+}
+
 struct RegKey* RegKeySetFindKey(struct RegKeySet* keySet, char* name)
 {
@@ -93 +103 @@
 void RegKeySetAddKey(struct RegKeySet* parent, struct RegKey* key)
 {
+        /* TODO: Check name in keysets. */
+
         if (!parent->keys)
         {
@@ -134 +146 @@
         
         parent->numChildren++;
-        printf("%s, %d\n", parent->name, parent->numChildren);
 }
 
@@ -140 +151 @@
 {
         struct RegKeySet* ret;
+        
+        /* TODO: Check name in keys. */
         
         ret=(struct RegKeySet*)malloc(sizeof(struct RegKeySet));
@@ -171 +184 @@
         struct RegKeySet* parent;
         char* name;
+        int len;
         
         /* Parse the path. */
         parent=RegKeySetLookup(keySet, path, &name);
         
+        len=strlen(name);
+        
         /* Look up the name. If it exists already, don't create it again. */
-        if (!RegKeySetLookupOne(parent, name, strlen(name)))
-                RegKeySetCreateOne(parent, name, strlen(name));
+        if (!RegKeySetLookupOne(parent, name, len))
+                RegKeySetCreateOne(parent, name, len);
         
 }

Whitix/trunk/user/system/registry/socket.c

@@ -123 +123 @@
                         int strLen=strlen(currChild->name);
                         packet->index++;
-                        memcpy(curr, currChild->name, strLen);
+                        strcpy(curr, currChild->name);
                         curr+=strLen+1;
-                        packet->size-=strLen;
+                        packet->size-=(strLen+1);
                         
                         currChild=currChild->next;
@@ -134 +134 @@
                 && packet->index < set->numChildren+set->numKeys)
         {
-                printf("Copy over KEYS\n");
+                packet->index-=set->numChildren;
+                
+                struct RegKey* currKey=RegKeySetGetKey(set, packet->index);
+
+                while (packet->size > 0 && currKey)
+                {
+                        int strLen=strlen(currKey->key);
+                        packet->index++;
+                        strcpy(curr, currKey->key);
+                        curr+=strLen+1;
+                        packet->size-=(strLen+1);
+
+                        currKey=currKey->next;
+                }
         }
         
@@ -149 +162 @@
         length=-1;
         NetSocketSend(clientFd, &length, sizeof(int), 0);
+}
+
+void RegSocketParseType(int clientFd, char* buf, struct RegKeySetHandle* list)
+{
+        struct RegReadKeyPacket* packet=(struct RegReadKeyPacket*)buf;
+        struct RegKeySetHandle* handle;
+        struct RegKeySet* set;
+        struct RegKey* key;
+        int type=-1;
+
+        handle=RegKeySetGetHandle(list, packet->handleId);
+        
+        if (!handle)
+                goto out;
+                
+        set=handle->set;
+        
+        key=RegKeySetFindKey(set, packet->name);
+        
+        if (key)
+        {
+                type=0;
+                goto out;
+        }
+        
+        set=RegKeySetLookupOne(set, packet->name, strlen(packet->name));
+        
+        if (set)
+                type=1;
+        
+out:
+        NetSocketSend(clientFd, &type, sizeof(int), 0);
 }
 
@@ -184 +229 @@
                                 RegSocketParseEnum(clientFd, buf, list);
                                 break;
+                                
+                        case REG_PACKET_GET_ENT_TYPE:
+                                RegSocketParseType(clientFd, buf, list);
+                                break;
                         
                         default:

Whitix/trunk/user/system/registry/socket.h

@@ -5 +5 @@
 #define REG_PACKET_READ_KEY             2
 #define REG_PACKET_ENUM_KEYSET  3
+#define REG_PACKET_GET_ENT_TYPE 4
 
 struct RegPacketHeader