Changeset a29e2e492d5b03e2ab7a9aced0d1313f06a650c0

Timestamp:

03/16/10 02:48:40 (2 years ago)

Author:

D.J. Capelis <dev@…>

Parents:

2e3212ee6039755ad0071edde541e432086c0216

Children:

6235648b3ca2df5a61e411548a29f45b2b3f27df

git-committer:

D.J. Capelis <dev@capelis.dj> / 2010-03-16T02:48:40Z-0700

Message:

Cleanup s/_TYPE/_SERVICE/ and implement LIST command, HELP now complaint
with RFC 1078

Files:

• config.c (modified) (7 diffs)
• handler.c (modified) (9 diffs)
• main.h (modified) (1 diff)

config.c

@@ -2 +2 @@
 
 struct service help;
+struct service list;
 struct service multiplex;
 struct service ssl;
@@ -26 +27 @@
 {
     help.name = "HELP\0";
-    help.service_type = HELP_TYPE;
-    help.next = &multiplex;
+    help.service_type = HELP_SERVICE;
+    help.next = &list;
+    list.name = "LIST\0";
+    list.service_type = LIST_SERVICE;
+    list.next = &multiplex;
     multiplex.name = "MULTIPLEX\0";
-    multiplex.service_type = MULTIPLEX_TYPE;
+    multiplex.service_type = MULTIPLEX_SERVICE;
     multiplex.next = &ssl;
     ssl.name = "SSL\0";
-    ssl.service_type = SSL_TYPE;
+    ssl.service_type = SSL_SERVICE;
     ssl.next = &auth;
     auth.name = "AUTH\0";
-    auth.service_type = AUTH_TYPE;
+    auth.service_type = AUTH_SERVICE;
     auth.next = &host;
     host.name = "HOST\0";
-    host.service_type = HOST_TYPE;
+    host.service_type = HOST_SERVICE;
     host.next = &shell;
     shell.name = "SHELL\0";
-    shell.service_type = CUSTOM_TYPE;
+    shell.service_type = CUSTOM_SERVICE;
     inet_pton(AF_INET6, "::ffff:127.0.0.1", &(shellsocket.sin6_addr));
     shellsocket.sin6_family=AF_INET6;
@@ -49 +53 @@
     shell.next = &echo;
     echo.name = "ECHO\0";
-    echo.service_type = CUSTOM_TYPE;
+    echo.service_type = CUSTOM_SERVICE;
     inet_pton(AF_INET6, "::ffff:127.0.0.1", &(shellsocket2.sin6_addr));
     shellsocket2.sin6_family=AF_INET6;
@@ -57 +61 @@
     echo.next = &hello;
     hello.name = "HELLO\0";
-    hello.service_type = CUSTOM_TYPE;
+    hello.service_type = CUSTOM_SERVICE;
     inet_pton(AF_INET6, "::ffff:127.0.0.1", &(s_hello.sin6_addr));
     s_hello.sin6_family=AF_INET6;
@@ -65 +69 @@
     hello.next = &web;
     rot13.name = "ROT13\0";
-    rot13.service_type = CUSTOM_TYPE;
+    rot13.service_type = CUSTOM_SERVICE;
     inet_pton(AF_INET6, "::ffff:127.0.0.1", &(s_rot13.sin6_addr));
     s_rot13.sin6_family=AF_INET6;
@@ -73 +77 @@
     rot13.next = &web;
     web.name = "WEB\0";
-    web.service_type = CUSTOM_TYPE;
+    web.service_type = CUSTOM_SERVICE;
     inet_pton(AF_INET6, "::ffff:127.0.0.1", &(s_web.sin6_addr));
     s_web.sin6_family=AF_INET6;
@@ -81 +85 @@
     web.next = &web2;
     web2.name = "WEB\0";
-    web2.service_type = CUSTOM_TYPE;
+    web2.service_type = CUSTOM_SERVICE;
     inet_pton(AF_INET6, "::ffff:127.0.0.1", &(s_web2.sin6_addr));
     s_web2.sin6_family=AF_INET6;

handler.c

@@ -17 +17 @@
     int multiplex = 0;
     struct service * service = NULL;
+    struct service * listservice = NULL;
     int i = 0;
     int outsock = 0;
@@ -96 +97 @@
         service = parse(&offset, &size, getbuffer, buffer, user, host);
 
-        if(service == -1)
+        if(service == (void *) -1)
             continue;
 
@@ -114 +115 @@
         }
 
