Changeset 849ed54 in mainline for uspace/app/nettest1

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/nettest1

Files:

• Makefile (moved) (moved from uspace/srv/net/app/nettest1/Makefile ) (1 diff)
• nettest.c (moved) (moved from uspace/srv/net/app/nettest.c ) (1 diff)
• nettest.h (moved) (moved from uspace/srv/net/app/nettest.h ) (8 diffs)
• nettest1.c (moved) (moved from uspace/srv/net/app/nettest1/nettest1.c ) (1 diff)
• parse.c (added)
• parse.h (added)
• print_error.c (added)
• print_error.h (added)

uspace/app/nettest1/Makefile

@@ -28 +28 @@
 #
 
-NET_BASE = ../..
-USPACE_PREFIX = ../../../..
-LIBS = $(NET_BASE)/socket/libsocket.a
+USPACE_PREFIX = ../..
+LIBS = $(LIBSOCKET_PREFIX)/libsocket.a
+EXTRA_CFLAGS = -I$(LIBSOCKET_PREFIX)/include
 BINARY = nettest1
 
 SOURCES = \
         nettest1.c \
-        $(NET_BASE)/app/nettest.c \
-        $(NET_BASE)/app/parse.c \
-        $(NET_BASE)/app/print_error.c
+        nettest.c \
+        parse.c \
+        print_error.c
 
 include $(USPACE_PREFIX)/Makefile.common

uspace/app/nettest1/nettest.c

@@ -37 +37 @@
 #include <stdio.h>
 
-#include "../include/socket.h"
-
-#include "../err.h"
+#include <socket.h>
+#include <net_err.h>
 
 #include "nettest.h"

uspace/app/nettest1/nettest.h

@@ -38 +38 @@
 #define __NET_TEST__
 
-#include "../include/socket.h"
+#include <socket.h>
 
 /** Prints a mark.
@@ -44 +44 @@
  *  @param[in] index The index of the mark to be printed.
  */
-void print_mark(int index);
+extern void print_mark(int index);
 
 /** Creates new sockets.
@@ -55 +55 @@
  *  @returns Other error codes as defined for the socket() function.
  */
-int sockets_create(int verbose, int * socket_ids, int sockets, int family, sock_type_t type);
+extern int sockets_create(int verbose, int * socket_ids, int sockets, int family, sock_type_t type);
 
 /** Closes sockets.
@@ -64 +64 @@
  *  @returns Other error codes as defined for the closesocket() function.
  */
-int sockets_close(int verbose, int * socket_ids, int sockets);
+extern int sockets_close(int verbose, int * socket_ids, int sockets);
 
 /** Connects sockets.
@@ -75 +75 @@
  *  @returns Other error codes as defined for the connect() function.
  */
-int sockets_connect(int verbose, int * socket_ids, int sockets, struct sockaddr * address, socklen_t addrlen);
+extern int sockets_connect(int verbose, int * socket_ids, int sockets, struct sockaddr * address, socklen_t addrlen);
 
 /** Sends data via sockets.
@@ -89 +89 @@
  *  @returns Other error codes as defined for the sendto() function.
  */
-int sockets_sendto(int verbose, int * socket_ids, int sockets, struct sockaddr * address, socklen_t addrlen, char * data, int size, int messages);
+extern int sockets_sendto(int verbose, int * socket_ids, int sockets, struct sockaddr * address, socklen_t addrlen, char * data, int size, int messages);
 
 /** Receives data via sockets.
@@ -103 +103 @@
  *  @returns Other error codes as defined for the recvfrom() function.
  */
-int sockets_recvfrom(int verbose, int * socket_ids, int sockets, struct sockaddr * address, socklen_t * addrlen, char * data, int size, int messages);
+extern int sockets_recvfrom(int verbose, int * socket_ids, int sockets, struct sockaddr * address, socklen_t * addrlen, char * data, int size, int messages);
 
 /** Sends and receives data via sockets.
@@ -119 +119 @@
  *  @returns Other error codes as defined for the recvfrom() function.
  */
-int sockets_sendto_recvfrom(int verbose, int * socket_ids, int sockets, struct sockaddr * address, socklen_t * addrlen, char * data, int size, int messages);
+extern int sockets_sendto_recvfrom(int verbose, int * socket_ids, int sockets, struct sockaddr * address, socklen_t * addrlen, char * data, int size, int messages);
 
 #endif

uspace/app/nettest1/nettest1.c

@@ -41 +41 @@
 #include <time.h>
 
-#include "../../include/in.h"
-#include "../../include/in6.h"
-#include "../../include/inet.h"
-#include "../../include/socket.h"
-
-#include "../../err.h"
-
-#include "../nettest.h"
-#include "../parse.h"
-#include "../print_error.h"
+#include <in.h>
+#include <in6.h>
+#include <inet.h>
+#include <socket.h>
+#include <net_err.h>
+
+#include "nettest.h"
+#include "parse.h"
+#include "print_error.h"
 
 /** Echo module name.