Changeset eb083ad in mainline for uspace/app

Timestamp:

2012-05-17T21:09:06Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

8fde078

Parents:

a8b8086 (diff), 3e67ab1 (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

Location:

uspace/app

Files:

• inet/Makefile (moved) (moved from uspace/app/inetcfg/Makefile ) (1 diff)
• inet/inet.c (moved) (moved from uspace/app/inetcfg/inetcfg.c ) (6 diffs)
• init/init.c (modified) (1 diff)
• loc/Makefile (moved) (moved from uspace/app/locinfo/Makefile ) (1 diff)
• loc/loc.c (moved) (moved from uspace/app/locinfo/locinfo.c ) (4 diffs)
• nterm/Makefile (added)
• nterm/conn.c (added)
• nterm/conn.h (moved) (moved from uspace/lib/c/include/net/modules.h ) (2 diffs)
• nterm/nterm.c (added)
• nterm/nterm.h (added)
• sbi/src/stype.c (modified) (1 diff)
• websrv/websrv.c (modified) (13 diffs)

uspace/app/inet/Makefile

@@ -28 +28 @@
 
 USPACE_PREFIX = ../..
-BINARY = inetcfg
+BINARY = inet
 
 SOURCES = \
-        inetcfg.c
+        inet.c
 
 include $(USPACE_PREFIX)/Makefile.common

uspace/app/inet/inet.c

@@ -27 +27 @@
  */
 
-/** @addtogroup inetcfg
+/** @addtogroup inet
  * @{
  */
@@ -35 +35 @@
  */
 
-#include <async.h>
 #include <errno.h>
 #include <inet/inetcfg.h>
@@ -44 +43 @@
 #include <sys/types.h>
 
-#define NAME "inetcfg"
+#define NAME "inet"
 
 static void print_syntax(void)
@@ -188 +187 @@
         rc = inetcfg_addr_create_static(aobj_name, &naddr, link_id, &addr_id);
         if (rc != EOK) {
-                printf(NAME ": Failed creating static address '%s' (%d)\n",
-                    aobj_name, rc);
+                printf(NAME ": Failed creating static address '%s' (%s)\n",
+                    aobj_name, str_error(rc));
                 return EIO;
         }
@@ -346 +345 @@
 
         printf("Configured addresses:\n");
-
+        if (count > 0)
+                printf("    [Addr/Width] [Link-Name] [Addr-Name] [Def-MTU]\n");
         ainfo.name = linfo.name = astr = NULL;
 
@@ -416 +416 @@
 
         printf("Static routes:\n");
+        if (count > 0)
+                printf("    [Dest/Width] [Router-Addr] [Route-Name]\n");
 
         srinfo.name = dest_str = router_str = NULL;

uspace/app/init/init.c

@@ -307 +307 @@
         spawn("/srv/loopip");
         spawn("/srv/ethip");
-        spawn("/srv/inet");
+        spawn("/srv/inetsrv");
         spawn("/srv/tcp");
         spawn("/srv/udp");

uspace/app/loc/Makefile

@@ -28 +28 @@
 
 USPACE_PREFIX = ../..
-EXTRA_CFLAGS = -Iinclude
-BINARY = locinfo
+BINARY = loc
 
 SOURCES = \
-        locinfo.c
+        loc.c
 
 include $(USPACE_PREFIX)/Makefile.common

uspace/app/loc/loc.c

@@ -27 +27 @@
  */
 
-/** @addtogroup locinfo
+/** @addtogroup loc
  * @{
  */
-/** @file locinfo.c Print information from location service.
+/** @file loc.c Print information from location service.
  */
 
@@ -41 +41 @@
 #include <sys/typefmt.h>
 
-#define NAME "locinfo"
+#define NAME "loc"
 
-int main(int argc, char *argv[])
+static int show_cat(const char *cat_name, category_id_t cat_id)
+{
+        service_id_t *svc_ids;
+        size_t svc_cnt;
+        char *svc_name;
+        int rc;
+        size_t j;
+
+        printf("%s (%" PRIun "):\n", cat_name, cat_id);
+
+        rc = loc_category_get_svcs(cat_id, &svc_ids, &svc_cnt);
+        if (rc != EOK) {
+                printf(NAME ": Failed getting list of services in "
+                    "category %s, skipping.\n", cat_name);
+                return rc;
+        }
+
+        for (j = 0; j < svc_cnt; j++) {
+                rc = loc_service_get_name(svc_ids[j], &svc_name);
+                if (rc != EOK) {
+                        printf(NAME ": Unknown service name (SID %"
+                            PRIun ").\n", svc_ids[j]);
+                        continue;
+                }
+                printf("\t%s (%" PRIun ")\n", svc_name, svc_ids[j]);
+                free(svc_name);
+        }
+
+        free(svc_ids);
+        return EOK;
+}
+
+static int list_svcs_by_cat(void)
 {
         category_id_t *cat_ids;
         size_t cat_cnt;
-        service_id_t *svc_ids;
-        size_t svc_cnt;
 
-        size_t i, j;
+        size_t i;
         char *cat_name;
-        char *svc_name;
         int rc;
 
@@ -58 +87 @@
         if (rc != EOK) {
                 printf(NAME ": Error getting list of categories.\n");
-                return 1;
+                return rc;
         }
 
@@ -68 +97 @@
                 if (cat_name == NULL) {
                         printf(NAME ": Error allocating memory.\n");
-                        return 1;
+                        free(cat_ids);
+                        return rc;
                 }
 
-                printf("%s (%" PRIun "):\n", cat_name, cat_ids[i]);
+                rc = show_cat(cat_name, cat_ids[i]);
+                (void) rc;
 
-                rc = loc_category_get_svcs(cat_ids[i], &svc_ids, &svc_cnt);
-                if (rc != EOK) {
-                        printf(NAME ": Failed getting list of services in "
-                            "category %s, skipping.\n", cat_name);
-                        free(cat_name);
-                        continue;
-                }
-
-                for (j = 0; j < svc_cnt; j++) {
-                        rc = loc_service_get_name(svc_ids[j], &svc_name);
-                        if (rc != EOK) {
-                                printf(NAME ": Unknown service name (SID %"
-                                    PRIun ").\n", svc_ids[j]);
-                                continue;
-                        }
-                        printf("\t%s (%" PRIun ")\n", svc_name, svc_ids[j]);
-                        free(svc_name);
-                }
-
-                free(svc_ids);
                 free(cat_name);
         }
 
         free(cat_ids);
+        return EOK;
+}
+
+static void print_syntax(void)
+{
+        printf("syntax:\n"
+            "\t" NAME "                      List categories and services "
+                "they contain\n"
+            "\t" NAME " show-cat <category>  List services in category\n");
+}
+
+int main(int argc, char *argv[])
+{
+        int rc;
+        char *cmd;
+        char *cat_name;
+        category_id_t cat_id;
+
+        if (argc <= 1) {
+                rc = list_svcs_by_cat();
+                if (rc != EOK)
+                        return 1;
+                return 0;
+        }
+
+        cmd = argv[1];
+        if (str_cmp(cmd, "show-cat") == 0) {
+                if (argc < 3) {
+                        printf("Argument missing.\n");
+                        print_syntax();
+                        return 1;
+                }
+
+                cat_name = argv[2];
+                rc = loc_category_get_id(cat_name, &cat_id, 0);
+                if (rc != EOK) {
+                        printf("Error looking up category '%s'.\n", cat_name);
+                        return 1;
+                }
+
+                rc = show_cat(cat_name, cat_id);
+                if (rc != EOK)
+                        return 1;
+        } else {
+                printf("Invalid command '%s'\n", cmd);
+                print_syntax();
+                return 1;
+        }
+
         return 0;
 }

