Changeset 849ed54 in mainline for uspace/app/netecho

Timestamp:

2010-03-30T18:39:04Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

7553689

Parents:

7d6fe4db

Message:

Networking work:
Split the networking stack into end-user library (libsocket) and two helper libraries (libnet and libnetif).
Don't use over-the-hand compiling and linking, but rather separation of conserns.
There might be still some issues and the non-modular networking architecture is currently broken, but this will be fixed soon.

Location:

uspace/app/netecho

Files:

• Makefile (moved) (moved from uspace/srv/net/socket/Makefile ) (1 diff)
• netecho.c (moved) (moved from uspace/srv/net/app/echo/echo.c ) (2 diffs)
• parse.c (moved) (moved from uspace/srv/net/app/parse.c ) (1 diff)
• parse.h (moved) (moved from uspace/srv/net/app/parse.h ) (8 diffs)
• print_error.c (moved) (moved from uspace/srv/net/app/print_error.c ) (1 diff)
• print_error.h (moved) (moved from uspace/srv/net/app/print_error.h ) (3 diffs)

uspace/app/netecho/Makefile

@@ -28 +28 @@
 #
 
-NET_BASE = ..
-USPACE_PREFIX = ../../..
-LIBRARY = libsocket
+USPACE_PREFIX = ../..
+LIBS = $(LIBSOCKET_PREFIX)/libsocket.a
+EXTRA_CFLAGS = -I$(LIBSOCKET_PREFIX)/include
+BINARY = netecho
 
 SOURCES = \
-        socket_client.c \
-        $(NET_BASE)/inet.c \
-        $(NET_BASE)/modules.c \
-        $(NET_BASE)/structures/dynamic_fifo.c
+        netecho.c \
+        parse.c \
+        print_error.c
 
 include $(USPACE_PREFIX)/Makefile.common

uspace/app/netecho/netecho.c

@@ -27 +27 @@
  */
 
-/** @addtogroup echo
+/** @addtogroup netecho
  *  @{
  */
 
 /** @file
- *  Echo application.
+ *  Network echo application.
  *  Answers received packets.
  */
@@ -41 +41 @@
 #include <task.h>
 
-#include "../../include/in.h"
-#include "../../include/in6.h"
-#include "../../include/inet.h"
-#include "../../include/socket.h"
-
-#include "../../err.h"
-
-#include "../parse.h"
-#include "../print_error.h"
-
-/** Echo module name.
- */
-#define NAME    "Echo"
+#include <in.h>
+#include <in6.h>
+#include <inet.h>
+#include <socket.h>
+#include <net_err.h>
+
+#include "parse.h"
+#include "print_error.h"
+
+/** Network echo module name.
+ */
+#define NAME    "Network Echo"
 
 /** Prints the application help.

uspace/app/netecho/parse.c

@@ -38 +38 @@
 #include <str.h>
 
-#include "../include/socket.h"
-
-#include "../err.h"
+#include <socket.h>
+#include <net_err.h>
 
 #include "parse.h"

uspace/app/netecho/parse.h

@@ -38 +38 @@
 #define __NET_APP_PARSE__
 
-#include "../include/socket.h"
+#include <socket.h>
 
 /** Translates the character string to the address family number.
@@ -45 +45 @@
  *  @returns EAFNOSUPPORTED if the address family is not supported.
  */
-int parse_address_family(const char * name);
+extern int parse_address_family(const char * name);
 
 /** Parses the next parameter as an integral number.
@@ -60 +60 @@
  *  @returns EINVAL if the parameter is in wrong format.
  */
-int parse_parameter_int(int argc, char ** argv, int * index, int * value, const char * name, int offset);
+extern int parse_parameter_int(int argc, char ** argv, int * index, int * value, const char * name, int offset);
 
 /** Parses the next named parameter as an integral number.
@@ -78 +78 @@
  *  @returns ENOENT if the parameter name has not been found.
  */
-int parse_parameter_name_int(int argc, char ** argv, int * index, int * value, const char * name, int offset, int (*parse_value)(const char * value));
+extern int parse_parameter_name_int(int argc, char ** argv, int * index, int * value, const char * name, int offset, int (*parse_value)(const char * value));
 
 /** Parses the next parameter as a character string.
@@ -93 +93 @@
  *  @returns EINVAL if the parameter is missing.
  */
-int parse_parameter_string(int argc, char ** argv, int * index, char ** value, const char * name, int offset);
+extern int parse_parameter_string(int argc, char ** argv, int * index, char ** value, const char * name, int offset);
 
 /** Translates the character string to the protocol family number.
@@ -100 +100 @@
  *  @returns EPFNOSUPPORTED if the protocol family is not supported.
  */
-int parse_protocol_family(const char * name);
+extern int parse_protocol_family(const char * name);
 
 /** Translates the character string to the socket type number.
@@ -107 +107 @@
  *  @returns ESOCKNOSUPPORTED if the socket type is not supported.
  */
-int parse_socket_type(const char * name);
+extern int parse_socket_type(const char * name);
 
 /** Prints the parameter unrecognized message and the application help.
@@ -113 +113 @@
  *  @param[in] parameter The parameter name.
  */
-void print_unrecognized(int index, const char * parameter);
+extern void print_unrecognized(int index, const char * parameter);
 
 #endif

uspace/app/netecho/print_error.c

@@ -37 +37 @@
 #include <stdio.h>
 
-#include "../include/icmp_codes.h"
-#include "../include/socket_errno.h"
+#include <icmp_codes.h>
+#include <socket_errno.h>
 
 #include "print_error.h"

uspace/app/netecho/print_error.h

@@ -56 +56 @@
  *  @param[in] suffix The error description suffix. May be NULL.
  */
-void icmp_print_error(FILE * output, int error_code, const char * prefix, const char * suffix);
+extern void icmp_print_error(FILE * output, int error_code, const char * prefix, const char * suffix);
 
 /** Prints the error description.
@@ -65 +65 @@
  *  @param[in] suffix The error description suffix. May be NULL.
  */
-void print_error(FILE * output, int error_code, const char * prefix, const char * suffix);
+extern void print_error(FILE * output, int error_code, const char * prefix, const char * suffix);
 
 /** Prints the specific socket error description.
@@ -73 +73 @@
  *  @param[in] suffix The error description suffix. May be NULL.
  */
-void socket_print_error(FILE * output, int error_code, const char * prefix, const char * suffix);
+extern void socket_print_error(FILE * output, int error_code, const char * prefix, const char * suffix);
 
 #endif