Changes in uspace/app/websrv/websrv.c [a35b458:5a6cc679] in mainline

File:

• uspace/app/websrv/websrv.c (modified) (27 diffs)

uspace/app/websrv/websrv.c

@@ -137 +137 @@
 {
         recv_t *recv;
-
+        
         recv = calloc(1, sizeof(recv_t));
         if (recv == NULL)
                 return ENOMEM;
-
+        
         recv->conn = conn;
         recv->rbuf_out = 0;
         recv->rbuf_in = 0;
         recv->lbuf_used = 0;
-
+        
         *rrecv = recv;
         return EOK;
@@ -161 +161 @@
         size_t nrecv;
         errno_t rc;
-
+        
         if (recv->rbuf_out == recv->rbuf_in) {
                 recv->rbuf_out = 0;
                 recv->rbuf_in = 0;
-
+                
                 rc = tcp_conn_recv_wait(recv->conn, recv->rbuf, BUFFER_SIZE, &nrecv);
                 if (rc != EOK) {
@@ -171 +171 @@
                         return rc;
                 }
-
+                
                 recv->rbuf_in = nrecv;
         }
-
+        
         *c = recv->rbuf[recv->rbuf_out++];
         return EOK;
@@ -184 +184 @@
         char *bp = recv->lbuf;
         char c = '\0';
-
+        
         while (bp < recv->lbuf + BUFFER_SIZE) {
                 char prev = c;
                 errno_t rc = recv_char(recv, &c);
-
+                
                 if (rc != EOK)
                         return rc;
-
+                
                 *bp++ = c;
                 if ((prev == '\r') && (c == '\n'))
                         break;
         }
-
+        
         recv->lbuf_used = bp - recv->lbuf;
         *bp = '\0';
-
+        
         if (bp == recv->lbuf + BUFFER_SIZE)
                 return ELIMIT;
-
+        
         *rbuf = recv->lbuf;
         return EOK;
@@ -211 +211 @@
         if (uri[0] != '/')
                 return false;
-
+        
         if (uri[1] == '.')
                 return false;
-
+        
         char *cp = uri + 1;
-
+        
         while (*cp != '\0') {
                 char c = *cp++;
@@ -222 +222 @@
                         return false;
         }
-
+        
         return true;
 }
@@ -229 +229 @@
 {
         size_t response_size = str_size(msg);
-
+        
         if (verbose)
             fprintf(stderr, "Sending response\n");
-
+        
         errno_t rc = tcp_conn_send(conn, (void *) msg, response_size);
         if (rc != EOK) {
@@ -238 +238 @@
                 return rc;
         }
-
+        
         return EOK;
 }
@@ -249 +249 @@
         size_t nr;
         int fd = -1;
-
+        
         fbuf = calloc(BUFFER_SIZE, 1);
         if (fbuf == NULL) {
@@ -255 +255 @@
                 goto out;
         }
-
+        
         if (str_cmp(uri, "/") == 0)
                 uri = "/index.html";
-
+        
         if (asprintf(&fname, "%s%s", WEB_ROOT, uri) < 0) {
                 rc = ENOMEM;
                 goto out;
         }
-
+        
         rc = vfs_lookup_open(fname, WALK_REGULAR, MODE_READ, &fd);
         if (rc != EOK) {
@@ -269 +269 @@
                 goto out;
         }
-
+        
         free(fname);
         fname = NULL;
-
+        
         rc = send_response(conn, msg_ok);
         if (rc != EOK)
                 goto out;
-
+        
         aoff64_t pos = 0;
         while (true) {
@@ -282 +282 @@
                 if (rc != EOK)
                         goto out;
-
+                
                 if (nr == 0)
                         break;
-
+                
                 rc = tcp_conn_send(conn, fbuf, nr);
                 if (rc != EOK) {
@@ -292 +292 @@
                 }
         }
-
+        
         rc = EOK;
 out:
@@ -311 +311 @@
                 return rc;
         }
-
+        
         if (verbose)
                 fprintf(stderr, "Request: %s", reqline);
-
+        
         if (str_lcmp(reqline, "GET ", 4) != 0) {
                 rc = send_response(conn, msg_not_implemented);
                 return rc;
         }
-
+        
         char *uri = reqline + 4;
         char *end_uri = str_chr(uri, ' ');
@@ -326 +326 @@
                 assert(*end_uri == '\r');
         }
-
+        
         *end_uri = '\0';
         if (verbose)
                 fprintf(stderr, "Requested URI: %s\n", uri);
-
+        
         if (!uri_is_valid(uri)) {
                 rc = send_response(conn, msg_bad_request);
                 return rc;
         }
-
+        
         return uri_get(uri, conn);
 }
@@ -359 +359 @@
         int value;
         errno_t rc;
-
+        
         switch (argv[*index][1]) {
         case 'h':
@@ -369 +369 @@
                 if (rc != EOK)
                         return rc;
-
+                
                 port = (uint16_t) value;
                 break;
@@ -384 +384 @@
                         if (rc != EOK)
                                 return rc;
-
+                        
                         port = (uint16_t) value;
                 } else if (str_cmp(argv[*index] +2, "verbose") == 0) {
@@ -397 +397 @@
                 return EINVAL;
         }
-
+        
         return EOK;
 }
@@ -405 +405 @@
         errno_t rc;
         recv_t *recv = NULL;
-
+        
         if (verbose)
                 fprintf(stderr, "New connection, waiting for request\n");
-
+        
         rc = recv_create(conn, &recv);
         if (rc != EOK) {
@@ -414 +414 @@
                 goto error;
         }
-
+        
         rc = req_process(conn, recv);
         if (rc != EOK) {
@@ -421 +421 @@
                 goto error;
         }
-
+        
         rc = tcp_conn_send_fin(conn);
         if (rc != EOK) {
@@ -434 +434 @@
         if (rc != EOK)
                 fprintf(stderr, "Error resetting connection.\n");
-
+        
         recv_destroy(recv);
 }
@@ -444 +444 @@
         tcp_t *tcp;
         errno_t rc;
-
+        
         /* Parse command line arguments */
         for (int i = 1; i < argc; i++) {
@@ -456 +456 @@
                 }
         }
-
+        
         printf("%s: HelenOS web server\n", NAME);
 
         if (verbose)
                 fprintf(stderr, "Creating listener\n");
-
+        
         inet_ep_init(&ep);
         ep.port = port;
@@ -477 +477 @@
                 return 2;
         }
-
+        
         fprintf(stderr, "%s: Listening for connections at port %" PRIu16 "\n",
             NAME, port);
@@ -483 +483 @@
         task_retval(0);
         async_manager();
-
+        
         /* Not reached */
         return 0;