Changeset 97c7682 in mainline for uspace/app/websrv/websrv.c

Timestamp:

2012-07-14T11:18:40Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

804d9b6

Parents:

0747468 (diff), f0348c8 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

Text conflict in boot/arch/arm32/Makefile.inc:

Trivial conflict around ifeq condition.

Text conflict in kernel/arch/arm32/include/mm/page.h:

Added defines and set_pt_levelx_present function.
COnflict looked horrible because of the armv4/v7 split.

File:

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

uspace/app/websrv/websrv.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2011 Jiri Svoboda
+ * Copyright (c) 2012 Jiri Svoboda
  * All rights reserved.
  *
@@ -36 +36 @@
 #include <bool.h>
 #include <errno.h>
+#include <assert.h>
 #include <stdio.h>
 #include <sys/types.h>
@@ -41 +42 @@
 #include <stdlib.h>
 #include <fcntl.h>
+#include <task.h>
 
 #include <net/in.h>
@@ -71 +73 @@
 
 static char fbuf[BUFFER_SIZE];
+
+static bool verbose = false;
 
 /** Responses to send to client. */
@@ -187 +191 @@
         size_t response_size = str_size(msg);
         
-        fprintf(stderr, "Sending response\n");
+        if (verbose)
+            fprintf(stderr, "Sending response\n");
+        
         ssize_t rc = send(conn_sd, (void *) msg, response_size, 0);
         if (rc < 0) {
@@ -251 +257 @@
         }
         
-        fprintf(stderr, "Request: %s", lbuf);
+        if (verbose)
+                fprintf(stderr, "Request: %s", lbuf);
         
         if (str_lcmp(lbuf, "GET ", 4) != 0) {
@@ -266 +273 @@
         
         *end_uri = '\0';
-        fprintf(stderr, "Requested URI: %s\n", uri);
+        if (verbose)
+                fprintf(stderr, "Requested URI: %s\n", uri);
         
         if (!uri_is_valid(uri)) {
@@ -287 +295 @@
             "\n"
             "-h | --help\n"
-            "\tShow this application help.\n");
+            "\tShow this application help.\n"
+            "-v | --verbose\n"
+            "\tVerbose mode\n");
 }
 
@@ -306 +316 @@
                 
                 port = (uint16_t) value;
+                break;
+        case 'v':
+                verbose = true;
                 break;
         /* Long options with double dash */
@@ -318 +331 @@
                         
                         port = (uint16_t) value;
+                } else if (str_cmp(argv[*index] +2, "verbose") == 0) {
+                        verbose = true;
                 } else {
                         usage();
@@ -358 +373 @@
         }
         
-        fprintf(stderr, "Creating socket\n");
+        printf("%s: HelenOS web server\n", NAME);
+
+        if (verbose)
+                fprintf(stderr, "Creating socket\n");
         
         int listen_sd = socket(PF_INET, SOCK_STREAM, 0);
@@ -380 +398 @@
         }
         
-        fprintf(stderr, "Listening for connections at port %" PRIu16 "\n",
-            port);
+        fprintf(stderr, "%s: Listening for connections at port %" PRIu16 "\n",
+            NAME, port);
+
+        task_retval(0);
+
         while (true) {
                 struct sockaddr_in raddr;
@@ -393 +414 @@
                 }
                 
-                fprintf(stderr, "Connection accepted (sd=%d), "
-                    "waiting for request\n", conn_sd);
+                if (verbose) {
+                        fprintf(stderr, "Connection accepted (sd=%d), "
+                            "waiting for request\n", conn_sd);
+                }
                 
                 rbuf_out = 0;
@@ -412 +435 @@
                 }
                 
-                fprintf(stderr, "Connection closed\n");
+                if (verbose)
+                        fprintf(stderr, "Connection closed\n");
         }