Changeset 76ca3f7 in mainline for uspace/srv/net


Ignore:
Timestamp:
2010-03-23T20:49:54Z (16 years ago)
Author:
Lukas Mejdrech <lukasmejdrech@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
e417b96
Parents:
b48ebd19 (diff), 63f8966 (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 mailnline changes, revision 329

Location:
uspace/srv/net
Files:
2 deleted
36 edited

Legend:

Unmodified
Added
Removed

  • uspace/srv/net/app/echo/Makefile

    rb48ebd19 r76ca3f7  
    11#
    2 # Copyright (c) 2009 Lukas Mejdrech
     2# Copyright (c) 2005 Martin Decky
     3# Copyright (c) 2007 Jakub Jermar
    34# All rights reserved.
    45#
    … …  
    2728#
    2829
    29 NAME = echo
     30NET_BASE = ../..
     31USPACE_PREFIX = ../../../..
     32LIBS = $(NET_BASE)/socket/libsocket.a
     33BINARY = echo
    3034
    31 NET_BASE = ../../
    32 STRUCTURES = $(NET_BASE)structures/
     35SOURCES = \
     36        echo.c \
     37        $(NET_BASE)/app/parse.c \
     38        $(NET_BASE)/app/print_error.c
    3339
    34 include ../../../../../Makefile.config
    35 
    36 ## Sources
    37 #
    38 
    39 OUTPUT = $(NAME)
    40 SOURCES = \
    41         $(NAME).c \
    42         $(NET_BASE)app/parse.c \
    43         $(NET_BASE)app/print_error.c
    44 
    45 LIBS += ../../socket/libsocket.a
    46 
    47 include $(NET_BASE)Makefile.module
     40include $(USPACE_PREFIX)/Makefile.common

  • uspace/srv/net/app/echo/echo.c

    rb48ebd19 r76ca3f7  
    3838#include <malloc.h>
    3939#include <stdio.h>
    40 #include <string.h>
     40#include <str.h>
    4141#include <task.h>
    4242

  • uspace/srv/net/app/nettest1/Makefile

    rb48ebd19 r76ca3f7  
    11#
    2 # Copyright (c) 2009 Lukas Mejdrech
     2# Copyright (c) 2005 Martin Decky
     3# Copyright (c) 2007 Jakub Jermar
    34# All rights reserved.
    45#
    … …  
    2728#
    2829
    29 NAME = nettest1
     30NET_BASE = ../..
     31USPACE_PREFIX = ../../../..
     32LIBS = $(NET_BASE)/socket/libsocket.a
     33BINARY = nettest1
    3034
    31 NET_BASE = ../../
    32 STRUCTURES = $(NET_BASE)structures/
     35SOURCES = \
     36        nettest1.c \
     37        $(NET_BASE)/app/nettest.c \
     38        $(NET_BASE)/app/parse.c \
     39        $(NET_BASE)/app/print_error.c
    3340
    34 include ../../../../../Makefile.config
    35 
    36 ## Sources
    37 #
    38 
    39 OUTPUT = $(NAME)
    40 SOURCES = \
    41         $(NAME).c \
    42         $(NET_BASE)app/nettest.c \
    43         $(NET_BASE)app/parse.c \
    44         $(NET_BASE)app/print_error.c
    45 
    46 LIBS += ../../socket/libsocket.a
    47 
    48 include $(NET_BASE)Makefile.module
     41include $(USPACE_PREFIX)/Makefile.common

  • uspace/srv/net/app/nettest1/nettest1.c

    rb48ebd19 r76ca3f7  
    3737#include <malloc.h>
    3838#include <stdio.h>
    39 #include <string.h>
     39#include <str.h>
    4040#include <task.h>
    4141#include <time.h>

  • uspace/srv/net/app/nettest2/Makefile

    rb48ebd19 r76ca3f7  
    11#
    2 # Copyright (c) 2009 Lukas Mejdrech
     2# Copyright (c) 2005 Martin Decky
     3# Copyright (c) 2007 Jakub Jermar
    34# All rights reserved.
    45#
    … …  
    2728#
    2829
    29 NAME = nettest2
     30NET_BASE = ../..
     31USPACE_PREFIX = ../../../..
     32LIBS = $(NET_BASE)/socket/libsocket.a
     33BINARY = nettest2
    3034
    31 NET_BASE = ../../
    32 STRUCTURES = $(NET_BASE)structures/
     35SOURCES = \
     36        nettest2.c \
     37        $(NET_BASE)/app/nettest.c \
     38        $(NET_BASE)/app/parse.c \
     39        $(NET_BASE)/app/print_error.c
    3340
    34 include ../../../../../Makefile.config
    35 
    36 ## Sources
    37 #
    38 
    39 OUTPUT = $(NAME)
    40 SOURCES = \
    41         $(NAME).c \
    42         $(NET_BASE)app/nettest.c \
    43         $(NET_BASE)app/parse.c \
    44         $(NET_BASE)app/print_error.c
    45 
    46 LIBS += ../../socket/libsocket.a
    47 
    48 include $(NET_BASE)Makefile.module
     41include $(USPACE_PREFIX)/Makefile.common

  • uspace/srv/net/app/nettest2/nettest2.c

    rb48ebd19 r76ca3f7  
    3737#include <malloc.h>
    3838#include <stdio.h>
    39 #include <string.h>
     39#include <str.h>
    4040#include <task.h>
    4141#include <time.h>

  • uspace/srv/net/app/parse.c

    rb48ebd19 r76ca3f7  
    3636
    3737#include <stdio.h>
    38 #include <string.h>
     38#include <str.h>
    3939
    4040#include "../include/socket.h"

  • uspace/srv/net/app/ping/Makefile

    rb48ebd19 r76ca3f7  
    11#
    2 # Copyright (c) 2009 Lukas Mejdrech
     2# Copyright (c) 2005 Martin Decky
     3# Copyright (c) 2007 Jakub Jermar
    34# All rights reserved.
    45#
    … …  
    2728#
    2829
    29 NAME = ping
     30NET_BASE = ../..
     31USPACE_PREFIX = ../../../..
     32LIBS = $(NET_BASE)/socket/libsocket.a
     33BINARY = ping
    3034
    31 NET_BASE = ../../
    32 STRUCTURES = $(NET_BASE)structures/
     35SOURCES = \
     36        ping.c \
     37        $(NET_BASE)/app/parse.c \
     38        $(NET_BASE)/app/print_error.c \
     39        $(NET_BASE)/inet.c \
     40        $(NET_BASE)/modules.c \
     41        $(NET_BASE)/tl/icmp/icmp_api.c \
     42        $(NET_BASE)/tl/icmp/icmp_common.c
    3343
    34 include ../../../../../Makefile.config
    35 
    36 ## Sources
    37 #
    38 
    39 OUTPUT = $(NAME)
    40 SOURCES = \
    41         $(NAME).c \
    42         $(NET_BASE)app/parse.c \
    43         $(NET_BASE)app/print_error.c \
    44         $(NET_BASE)inet.c \
    45         $(NET_BASE)modules.c \
    46         $(NET_BASE)tl/icmp/icmp_api.c \
    47         $(NET_BASE)tl/icmp/icmp_common.c
    48 
    49 include $(NET_BASE)Makefile.module
     44include $(USPACE_PREFIX)/Makefile.common

  • uspace/srv/net/app/ping/ping.c

    rb48ebd19 r76ca3f7  
    3636
    3737#include <stdio.h>
    38 #include <string.h>
     38#include <str.h>
    3939#include <task.h>
    4040#include <time.h>

  • uspace/srv/net/il/arp/Makefile

    rb48ebd19 r76ca3f7  
    11#
    2 # Copyright (c) 2009 Lukas Mejdrech
     2# Copyright (c) 2005 Martin Decky
     3# Copyright (c) 2007 Jakub Jermar
    34# All rights reserved.
    45#
    … …  
    2728#
    2829
    29 NAME = arp
     30NET_BASE = ../..
     31USPACE_PREFIX = ../../../..
     32BINARY = arp
    3033
    31 NET_BASE = ../../
    32 STRUCTURES = $(NET_BASE)structures/
     34SOURCES = \
     35        arp.c \
     36        arp_module.c \
     37        $(NET_BASE)/module.c \
     38        $(NET_BASE)/modules.c \
     39        $(NET_BASE)/net/net_remote.c \
     40        $(NET_BASE)/nil/nil_remote.c \
     41        $(NET_BASE)/structures/char_map.c \
     42        $(NET_BASE)/structures/measured_strings.c \
     43        $(NET_BASE)/structures/packet/packet.c \
     44        $(NET_BASE)/structures/packet/packet_client.c \
     45        $(NET_BASE)/structures/packet/packet_remote.c
    3346
    34 ## Sources
    35 #
    36 
    37 OUTPUT = $(NAME)
    38 SOURCES = \
    39         $(NAME).c \
    40         $(NAME)_module.c \
    41         $(NET_BASE)module.c \
    42         $(NET_BASE)modules.c \
    43         $(NET_BASE)net/net_remote.c \
    44         $(NET_BASE)nil/nil_remote.c \
    45         $(STRUCTURES)char_map.c \
    46         $(STRUCTURES)measured_strings.c \
    47         $(STRUCTURES)packet/packet.c \
    48         $(STRUCTURES)packet/packet_client.c \
    49         $(STRUCTURES)packet/packet_remote.c
    50 
    51 include $(NET_BASE)Makefile.module
     47include $(USPACE_PREFIX)/Makefile.common

  • uspace/srv/net/il/arp/arp.c

    rb48ebd19 r76ca3f7  
    4141#include <fibril_synch.h>
    4242#include <stdio.h>
    43 #include <string.h>
     43#include <str.h>
    4444#include <task.h>
    4545

  • uspace/srv/net/il/ip/Makefile

    rb48ebd19 r76ca3f7  
    11#
    2 # Copyright (c) 2009 Lukas Mejdrech
     2# Copyright (c) 2005 Martin Decky
     3# Copyright (c) 2007 Jakub Jermar
    34# All rights reserved.
    45#
    … …  
    2728#
    2829
    29 NAME = ip
     30NET_BASE = ../..
     31USPACE_PREFIX = ../../../..
     32BINARY = ip
    3033
    31 NET_BASE = ../../
    32 STRUCTURES = $(NET_BASE)structures/
     34SOURCES = \
     35        ip.c \
     36        ip_client.c \
     37        ip_module.c \
     38        $(NET_BASE)/checksum.c \
     39        $(NET_BASE)/inet.c \
     40        $(NET_BASE)/module.c \
     41        $(NET_BASE)/modules.c \
     42        $(NET_BASE)/il/arp/arp_remote.c \
     43        $(NET_BASE)/nil/nil_remote.c \
     44        $(NET_BASE)/net/net_remote.c \
     45        $(NET_BASE)/tl/icmp/icmp_client.c \
     46        $(NET_BASE)/tl/icmp/icmp_common.c \
     47        $(NET_BASE)/tl/icmp/icmp_remote.c \
     48        $(NET_BASE)/structures/char_map.c \
     49        $(NET_BASE)/structures/measured_strings.c \
     50        $(NET_BASE)/structures/module_map.c \
     51        $(NET_BASE)/structures/packet/packet.c \
     52        $(NET_BASE)/structures/packet/packet_client.c \
     53        $(NET_BASE)/structures/packet/packet_remote.c
    3354
    34 ## Sources
    35 #
    36 
    37 OUTPUT = $(NAME)
    38 SOURCES = \
    39         $(NAME).c \
    40         $(NAME)_client.c \
    41         $(NAME)_module.c \
    42         $(NET_BASE)checksum.c \
    43         $(NET_BASE)inet.c \
    44         $(NET_BASE)module.c \
    45         $(NET_BASE)modules.c \
    46         $(NET_BASE)il/arp/arp_remote.c \
    47         $(NET_BASE)nil/nil_remote.c \
    48         $(NET_BASE)net/net_remote.c \
    49         $(NET_BASE)tl/icmp/icmp_client.c \
    50         $(NET_BASE)tl/icmp/icmp_common.c \
    51         $(NET_BASE)tl/icmp/icmp_remote.c \
    52         $(STRUCTURES)char_map.c \
    53         $(STRUCTURES)measured_strings.c \
    54         $(STRUCTURES)module_map.c \
    55         $(STRUCTURES)packet/packet.c \
    56         $(STRUCTURES)packet/packet_client.c \
    57         $(STRUCTURES)packet/packet_remote.c
    58 
    59 include $(NET_BASE)Makefile.module
     55include $(USPACE_PREFIX)/Makefile.common

  • uspace/srv/net/il/ip/ip.c

    rb48ebd19 r76ca3f7  
    4040#include <fibril_synch.h>
    4141#include <stdio.h>
    42 #include <string.h>
     42#include <str.h>
    4343
    4444#include <ipc/ipc.h>
    … …  
    895895        ip_pseudo_header_ref header;
    896896        size_t headerlen;
     897        device_id_t device_id;
    897898
    898899        *answer_count = 0;
    … …  
    921922                case NET_IP_GET_ROUTE:
    922923                        ERROR_PROPAGATE(data_receive((void **) &addr, &addrlen));
    923                         ERROR_PROPAGATE(ip_get_route_req(0, IP_GET_PROTOCOL(call), addr, (socklen_t) addrlen, IPC_SET_DEVICE(answer), &header, &headerlen));
     924                        ERROR_PROPAGATE(ip_get_route_req(0, IP_GET_PROTOCOL(call), addr, (socklen_t) addrlen,
     925                            &device_id, &header, &headerlen));
     926                        *IPC_SET_DEVICE(answer) = device_id;
    924927                        *IP_SET_HEADERLEN(answer) = headerlen;
    925928                        *answer_count = 2;

  • uspace/srv/net/il/ip/ip_messages.h

    rb48ebd19 r76ca3f7  
    8282 *  @param[out] answer The message answer structure.
    8383 */
    84 #define IP_SET_HEADERLEN(answer)        ((size_t *) &IPC_GET_ARG2(*answer))
     84#define IP_SET_HEADERLEN(answer)        (&IPC_GET_ARG2(*answer))
    8585
    8686/** Returns the network mask message parameter.

  • uspace/srv/net/inet.c

    rb48ebd19 r76ca3f7  
    3838#include <mem.h>
    3939#include <stdio.h>
    40 #include <string.h>
     40#include <str.h>
    4141
    4242#include "include/in.h"

  • uspace/srv/net/messages.h

    rb48ebd19 r76ca3f7  
    391391 *  @param[out] answer The message answer structure.
    392392 */
    393 #define IPC_SET_DEVICE(answer)  ((device_id_t *) &IPC_GET_ARG1(*answer))
     393#define IPC_SET_DEVICE(answer)  (&IPC_GET_ARG1(*answer))
    394394
    395395/** Sets the minimum address length in the message answer.
    396396 *  @param[out] answer The message answer structure.
    397397 */
    398 #define IPC_SET_ADDR(answer)            ((size_t *) &IPC_GET_ARG1(*answer))
     398#define IPC_SET_ADDR(answer)            (&IPC_GET_ARG1(*answer))
    399399
    400400/*@}*/
    … …  
    407407 *  @param[out] answer The message answer structure.
    408408 */
    409 #define IPC_SET_PREFIX(answer)  ((size_t *) &IPC_GET_ARG2(*answer))
     409#define IPC_SET_PREFIX(answer)  (&IPC_GET_ARG2(*answer))
    410410
    411411/*@}*/
    … …  
    418418 *  @param[out] answer The message answer structure.
    419419 */
    420 #define IPC_SET_CONTENT(answer) ((size_t *) &IPC_GET_ARG3(*answer))
     420#define IPC_SET_CONTENT(answer) (&IPC_GET_ARG3(*answer))
    421421
    422422/*@}*/
    … …  
    429429 *  @param[out] answer The message answer structure.
    430430 */
    431 #define IPC_SET_SUFFIX(answer)  ((size_t *) &IPC_GET_ARG4(*answer))
     431#define IPC_SET_SUFFIX(answer)  (&IPC_GET_ARG4(*answer))
    432432
    433433/*@}*/

  • uspace/srv/net/net/Makefile

    rb48ebd19 r76ca3f7  
    11#
    2 # Copyright (c) 2009 Lukas Mejdrech
     2# Copyright (c) 2005 Martin Decky
     3# Copyright (c) 2007 Jakub Jermar
    34# All rights reserved.
    45#
    … …  
    2728#
    2829
    29 NAME = net
     30NET_BASE = ..
     31USPACE_PREFIX = ../../..
     32ROOT_PATH = $(USPACE_PREFIX)/..
    3033
    31 NET_BASE = ../
    32 STRUCTURES = $(NET_BASE)structures/
     34COMMON_MAKEFILE = $(ROOT_PATH)/Makefile.common
     35CONFIG_MAKEFILE = $(ROOT_PATH)/Makefile.config
    3336
    34 include $(NET_BASE)../../../Makefile.config
     37BINARY = net
    3538
    36 ## Sources
    37 #
     39-include $(COMMON_MAKEFILE)
     40-include $(CONFIG_MAKEFILE)
    3841
    39 OUTPUT = $(NAME)
    4042SOURCES = \
    41         $(NAME).c \
    42         $(NET_BASE)module.c \
    43         $(NET_BASE)modules.c \
    44         $(NET_BASE)netif/netif_remote.c \
    45         $(STRUCTURES)char_map.c \
    46         $(STRUCTURES)measured_strings.c \
    47         $(STRUCTURES)module_map.c \
    48         $(STRUCTURES)packet/packet.c \
    49         $(STRUCTURES)packet/packet_client.c \
    50         $(STRUCTURES)packet/packet_server.c
     43        net.c \
     44        $(NET_BASE)/module.c \
     45        $(NET_BASE)/modules.c \
     46        $(NET_BASE)/netif/netif_remote.c \
     47        $(NET_BASE)/structures/char_map.c \
     48        $(NET_BASE)/structures/measured_strings.c \
     49        $(NET_BASE)/structures/module_map.c \
     50        $(NET_BASE)/structures/packet/packet.c \
     51        $(NET_BASE)/structures/packet/packet_client.c \
     52        $(NET_BASE)/structures/packet/packet_server.c
    5153
    52 ifeq ($(NETWORKING), module)
    53 
    54         SOURCES +=      $(NAME)_bundle.c \
    55                                 $(NET_BASE)checksum.c \
    56                                 $(NET_BASE)inet.c \
    57                                 $(NET_BASE)il/arp/arp.c \
    58                                 $(NET_BASE)il/ip/ip.c \
    59                                 $(NET_BASE)il/ip/ip_client.c \
    60                                 $(NET_BASE)socket/socket_core.c \
    61                                 $(NET_BASE)tl/icmp/icmp.c \
    62                                 $(NET_BASE)tl/icmp/icmp_client.c \
    63                                 $(NET_BASE)tl/tcp/tcp.c \
    64                                 $(NET_BASE)tl/tl_common.c \
    65                                 $(NET_BASE)tl/udp/udp.c \
    66                                 $(STRUCTURES)dynamic_fifo.c
    67 
    68 else
    69 
    70         SOURCES +=      $(NAME)_standalone.c \
    71                                 $(NET_BASE)il/ip/ip_remote.c
    72 
     54ifeq ($(CONFIG_NETWORKING),module)
     55        SOURCES += \
     56                net_bundle.c \
     57                $(NET_BASE)/checksum.c \
     58                $(NET_BASE)/inet.c \
     59                $(NET_BASE)/il/arp/arp.c \
     60                $(NET_BASE)/il/ip/ip.c \
     61                $(NET_BASE)/il/ip/ip_client.c \
     62                $(NET_BASE)/socket/socket_core.c \
     63                $(NET_BASE)/tl/icmp/icmp.c \
     64                $(NET_BASE)/tl/icmp/icmp_client.c \
     65                $(NET_BASE)/tl/tcp/tcp.c \
     66                $(NET_BASE)/tl/tl_common.c \
     67                $(NET_BASE)/tl/udp/udp.c \
     68                $(NET_BASE)/structures/dynamic_fifo.c
    7369endif
    7470
    75 include $(NET_BASE)Makefile.module
     71ifeq ($(CONFIG_NETWORKING),modular)
     72        SOURCES += \
     73                net_standalone.c \
     74                $(NET_BASE)/il/ip/ip_remote.c
     75endif
     76
     77include $(USPACE_PREFIX)/Makefile.common

  • uspace/srv/net/net/net.c

    rb48ebd19 r76ca3f7  
    4141#include <malloc.h>
    4242#include <stdio.h>
    43 #include <string.h>
     43#include <str.h>
    4444
    4545#include <ipc/ipc.h>

  • uspace/srv/net/net/net_bundle.c

    rb48ebd19 r76ca3f7  
    3636 */
    3737
    38 #include <string.h>
     38#include <str.h>
    3939
    4040#include <ipc/ipc.h>

  • uspace/srv/net/net/net_standalone.c

    rb48ebd19 r76ca3f7  
    3535 */
    3636
    37 #include <string.h>
     37#include <str.h>
    3838
    3939#include <ipc/ipc.h>

  • uspace/srv/net/net/start/Makefile

    rb48ebd19 r76ca3f7  
    11#
    2 # Copyright (c) 2009 Lukas Mejdrech
     2# Copyright (c) 2005 Martin Decky
     3# Copyright (c) 2007 Jakub Jermar
    34# All rights reserved.
    45#
    … …  
    2728#
    2829
    29 NAME = netstart
     30NET_BASE = ../..
     31USPACE_PREFIX = ../../../..
     32BINARY = netstart
    3033
    31 NET_BASE = ../../
    32 STRUCTURES = $(NET_BASE)structures/
     34SOURCES = \
     35        netstart.c \
     36        $(NET_BASE)/checksum.c \
     37        $(NET_BASE)/modules.c \
     38        $(NET_BASE)/self_test.c \
     39        $(NET_BASE)/structures/char_map.c \
     40        $(NET_BASE)/structures/dynamic_fifo.c \
     41        $(NET_BASE)/structures/measured_strings.c
    3342
    34 include ../../../../../Makefile.config
    35 
    36 ## Sources
    37 #
    38 
    39 OUTPUT = $(NAME)
    40 SOURCES = \
    41         $(NAME).c \
    42         $(NET_BASE)checksum.c \
    43         $(NET_BASE)modules.c \
    44         $(NET_BASE)self_test.c \
    45         $(STRUCTURES)char_map.c \
    46         $(STRUCTURES)dynamic_fifo.c \
    47         $(STRUCTURES)measured_strings.c
    48 
    49 include $(NET_BASE)Makefile.module
     43include $(USPACE_PREFIX)/Makefile.common

  • uspace/srv/net/netif/dp8390/Makefile

    rb48ebd19 r76ca3f7  
    11#
    2 # Copyright (c) 2009 Lukas Mejdrech
     2# Copyright (c) 2005 Martin Decky
     3# Copyright (c) 2007 Jakub Jermar
    34# All rights reserved.
    45#
    … …  
    2728#
    2829
    29 NAME = dp8390
     30NET_BASE = ../..
     31USPACE_PREFIX = ../../../..
     32ROOT_PATH = $(USPACE_PREFIX)/..
    3033
    31 NET_BASE = ../../
    32 STRUCTURES = $(NET_BASE)structures/
     34COMMON_MAKEFILE = $(ROOT_PATH)/Makefile.common
     35CONFIG_MAKEFILE = $(ROOT_PATH)/Makefile.config
    3336
    34 include $(NET_BASE)../../../Makefile.config
     37BINARY = dp8390
    3538
    36 ## Sources
    37 #
     39-include $(COMMON_MAKEFILE)
     40-include $(CONFIG_MAKEFILE)
    3841
    39 OUTPUT = $(NAME)
    4042SOURCES = \
    41         $(NAME).c \
    42         $(NAME)_module.c \
     43        dp8390.c \
     44        dp8390_module.c \
    4345        ne2000.c \
    44         $(NET_BASE)module.c \
    45         $(NET_BASE)modules.c \
    46         $(NET_BASE)netif/netif.c \
    47         $(STRUCTURES)measured_strings.c \
    48         $(STRUCTURES)packet/packet.c \
    49         $(STRUCTURES)packet/packet_client.c \
    50         $(STRUCTURES)packet/packet_remote.c
     46        $(NET_BASE)/module.c \
     47        $(NET_BASE)/modules.c \
     48        $(NET_BASE)/netif/netif.c \
     49        $(NET_BASE)/structures/measured_strings.c \
     50        $(NET_BASE)/structures/packet/packet.c \
     51        $(NET_BASE)/structures/packet/packet_client.c \
     52        $(NET_BASE)/structures/packet/packet_remote.c
    5153
    52 ifeq ($(NETWORKING), module)
    53 
    54         SOURCES +=      $(NET_BASE)checksum.c \
    55                                 $(NET_BASE)nil/eth/eth.c \
    56                                 $(NET_BASE)net/net_remote.c \
    57                                 $(NET_BASE)netif/netif_nil_bundle.c
    58 
    59 else
    60 
    61         SOURCES +=      $(NET_BASE)nil/nil_remote.c \
    62                                 $(NET_BASE)netif/netif_standalone.c
    63 
     54ifeq ($(CONFIG_NETWORKING),module)
     55        SOURCES += \
     56                $(NET_BASE)/checksum.c \
     57                $(NET_BASE)/nil/eth/eth.c \
     58                $(NET_BASE)/net/net_remote.c \
     59                $(NET_BASE)/netif/netif_nil_bundle.c
    6460endif
    6561
    66 include $(NET_BASE)Makefile.module
     62ifeq ($(CONFIG_NETWORKING),modular)
     63        SOURCES += \
     64                $(NET_BASE)/nil/nil_remote.c \
     65                $(NET_BASE)/netif/netif_standalone.c
     66endif
     67
     68include $(USPACE_PREFIX)/Makefile.common

  • uspace/srv/net/netif/lo/Makefile

    rb48ebd19 r76ca3f7  
    11#
    2 # Copyright (c) 2009 Lukas Mejdrech
     2# Copyright (c) 2005 Martin Decky
     3# Copyright (c) 2007 Jakub Jermar
    34# All rights reserved.
    45#
    … …  
    2728#
    2829
    29 NAME = lo
     30NET_BASE = ../..
     31USPACE_PREFIX = ../../../..
     32ROOT_PATH = $(USPACE_PREFIX)/..
    3033
    31 NET_BASE = ../../
    32 STRUCTURES = $(NET_BASE)structures/
     34COMMON_MAKEFILE = $(ROOT_PATH)/Makefile.common
     35CONFIG_MAKEFILE = $(ROOT_PATH)/Makefile.config
    3336
    34 include $(NET_BASE)../../../Makefile.config
     37BINARY = lo
    3538
    36 ## Sources
    37 #
     39-include $(COMMON_MAKEFILE)
     40-include $(CONFIG_MAKEFILE)
    3841
    39 OUTPUT = $(NAME)
    4042SOURCES = \
    41         $(NAME).c \
    42         $(NET_BASE)module.c \
    43         $(NET_BASE)modules.c \
    44         $(NET_BASE)net/net_remote.c \
    45         $(NET_BASE)netif/netif.c \
    46         $(STRUCTURES)measured_strings.c \
    47         $(STRUCTURES)packet/packet.c \
    48         $(STRUCTURES)packet/packet_client.c \
    49         $(STRUCTURES)packet/packet_remote.c
     43        lo.c \
     44        $(NET_BASE)/module.c \
     45        $(NET_BASE)/modules.c \
     46        $(NET_BASE)/net/net_remote.c \
     47        $(NET_BASE)/netif/netif.c \
     48        $(NET_BASE)/structures/measured_strings.c \
     49        $(NET_BASE)/structures/packet/packet.c \
     50        $(NET_BASE)/structures/packet/packet_client.c \
     51        $(NET_BASE)/structures/packet/packet_remote.c
    5052
    51 ifeq ($(NETWORKING), module)
    52 
    53         SOURCES +=      $(NET_BASE)nil/nildummy/nildummy.c \
    54                                 $(NET_BASE)netif/netif_nil_bundle.c
    55 
    56 else
    57 
    58         SOURCES +=      $(NET_BASE)nil/nil_remote.c \
    59                                 $(NET_BASE)netif/netif_standalone.c
    60 
     53ifeq ($(CONFIG_NETWORKING),module)
     54        SOURCES += \
     55                $(NET_BASE)/nil/nildummy/nildummy.c \
     56                $(NET_BASE)/netif/netif_nil_bundle.c
    6157endif
    6258
    63 include $(NET_BASE)Makefile.module
     59ifeq ($(CONFIG_NETWORKING),modular)
     60        SOURCES += \
     61                $(NET_BASE)/nil/nil_remote.c \
     62                $(NET_BASE)/netif/netif_standalone.c
     63endif
     64
     65include $(USPACE_PREFIX)/Makefile.common

  • uspace/srv/net/netif/lo/lo.c

    rb48ebd19 r76ca3f7  
    3838#include <errno.h>
    3939#include <stdio.h>
    40 #include <string.h>
     40#include <str.h>
    4141
    4242#include <ipc/ipc.h>

  • uspace/srv/net/nil/eth/Makefile

    rb48ebd19 r76ca3f7  
    11#
    2 # Copyright (c) 2009 Lukas Mejdrech
     2# Copyright (c) 2005 Martin Decky
     3# Copyright (c) 2007 Jakub Jermar
    34# All rights reserved.
    45#
    … …  
    2728#
    2829
    29 NAME = eth
     30NET_BASE = ../..
     31USPACE_PREFIX = ../../../..
     32BINARY = eth
    3033
    31 NET_BASE = ../../
    32 STRUCTURES = $(NET_BASE)structures/
     34SOURCES = \
     35        eth.c \
     36        eth_module.c \
     37        $(NET_BASE)/checksum.c \
     38        $(NET_BASE)/module.c \
     39        $(NET_BASE)/modules.c \
     40        $(NET_BASE)/net/net_remote.c \
     41        $(NET_BASE)/netif/netif_remote.c \
     42        $(NET_BASE)/structures/measured_strings.c \
     43        $(NET_BASE)/structures/packet/packet.c \
     44        $(NET_BASE)/structures/packet/packet_client.c \
     45        $(NET_BASE)/structures/packet/packet_remote.c
    3346
    34 OUTPUT = $(NAME)
    35 SOURCES = \
    36         $(NAME).c \
    37         $(NAME)_module.c \
    38         $(NET_BASE)checksum.c \
    39         $(NET_BASE)module.c \
    40         $(NET_BASE)modules.c \
    41         $(NET_BASE)net/net_remote.c \
    42         $(NET_BASE)netif/netif_remote.c \
    43         $(STRUCTURES)measured_strings.c \
    44         $(STRUCTURES)packet/packet.c \
    45         $(STRUCTURES)packet/packet_client.c \
    46         $(STRUCTURES)packet/packet_remote.c
    47 
    48 include $(NET_BASE)Makefile.module
     47include $(USPACE_PREFIX)/Makefile.common

  • uspace/srv/net/nil/eth/eth.c

    rb48ebd19 r76ca3f7  
    4040#include <mem.h>
    4141#include <stdio.h>
    42 #include <string.h>
     42#include <str.h>
    4343
    4444#include <ipc/ipc.h>

  • uspace/srv/net/nil/nildummy/Makefile

    rb48ebd19 r76ca3f7  
    11#
    2 # Copyright (c) 2009 Lukas Mejdrech
     2# Copyright (c) 2005 Martin Decky
     3# Copyright (c) 2007 Jakub Jermar
    34# All rights reserved.
    45#
    … …  
    2728#
    2829
    29 NAME = nildummy
     30NET_BASE = ../..
     31USPACE_PREFIX = ../../../..
     32BINARY = nildummy
    3033
    31 NET_BASE = ../../
    32 STRUCTURES = $(NET_BASE)structures/
     34SOURCES = \
     35        nildummy.c \
     36        nildummy_module.c \
     37        $(NET_BASE)/module.c \
     38        $(NET_BASE)/modules.c \
     39        $(NET_BASE)/net/net_remote.c \
     40        $(NET_BASE)/netif/netif_remote.c \
     41        $(NET_BASE)/structures/measured_strings.c \
     42        $(NET_BASE)/structures/packet/packet.c \
     43        $(NET_BASE)/structures/packet/packet_client.c \
     44        $(NET_BASE)/structures/packet/packet_remote.c
    3345
    34 OUTPUT = $(NAME)
    35 SOURCES = \
    36         $(NAME).c \
    37         $(NAME)_module.c \
    38         $(NET_BASE)module.c \
    39         $(NET_BASE)modules.c \
    40         $(NET_BASE)net/net_remote.c \
    41         $(NET_BASE)netif/netif_remote.c \
    42         $(STRUCTURES)measured_strings.c \
    43         $(STRUCTURES)packet/packet.c \
    44         $(STRUCTURES)packet/packet_client.c \
    45         $(STRUCTURES)packet/packet_remote.c
    46 
    47 include $(NET_BASE)Makefile.module
     46include $(USPACE_PREFIX)/Makefile.common

  • uspace/srv/net/nil/nildummy/nildummy.c

    rb48ebd19 r76ca3f7  
    4040#include <mem.h>
    4141#include <stdio.h>
    42 #include <string.h>
     42#include <str.h>
    4343
    4444#include <ipc/ipc.h>

  • uspace/srv/net/socket/Makefile

    rb48ebd19 r76ca3f7  
    11#
    2 # Copyright (c) 2009 Lukas Mejdrech
     2# Copyright (c) 2005 Martin Decky
     3# Copyright (c) 2007 Jakub Jermar
    34# All rights reserved.
    45#
    … …  
    2728#
    2829
    29 NAME = socket
     30NET_BASE = ..
     31USPACE_PREFIX = ../../..
     32LIBRARY = libsocket
    3033
    31 NET_BASE = ../
    32 STRUCTURES = $(NET_BASE)structures/
     34SOURCES = \
     35        socket_client.c \
     36        $(NET_BASE)/inet.c \
     37        $(NET_BASE)/modules.c \
     38        $(NET_BASE)/structures/dynamic_fifo.c
    3339
    34 ## Sources
    35 #
    36 
    37 LIB = lib$(NAME).a
    38 SOURCES = \
    39         $(NAME)_client.c \
    40         $(NET_BASE)inet.c \
    41         $(NET_BASE)modules.c \
    42         $(STRUCTURES)dynamic_fifo.c
    43 
    44 include $(NET_BASE)Makefile.module
     40include $(USPACE_PREFIX)/Makefile.common

  • uspace/srv/net/socket/socket_messages.h

    rb48ebd19 r76ca3f7  
    115115 *  @param[out] answer The message answer structure.
    116116 */
    117 #define SOCKET_SET_SOCKET_ID(answer)                    (int *) &IPC_GET_ARG1(answer)
     117#define SOCKET_SET_SOCKET_ID(answer)            &IPC_GET_ARG1(answer)
    118118
    119119/** Returns the socket identifier message parameter.
    120120 *  @param[in] call The message call structure.
    121121 */
    122 #define SOCKET_GET_SOCKET_ID(call)                      (int) IPC_GET_ARG1(call)
     122#define SOCKET_GET_SOCKET_ID(call)              (int) IPC_GET_ARG1(call)
    123123
    124124/** Sets the read data length in the message answer.
    125125 *  @param[out] answer The message answer structure.
    126126 */
    127 #define SOCKET_SET_READ_DATA_LENGTH(answer)     (int *) &IPC_GET_ARG1(answer)
     127#define SOCKET_SET_READ_DATA_LENGTH(answer)     &IPC_GET_ARG1(answer)
    128128
    129129/** Returns the read data length message parameter.
    130130 *  @param[in] call The message call structure.
    131131 */
    132 #define SOCKET_GET_READ_DATA_LENGTH(call)               (int) IPC_GET_ARG1(call)
     132#define SOCKET_GET_READ_DATA_LENGTH(call)       (int) IPC_GET_ARG1(call)
    133133
    134134/** Returns the backlog message parameter.
    135135 *  @param[in] call The message call structure.
    136136 */
    137 #define SOCKET_GET_BACKLOG(call)                                (int) IPC_GET_ARG2(call)
     137#define SOCKET_GET_BACKLOG(call)                (int) IPC_GET_ARG2(call)
    138138
    139139/** Returns the option level message parameter.
    140140 *  @param[in] call The message call structure.
    141141 */
    142 #define SOCKET_GET_OPT_LEVEL(call)                      (int) IPC_GET_ARG2(call)
     142#define SOCKET_GET_OPT_LEVEL(call)              (int) IPC_GET_ARG2(call)
    143143
    144144/** Returns the data fragment size message parameter.
    … …  
    150150 *  @param[out] answer The message answer structure.
    151151 */
    152 #define SOCKET_SET_DATA_FRAGMENT_SIZE(answer)   (size_t *) &IPC_GET_ARG2(answer)
     152#define SOCKET_SET_DATA_FRAGMENT_SIZE(answer)   &IPC_GET_ARG2(answer)
    153153
    154154/** Sets the address length in the message answer.
    155155 *  @param[out] answer The message answer structure.
    156156 */
    157 #define SOCKET_SET_ADDRESS_LENGTH(answer)               (socklen_t *) &IPC_GET_ARG3(answer)
     157#define SOCKET_SET_ADDRESS_LENGTH(answer)       &IPC_GET_ARG3(answer)
    158158
    159159/** Returns the address length message parameter.
    … …  
    165165 *  @param[out] answer The message answer structure.
    166166 */
    167 #define SOCKET_SET_HEADER_SIZE(answer)          (int *) &IPC_GET_ARG3(answer)
     167#define SOCKET_SET_HEADER_SIZE(answer)          &IPC_GET_ARG3(answer)
    168168
    169169/** Returns the header size message parameter.
    170170 *  @param[in] call The message call structure.
    171171 */
    172 #define SOCKET_GET_HEADER_SIZE(call)                    (int) IPC_GET_ARG3(call)
     172#define SOCKET_GET_HEADER_SIZE(call)            (size_t) IPC_GET_ARG3(call)
    173173
    174174/** Returns the flags message parameter.
    175175 *  @param[in] call The message call structure.
    176176 */
    177 #define SOCKET_GET_FLAGS(call)                          (int) IPC_GET_ARG4(call)
     177#define SOCKET_GET_FLAGS(call)                  (int) IPC_GET_ARG4(call)
    178178
    179179/** Returns the option name message parameter.
    180180 *  @param[in] call The message call structure.
    181181 */
    182 #define SOCKET_GET_OPT_NAME(call)                               (int) IPC_GET_ARG4(call)
     182#define SOCKET_GET_OPT_NAME(call)               (int) IPC_GET_ARG4(call)
    183183
    184184/** Returns the data fragments message parameter.

  • uspace/srv/net/tl/icmp/Makefile

    rb48ebd19 r76ca3f7  
    11#
    2 # Copyright (c) 2009 Lukas Mejdrech
     2# Copyright (c) 2005 Martin Decky
     3# Copyright (c) 2007 Jakub Jermar
    34# All rights reserved.
    45#
    … …  
    2728#
    2829
    29 NAME = icmp
     30NET_BASE = ../..
     31USPACE_PREFIX = ../../../..
     32BINARY = icmp
    3033
    31 NET_BASE = ../../
    32 STRUCTURES = $(NET_BASE)structures/
     34SOURCES = \
     35        icmp.c \
     36        icmp_module.c \
     37        icmp_client.c \
     38        $(NET_BASE)/checksum.c \
     39        $(NET_BASE)/module.c \
     40        $(NET_BASE)/modules.c \
     41        $(NET_BASE)/il/ip/ip_client.c \
     42        $(NET_BASE)/il/ip/ip_remote.c \
     43        $(NET_BASE)/net/net_remote.c \
     44        $(NET_BASE)/structures/measured_strings.c \
     45        $(NET_BASE)/structures/packet/packet.c \
     46        $(NET_BASE)/structures/packet/packet_client.c \
     47        $(NET_BASE)/structures/packet/packet_remote.c
    3348
    34 ## Sources
    35 #
    36 
    37 OUTPUT = $(NAME)
    38 SOURCES = \
    39         $(NAME).c \
    40         $(NAME)_module.c \
    41         $(NAME)_client.c \
    42         $(NET_BASE)checksum.c \
    43         $(NET_BASE)module.c \
    44         $(NET_BASE)modules.c \
    45         $(NET_BASE)il/ip/ip_client.c \
    46         $(NET_BASE)il/ip/ip_remote.c \
    47         $(NET_BASE)net/net_remote.c \
    48         $(STRUCTURES)measured_strings.c \
    49         $(STRUCTURES)packet/packet.c \
    50         $(STRUCTURES)packet/packet_client.c \
    51         $(STRUCTURES)packet/packet_remote.c
    52 
    53 include $(NET_BASE)Makefile.module
     49include $(USPACE_PREFIX)/Makefile.common

  • uspace/srv/net/tl/icmp/icmp.c

    rb48ebd19 r76ca3f7  
    4141#include <fibril_synch.h>
    4242#include <stdint.h>
    43 #include <string.h>
     43#include <str.h>
    4444
    4545#include <ipc/ipc.h>

  • uspace/srv/net/tl/tcp/Makefile

    rb48ebd19 r76ca3f7  
    11#
    2 # Copyright (c) 2009 Lukas Mejdrech
     2# Copyright (c) 2005 Martin Decky
     3# Copyright (c) 2007 Jakub Jermar
    34# All rights reserved.
    45#
    … …  
    2728#
    2829
    29 NAME = tcp
     30NET_BASE = ../..
     31USPACE_PREFIX = ../../../..
     32BINARY = tcp
    3033
    31 NET_BASE = ../../
    32 STRUCTURES = $(NET_BASE)structures/
     34SOURCES = \
     35        tcp.c \
     36        tcp_module.c \
     37        $(NET_BASE)/checksum.c \
     38        $(NET_BASE)/module.c \
     39        $(NET_BASE)/modules.c \
     40        $(NET_BASE)/il/ip/ip_client.c \
     41        $(NET_BASE)/il/ip/ip_remote.c \
     42        $(NET_BASE)/net/net_remote.c \
     43        $(NET_BASE)/socket/socket_core.c \
     44        $(NET_BASE)/tl/icmp/icmp_client.c \
     45        $(NET_BASE)/tl/icmp/icmp_common.c \
     46        $(NET_BASE)/tl/icmp/icmp_remote.c \
     47        $(NET_BASE)/tl/tl_common.c \
     48        $(NET_BASE)/structures/char_map.c \
     49        $(NET_BASE)/structures/dynamic_fifo.c \
     50        $(NET_BASE)/structures/measured_strings.c \
     51        $(NET_BASE)/structures/packet/packet.c \
     52        $(NET_BASE)/structures/packet/packet_client.c \
     53        $(NET_BASE)/structures/packet/packet_remote.c
    3354
    34 ## Sources
    35 #
    36 
    37 OUTPUT = $(NAME)
    38 SOURCES = \
    39         $(NAME).c \
    40         $(NAME)_module.c \
    41         $(NET_BASE)checksum.c \
    42         $(NET_BASE)module.c \
    43         $(NET_BASE)modules.c \
    44         $(NET_BASE)il/ip/ip_client.c \
    45         $(NET_BASE)il/ip/ip_remote.c \
    46         $(NET_BASE)net/net_remote.c \
    47         $(NET_BASE)socket/socket_core.c \
    48         $(NET_BASE)tl/icmp/icmp_client.c \
    49         $(NET_BASE)tl/icmp/icmp_common.c \
    50         $(NET_BASE)tl/icmp/icmp_remote.c \
    51         $(NET_BASE)tl/tl_common.c \
    52         $(STRUCTURES)char_map.c \
    53         $(STRUCTURES)dynamic_fifo.c \
    54         $(STRUCTURES)measured_strings.c \
    55         $(STRUCTURES)packet/packet.c \
    56         $(STRUCTURES)packet/packet_client.c \
    57         $(STRUCTURES)packet/packet_remote.c
    58 
    59 include $(NET_BASE)Makefile.module
     55include $(USPACE_PREFIX)/Makefile.common

  • uspace/srv/net/tl/tcp/tcp.c

    rb48ebd19 r76ca3f7  
    10601060        int app_phone = IPC_GET_PHONE(&call);
    10611061        struct sockaddr * addr;
     1062        int socket_id;
    10621063        size_t addrlen;
    10631064        fibril_rwlock_t lock;
    … …  
    11041105                                        socket_data->local_sockets = &local_sockets;
    11051106                                        fibril_rwlock_write_lock(&lock);
    1106                                         *SOCKET_SET_SOCKET_ID(answer) = SOCKET_GET_SOCKET_ID(call);
    1107                                         res = socket_create(&local_sockets, app_phone, socket_data, SOCKET_SET_SOCKET_ID(answer));
     1107                                        socket_id = SOCKET_GET_SOCKET_ID(call);
     1108                                        res = socket_create(&local_sockets, app_phone, socket_data, &socket_id);
     1109                                        *SOCKET_SET_SOCKET_ID(answer) = socket_id;
    11081110                                        fibril_rwlock_write_unlock(&lock);
    11091111                                        if(res == EOK){

  • uspace/srv/net/tl/udp/Makefile

    rb48ebd19 r76ca3f7  
    11#
    2 # Copyright (c) 2009 Lukas Mejdrech
     2# Copyright (c) 2005 Martin Decky
     3# Copyright (c) 2007 Jakub Jermar
    34# All rights reserved.
    45#
    … …  
    2728#
    2829
    29 NAME = udp
     30NET_BASE = ../..
     31USPACE_PREFIX = ../../../..
     32BINARY = udp
    3033
    31 NET_BASE = ../../
    32 STRUCTURES = $(NET_BASE)structures/
     34SOURCES = \
     35        udp.c \
     36        udp_module.c \
     37        $(NET_BASE)/checksum.c \
     38        $(NET_BASE)/module.c \
     39        $(NET_BASE)/modules.c \
     40        $(NET_BASE)/il/ip/ip_client.c \
     41        $(NET_BASE)/il/ip/ip_remote.c \
     42        $(NET_BASE)/net/net_remote.c \
     43        $(NET_BASE)/socket/socket_core.c \
     44        $(NET_BASE)/tl/icmp/icmp_client.c \
     45        $(NET_BASE)/tl/icmp/icmp_common.c \
     46        $(NET_BASE)/tl/icmp/icmp_remote.c \
     47        $(NET_BASE)/tl/tl_common.c \
     48        $(NET_BASE)/structures/char_map.c \
     49        $(NET_BASE)/structures/dynamic_fifo.c \
     50        $(NET_BASE)/structures/measured_strings.c \
     51        $(NET_BASE)/structures/packet/packet.c \
     52        $(NET_BASE)/structures/packet/packet_client.c \
     53        $(NET_BASE)/structures/packet/packet_remote.c
    3354
    34 ## Sources
    35 #
    36 
    37 OUTPUT = $(NAME)
    38 SOURCES = \
    39         $(NAME).c \
    40         $(NAME)_module.c \
    41         $(NET_BASE)checksum.c \
    42         $(NET_BASE)module.c \
    43         $(NET_BASE)modules.c \
    44         $(NET_BASE)il/ip/ip_client.c \
    45         $(NET_BASE)il/ip/ip_remote.c \
    46         $(NET_BASE)net/net_remote.c \
    47         $(NET_BASE)socket/socket_core.c \
    48         $(NET_BASE)tl/icmp/icmp_client.c \
    49         $(NET_BASE)tl/icmp/icmp_common.c \
    50         $(NET_BASE)tl/icmp/icmp_remote.c \
    51         $(NET_BASE)tl/tl_common.c \
    52         $(STRUCTURES)char_map.c \
    53         $(STRUCTURES)dynamic_fifo.c \
    54         $(STRUCTURES)measured_strings.c \
    55         $(STRUCTURES)packet/packet.c \
    56         $(STRUCTURES)packet/packet_client.c \
    57         $(STRUCTURES)packet/packet_remote.c
    58 
    59 include $(NET_BASE)Makefile.module
     55include $(USPACE_PREFIX)/Makefile.common

  • uspace/srv/net/tl/udp/udp.c

    rb48ebd19 r76ca3f7  
    417417        int app_phone = IPC_GET_PHONE(&call);
    418418        struct sockaddr * addr;
     419        int socket_id;
    419420        size_t addrlen;
    420421        ipc_call_t answer;
    … …  
    451452                                break;
    452453                        case NET_SOCKET:
    453                                 *SOCKET_SET_SOCKET_ID(answer) = SOCKET_GET_SOCKET_ID(call);
    454                                 res = socket_create(&local_sockets, app_phone, NULL, SOCKET_SET_SOCKET_ID(answer));
     454                                socket_id = SOCKET_GET_SOCKET_ID(call);
     455                                res = socket_create(&local_sockets, app_phone, NULL, &socket_id);
     456                                *SOCKET_SET_SOCKET_ID(answer) = socket_id;
     457                               
    455458                                if(res == EOK){
    456459                                        if(tl_get_ip_packet_dimension(udp_globals.ip_phone, &udp_globals.dimensions, DEVICE_INVALID_ID, &packet_dimension) == EOK){
Note: See TracChangeset for help on using the changeset viewer.