uspace/app/nterm/conn.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Lukas Mejdrech
+ * Copyright (c) 2012 Jiri Svoboda
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup edit
  * @{
  */
-
-/** @file
- * Generic module functions.
- *
- * @todo MAKE IT POSSIBLE TO REMOVE THIS FILE VIA EITHER REPLACING PART OF ITS
- * FUNCTIONALITY OR VIA INTEGRATING ITS FUNCTIONALITY MORE TIGHTLY WITH THE REST
- * OF THE SYSTEM.
+/**
+ * @file
  */
 
-#ifndef LIBC_MODULES_H_
-#define LIBC_MODULES_H_
+#ifndef CONN_H
+#define CONN_H
 
-#include <async.h>
-#include <ipc/services.h>
-#include <sys/time.h>
+#include <sys/types.h>
 
-extern void answer_call(ipc_callid_t, int, ipc_call_t *, size_t);
-extern async_sess_t *bind_service(services_t, sysarg_t, sysarg_t, sysarg_t,
-    async_client_conn_t);
-extern void refresh_answer(ipc_call_t *, size_t *);
+extern int conn_open(const char *, const char *);
+extern int conn_send(void *, size_t);
 
 #endif

uspace/app/sbi/src/stype.c

@@ -652 +652 @@
         assert(iface_ti->tic == tic_tobject);
         iface = iface_ti->u.tobject->csi;
-        assert(iface->cc = csi_interface);
+        assert(iface->cc == csi_interface);
 
 #ifdef DEBUG_TYPE_TRACE

uspace/app/websrv/websrv.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2011 Jiri Svoboda
+ * Copyright (c) 2012 Jiri Svoboda
  * All rights reserved.
  *
@@ -41 +41 @@
 #include <stdlib.h>
 #include <fcntl.h>
+#include <task.h>
 
 #include <net/in.h>
@@ -71 +72 @@
 
 static char fbuf[BUFFER_SIZE];
+
+static bool verbose = false;
 
 /** Responses to send to client. */
@@ -187 +190 @@
         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 +256 @@
         }
         
-        fprintf(stderr, "Request: %s", lbuf);
+        if (verbose)
+                fprintf(stderr, "Request: %s", lbuf);
         
         if (str_lcmp(lbuf, "GET ", 4) != 0) {
@@ -266 +272 @@
         
         *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 +294 @@
             "\n"
             "-h | --help\n"
-            "\tShow this application help.\n");
+            "\tShow this application help.\n"
+            "-v | --verbose\n"
+            "\tVerbose mode\n");
 }
 
@@ -306 +315 @@
                 
                 port = (uint16_t) value;
+                break;
+        case 'v':
+                verbose = true;
                 break;
         /* Long options with double dash */
@@ -318 +330 @@
                         
                         port = (uint16_t) value;
+                } else if (str_cmp(argv[*index] +2, "verbose") == 0) {
+                        verbose = true;
                 } else {
                         usage();
@@ -358 +372 @@
         }
         
-        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 +397 @@
         }
         
-        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 +413 @@
                 }
                 
-                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 +434 @@
                 }
                 
-                fprintf(stderr, "Connection closed\n");
+                if (verbose)
+                        fprintf(stderr, "Connection closed\n");
         }