-        if(service->service_type == HELP_TYPE)
+        if(service->service_type == HELP_SERVICE || service->service_type == LIST_SERVICE)
         {
             i = 0;
             response = calloc(BUFFER, sizeof(char));
-            service = servicelist->next;
-            while(service)
-            {
-                if((service->service_type == SSL_TYPE && ssl) || (service->service_type == MULTIPLEX_TYPE && multiplex))
-                {
-                    service = service->next;
+            listservice = servicelist;
+            while(listservice)
+            {
+                if((listservice->service_type == HELP_SERVICE || listservice->service_type == LIST_SERVICE))
+                {
+                    listservice = listservice->next;
                     continue;
                 }
-                if(service->restrict_user != NULL)
-                {
-                    if(user == NULL || service->restrict_user == NULL)
-                    {
-                        service = service->next;
+                if((listservice->service_type == SSL_SERVICE && ssl) || (listservice->service_type == MULTIPLEX_SERVICE && multiplex))
+                {
+                    listservice = listservice->next;
+                    continue;
+                }
+                if(listservice->restrict_user != NULL)
+                {
+                    if(user == NULL || listservice->restrict_user == NULL)
+                    {
+                        listservice = listservice->next;
                         continue;
                     }
-                    if(strcmp(user, service->restrict_user))
-                    {
-                        service = service->next;
+                    if(strcmp(user, listservice->restrict_user))
+                    {
+                        listservice = listservice->next;
                         continue;
                     }
                 }
-                if(service->restrict_host != NULL)
-                {
-                    if(host == NULL || service->restrict_host == NULL)
-                    {
-                        service = service->next;
+                if(listservice->restrict_host != NULL)
+                {
+                    if(host == NULL || listservice->restrict_host == NULL)
+                    {
+                        listservice = listservice->next;
                         continue;
                     }
-                    if(strcmp(host, service->restrict_host))
-                    {
-                        service = service->next;
+                    if(strcmp(host, listservice->restrict_host))
+                    {
+                        listservice = listservice->next;
                         continue;
                     }
                 }
-                i += strlen(service->name) + 2;
+                i += strlen(listservice->name) + 2;
                 if(i > BUFFER)
                     response = realloc(response, i);
-                strcat(response+i-(strlen(service->name)+2), service->name);
+                strcat(response+i-(strlen(listservice->name)+2), listservice->name);
                 response[i-1] = '\n';
                 response[i-2] = '\r';
-                service = service->next;
-                //TODO: Access control
+                listservice = listservice->next;
             }
             if(multiplex)
@@ -168 +173 @@
                 SSL_write(ssl, response, i);
             free(response);
+            if(service->service_type == HELP_SERVICE)
+                goto kill;
             if(mode)
                 goto process;
@@ -174 +181 @@
         }
 
-        if(service->service_type == MULTIPLEX_TYPE)
+        if(service->service_type == MULTIPLEX_SERVICE)
         {
             if(multiplex)
@@ -198 +205 @@
         }
 
-        if(service->service_type == SSL_TYPE)
+        if(service->service_type == SSL_SERVICE)
         {
             //TODO: OpenSSL is not re-entrant, care about that.
@@ -264 +271 @@
 
         /* Imagine the most minimalistic demo-driven auth service you could think of... this is a hair below that */
-        if(service->service_type == AUTH_TYPE)
+        if(service->service_type == AUTH_SERVICE)
         {
             if(multiplex)
@@ -329 +336 @@
         }
 
-        if(service->service_type == HOST_TYPE)
+        if(service->service_type == HOST_SERVICE)
         {
             if(multiplex)
@@ -367 +374 @@
         }
 
-        if(service->service_type == CUSTOM_TYPE)
+        if(service->service_type == CUSTOM_SERVICE)
         {
             // TODO: access control

main.h

@@ -28 +28 @@
 
 /* defines */
-#define HELP_TYPE 1
-#define MULTIPLEX_TYPE 2
-#define SSL_TYPE 3
-#define AUTH_TYPE 4
-#define HOST_TYPE 5
-#define CUSTOM_TYPE -1
+#define HELP_SERVICE 1
+#define LIST_SERVICE 2
+#define MULTIPLEX_SERVICE 3
+#define SSL_SERVICE 4
+#define AUTH_SERVICE 5
+#define HOST_SERVICE 6
+#define CUSTOM_SERVICE -1
 
 /* Forward declarations */