Changes in / [ef689ef0:10056483] in mainline


Ignore:
Location:
uspace
Files:
8 added
9 deleted
59 edited

Legend:

Unmodified
Added
Removed

  • uspace/Makefile

    ref689ef0 r10056483  
    134134        lib/softint \
    135135        lib/softfloat \
    136         lib/packet \
     136        lib/socket \
    137137        lib/net
    138138

  • uspace/Makefile.common

    ref689ef0 r10056483  
    8888LIBPCI_PREFIX = $(LIB_PREFIX)/pci
    8989
    90 LIBPACKET_PREFIX = $(LIB_PREFIX)/packet
     90LIBSOCKET_PREFIX = $(LIB_PREFIX)/socket
    9191LIBNET_PREFIX = $(LIB_PREFIX)/net
    9292

  • uspace/app/netecho/Makefile

    ref689ef0 r10056483  
    2929
    3030USPACE_PREFIX = ../..
    31 LIBS =
    32 EXTRA_CFLAGS =
     31LIBS = $(LIBSOCKET_PREFIX)/libsocket.a
     32EXTRA_CFLAGS = -I$(LIBSOCKET_PREFIX)/include
    3333BINARY = netecho
    3434

  • uspace/app/nettest1/Makefile

    ref689ef0 r10056483  
    2929
    3030USPACE_PREFIX = ../..
    31 LIBS =
    32 EXTRA_CFLAGS =
     31LIBS = $(LIBSOCKET_PREFIX)/libsocket.a
     32EXTRA_CFLAGS = -I$(LIBSOCKET_PREFIX)/include
    3333BINARY = nettest1
    3434

  • uspace/app/nettest2/Makefile

    ref689ef0 r10056483  
    2929
    3030USPACE_PREFIX = ../..
    31 LIBS =
    32 EXTRA_CFLAGS =
     31LIBS = $(LIBSOCKET_PREFIX)/libsocket.a
     32EXTRA_CFLAGS = -I$(LIBSOCKET_PREFIX)/include
    3333BINARY = nettest2
    3434

  • uspace/app/ping/Makefile

    ref689ef0 r10056483  
    2929
    3030USPACE_PREFIX = ../..
    31 LIBS =
    32 EXTRA_CFLAGS =
     31LIBS = $(LIBSOCKET_PREFIX)/libsocket.a
     32EXTRA_CFLAGS = -I$(LIBSOCKET_PREFIX)/include
    3333BINARY = ping
    3434

  • uspace/lib/c/include/ipc/net.h

    ref689ef0 r10056483  
    4141#include <ipc/services.h>
    4242
    43 #include <net/device.h>
    44 #include <net/packet.h>
    45 
    4643/** Returns a value indicating whether the value is in the interval.
    4744 * @param[in] item      The value to be checked.
    … …  
    178175#define NET_PACKET_FIRST        (NET_SOCKET_LAST + 0)
    179176
    180 /** The last packet management system message. */
     177/** The last packet management system message.
     178 */
    181179#define NET_PACKET_LAST         (NET_PACKET_FIRST + NET_PACKET_COUNT)
    182180
    … …  
    188186
    189187/** Returns a value indicating whether the IPC call is a generic networking
    190  * message.
     188 *  message.
    191189 * @param[in] call The IPC call to be checked.
    192190 */
    … …  
    272270/*@}*/
    273271
    274 /** @name Networking specific message arguments definitions */
    275 /*@{*/
    276 
    277 /** Returns the device identifier message argument.
    278  * @param[in] call The message call structure.
    279  */
    280 #define IPC_GET_DEVICE(call) \
    281         ({ \
    282                 device_id_t device_id = (device_id_t) IPC_GET_ARG1(*call); \
    283                 device_id; \
    284         })
    285 
    286 /** Returns the packet identifier message argument.
    287  * @param[in] call The message call structure.
    288  */
    289 #define IPC_GET_PACKET(call) \
    290         ({ \
    291                 packet_id_t packet_id = (packet_id_t) IPC_GET_ARG2(*call); \
    292                 packet_id; \
    293         })
    294 
    295 /** Returns the count message argument.
    296  * @param[in] call The message call structure.
    297  */
    298 #define IPC_GET_COUNT(call) \
    299         ({ \
    300                 size_t size = (size_t) IPC_GET_ARG2(*call); \
    301                 size; \
    302         })
    303 
    304 /** Returns the device state message argument.
    305  * @param[in] call The message call structure.
    306  */
    307 #define IPC_GET_STATE(call) \
    308         ({ \
    309                 device_state_t state = (device_state_t) IPC_GET_ARG2(*call); \
    310                 state; \
    311         })
    312 
    313 /** Returns the maximum transmission unit message argument.
    314  * @param[in] call The message call structure.
    315  */
    316 #define IPC_GET_MTU(call) \
    317         ({ \
    318                 size_t size = (size_t) IPC_GET_ARG2(*call); \
    319                 size; \
    320         })
    321 
    322 /** Returns the device driver service message argument.
    323  * @param[in] call The message call structure.
    324  */
    325 #define IPC_GET_SERVICE(call) \
    326         ({ \
    327                 services_t service = (services_t) IPC_GET_ARG3(*call); \
    328                 service; \
    329         })
    330 
    331 /** Returns the target service message argument.
    332  * @param[in] call The message call structure.
    333  */
    334 #define IPC_GET_TARGET(call) \
    335         ({ \
    336                 services_t service = (services_t) IPC_GET_ARG3(*call); \
    337                 service; \
    338         })
    339 
    340 /** Returns the sender service message argument.
    341  * @param[in] call The message call structure.
    342  */
    343 #define IPC_GET_SENDER(call) \
    344         ({ \
    345                 services_t service = (services_t) IPC_GET_ARG3(*call); \
    346                 service; \
    347         })
    348 
    349 /** Returns the error service message argument.
    350  * @param[in] call The message call structure.
    351  */
    352 #define IPC_GET_ERROR(call) \
    353         ({ \
    354                 services_t service = (services_t) IPC_GET_ARG4(*call); \
    355                 service; \
    356         })
    357 
    358 /** Returns the phone message argument.
    359  * @param[in] call The message call structure.
    360  */
    361 #define IPC_GET_PHONE(call) \
    362         ({ \
    363                 int phone = (int) IPC_GET_ARG5(*call); \
    364                 phone; \
    365         })
    366 
    367 /** Sets the device identifier in the message answer.
    368  * @param[out] answer The message answer structure.
    369  */
    370 #define IPC_SET_DEVICE(answer, value) \
    371         do { \
    372                 ipcarg_t argument = (ipcarg_t) (value); \
    373                 IPC_SET_ARG1(*answer, argument); \
    374         } while (0)
    375 
    376 /** Sets the minimum address length in the message answer.
    377  * @param[out] answer The message answer structure.
    378  */
    379 #define IPC_SET_ADDR(answer, value) \
    380         do { \
    381                 ipcarg_t argument = (ipcarg_t) (value); \
    382                 IPC_SET_ARG1(*answer, argument); \
    383         } while (0)
    384 
    385 /** Sets the minimum prefix size in the message answer.
    386  * @param[out] answer The message answer structure.
    387  */
    388 #define IPC_SET_PREFIX(answer, value) \
    389         do { \
    390                 ipcarg_t argument = (ipcarg_t) (value); \
    391                 IPC_SET_ARG2(*answer, argument); \
    392         } while (0)
    393 
    394 /** Sets the maximum content size in the message answer.
    395  * @param[out] answer The message answer structure.
    396  */
    397 #define IPC_SET_CONTENT(answer, value) \
    398         do { \
    399                 ipcarg_t argument = (ipcarg_t) (value); \
    400                 IPC_SET_ARG3(*answer, argument); \
    401         } while (0)
    402 
    403 /** Sets the minimum suffix size in the message answer.
    404  * @param[out] answer The message answer structure.
    405  */
    406 #define IPC_SET_SUFFIX(answer, value) \
    407         do { \
    408                 ipcarg_t argument = (ipcarg_t) (value); \
    409                 IPC_SET_ARG4(*answer, argument); \
    410         } while (0)
    411 
    412 /*@}*/
    413 
    414272#endif
    415273

  • uspace/lib/net/Makefile

    ref689ef0 r10056483  
    2929
    3030USPACE_PREFIX = ../..
    31 EXTRA_CFLAGS = -Iinclude
     31EXTRA_CFLAGS = -Iinclude -I$(LIBSOCKET_PREFIX)/include
    3232LIBRARY = libnet
    3333
    3434SOURCES = \
    35         generic/generic.c \
    3635        generic/net_remote.c \
    3736        generic/net_checksum.c \

  • uspace/lib/net/generic/net_remote.c

    ref689ef0 r10056483  
    4040#include <malloc.h>
    4141
    42 #include <generic.h>
     42#include <net_messages.h>
    4343#include <net/modules.h>
    44 #include <net/device.h>
     44#include <net_device.h>
    4545#include <net_interface.h>
    4646#include <adt/measured_strings.h>

  • uspace/lib/net/generic/packet_client.c

    ref689ef0 r10056483  
    4343#include <packet_client.h>
    4444
     45#include <net_messages.h>
    4546#include <net/packet.h>
    4647#include <net/packet_header.h>

  • uspace/lib/net/generic/packet_remote.c

    ref689ef0 r10056483  
    4343#include <sys/mman.h>
    4444
     45#include <net_messages.h>
    4546#include <packet_client.h>
    4647#include <packet_remote.h>

  • uspace/lib/net/il/arp_remote.c

    ref689ef0 r10056483  
    3636 */
    3737
    38 #include <arp_interface.h>
    39 #include <arp_messages.h>
    40 #include <generic.h>
    41 
    4238#include <async.h>
    4339#include <errno.h>
    … …  
    4541#include <ipc/services.h>
    4642
     43#include <net_messages.h>
    4744#include <net/modules.h>
    48 #include <net/device.h>
     45#include <net_device.h>
     46#include <arp_interface.h>
    4947#include <adt/measured_strings.h>
     48#include <arp_messages.h>
    5049
    5150int arp_connect_module(services_t service){

  • uspace/lib/net/il/ip_remote.c

    ref689ef0 r10056483  
    4040 */
    4141
     42#include <ipc/services.h>
     43
     44#include <net_messages.h>
     45#include <net/modules.h>
     46#include <net_device.h>
     47#include <net/inet.h>
     48#include <ip_interface.h>
     49#include <packet_client.h>
     50#include <il_messages.h>
     51#include <ip_messages.h>
    4252#include <ip_remote.h>
    43 #include <ip_interface.h>
    44 #include <ip_messages.h>
    45 #include <il_messages.h>
    46 #include <packet_client.h>
    47 #include <generic.h>
    48 
    49 #include <ipc/services.h>
    50 
    51 #include <net/modules.h>
    52 #include <net/device.h>
    53 #include <net/inet.h>
    5453
    5554/** Add a route to the device routing table.

  • uspace/lib/net/include/arp_interface.h

    ref689ef0 r10056483  
    3535
    3636#include <adt/measured_strings.h>
    37 #include <task.h>
    38 
    39 #include <ipc/services.h>
    40 
    41 #include <net/device.h>
    42 #include <net/socket.h>
     37#include <net_device.h>
    4338
    4439/** @name ARP module interface

  • uspace/lib/net/include/icmp_interface.h

    ref689ef0 r10056483  
    3737#include <sys/types.h>
    3838
    39 #include <net/device.h>
     39#include <net_device.h>
    4040#include <adt/measured_strings.h>
    4141#include <net/packet.h>

  • uspace/lib/net/include/il_interface.h

    ref689ef0 r10056483  
    3939#define __NET_IL_INTERFACE_H__
    4040
    41 #include <generic.h>
     41#include <async.h>
    4242
    4343#include <ipc/services.h>
    4444
    45 #include <net/device.h>
     45#include <net_messages.h>
     46#include <net_device.h>
    4647#include <net/packet.h>
     48#include <packet_client.h>
    4749#include <il_messages.h>
    48 
    49 #include <packet_client.h>
    5050
    5151/** @name Internetwork layer module interface

  • uspace/lib/net/include/ip_interface.h

    ref689ef0 r10056483  
    3838#include <ipc/services.h>
    3939
    40 #include <net/device.h>
     40#include <net_device.h>
    4141#include <net/packet.h>
    4242

  • uspace/lib/net/include/ip_remote.h

    ref689ef0 r10056483  
    3434#define __NET_IP_REMOTE_H__
    3535
     36#include <async.h>
    3637#include <ipc/services.h>
    3738
    … …  
    3940#include <net/inet.h>
    4041#include <net/in.h>
    41 #include <net/packet.h>
    42 #include <net/device.h>
    43 #include <net/socket.h>
    4442
    4543extern int ip_set_gateway_req_remote(int, device_id_t, in_addr_t);

  • uspace/lib/net/include/net_interface.h

    ref689ef0 r10056483  
    3636#include <ipc/services.h>
    3737
    38 #include <net/device.h>
     38#include <net_device.h>
    3939#include <adt/measured_strings.h>
    4040

  • uspace/lib/net/include/netif_local.h

    ref689ef0 r10056483  
    4646
    4747#include <adt/measured_strings.h>
    48 #include <net/device.h>
     48#include <net_device.h>
    4949#include <net/packet.h>
    5050

  • uspace/lib/net/include/netif_remote.h

    ref689ef0 r10056483  
    3434#define __NET_NETIF_REMOTE_H__
    3535
    36 #include <ipc/services.h>
    37 #include <adt/measured_strings.h>
    38 #include <net/device.h>
     36#include <async.h>
     37#include <fibril_synch.h>
     38#include <ipc/ipc.h>
    3939
    4040extern int netif_get_addr_req_remote(int, device_id_t, measured_string_ref *,

  • uspace/lib/net/include/nil_interface.h

    ref689ef0 r10056483  
    3939#include <ipc/ipc.h>
    4040
    41 #include <generic.h>
     41#include <net_messages.h>
     42#include <adt/measured_strings.h>
     43#include <net/packet.h>
    4244#include <nil_messages.h>
    43 #include <nil_remote.h>
     45#include <net_device.h>
    4446
    4547#define nil_bind_service(service, device_id, me, receiver) \
    … …  
    6567            netif_service)
    6668
     69
     70#include <nil_remote.h>
     71#include <packet/packet_server.h>
     72
    6773#define nil_device_state_msg  nil_device_state_msg_remote
    6874#define nil_received_msg      nil_received_msg_remote

  • uspace/lib/net/include/nil_remote.h

    ref689ef0 r10056483  
    3434#define __NET_NIL_REMOTE_H__
    3535
    36 #include <ipc/services.h>
    37 #include <net/device.h>
    38 #include <net/packet.h>
     36#include <async.h>
     37#include <fibril_synch.h>
     38#include <ipc/ipc.h>
    3939
    4040extern int nil_device_state_msg_remote(int, device_id_t, int);

  • uspace/lib/net/include/socket_core.h

    ref689ef0 r10056483  
    4141
    4242#include <net/in.h>
    43 #include <net/device.h>
     43#include <net_device.h>
    4444#include <adt/generic_char_map.h>
    4545#include <adt/dynamic_fifo.h>

  • uspace/lib/net/include/tl_common.h

    ref689ef0 r10056483  
    4040#include <net/socket_codes.h>
    4141#include <net/packet.h>
    42 #include <net/device.h>
     42#include <net_device.h>
    4343#include <net/inet.h>
    4444

  • uspace/lib/net/include/tl_interface.h

    ref689ef0 r10056483  
    4141#include <ipc/services.h>
    4242
    43 #include <generic.h>
    44 #include <net/device.h>
     43#include <net_messages.h>
     44#include <net_device.h>
    4545#include <net/packet.h>
    4646#include <packet_client.h>

  • uspace/lib/net/netif/netif_local.c

    ref689ef0 r10056483  
    4444#include <err.h>
    4545
    46 #include <generic.h>
     46#include <net_messages.h>
    4747#include <net/modules.h>
    4848#include <net/packet.h>
    4949#include <packet_client.h>
     50#include <packet/packet_server.h>
    5051#include <packet_remote.h>
    5152#include <adt/measured_strings.h>
    52 #include <net/device.h>
     53#include <net_device.h>
    5354#include <nil_interface.h>
    5455#include <netif_local.h>

  • uspace/lib/net/netif/netif_remote.c

    ref689ef0 r10056483  
    4141#include <net/packet.h>
    4242#include <packet_client.h>
    43 #include <net/device.h>
     43#include <net_device.h>
    4444#include <netif_remote.h>
    4545#include <netif_messages.h>
    46 #include <generic.h>
     46#include <net_messages.h>
    4747
    4848int netif_get_addr_req_remote(int netif_phone, device_id_t device_id,

  • uspace/lib/net/nil/nil_remote.c

    ref689ef0 r10056483  
    3636 */
    3737
    38 #include <nil_remote.h>
     38#include <net_messages.h>
     39#include <net_device.h>
    3940#include <nil_interface.h>
    40 #include <nil_messages.h>
    41 #include <generic.h>
    42 #include <net/device.h>
    4341#include <net/packet.h>
    4442#include <packet_client.h>
     43#include <nil_messages.h>
     44#include <nil_remote.h>
    4545
    4646/** Notify the network interface layer about the device state change.

  • uspace/lib/net/tl/icmp_remote.c

    ref689ef0 r10056483  
    4343#include <sys/types.h>
    4444
     45#include <net_messages.h>
    4546#include <net/modules.h>
    4647#include <icmp_interface.h>

  • uspace/lib/net/tl/tl_common.c

    ref689ef0 r10056483  
    4848#include <packet_client.h>
    4949#include <packet_remote.h>
    50 #include <net/device.h>
     50#include <net_device.h>
    5151#include <icmp_interface.h>
    5252#include <ip_remote.h>

  • uspace/srv/hw/netif/dp8390/Makefile

    ref689ef0 r10056483  
    3030USPACE_PREFIX = ../../../..
    3131ROOT_PATH = $(USPACE_PREFIX)/..
    32 LIBS = $(LIBNET_PREFIX)/libnet.a
    33 EXTRA_CFLAGS = -I$(LIBNET_PREFIX)/include
     32LIBS = $(LIBNET_PREFIX)/libnet.a $(LIBSOCKET_PREFIX)/libsocket.a
     33EXTRA_CFLAGS = -I$(LIBNET_PREFIX)/include -I$(LIBSOCKET_PREFIX)/include
    3434
    3535COMMON_MAKEFILE = $(ROOT_PATH)/Makefile.common

  • uspace/srv/hw/netif/dp8390/dp8390_module.c

    ref689ef0 r10056483  
    4444#include <ipc/services.h>
    4545
     46#include <net_messages.h>
    4647#include <net/modules.h>
    4748#include <packet_client.h>
    4849#include <adt/measured_strings.h>
    49 #include <net/device.h>
     50#include <net_device.h>
    5051#include <nil_interface.h>
    5152#include <netif_interface.h>

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

    ref689ef0 r10056483  
    2929
    3030USPACE_PREFIX = ../../../..
    31 LIBS = $(LIBNET_PREFIX)/libnet.a
    32 EXTRA_CFLAGS = -I$(LIBNET_PREFIX)/include
     31LIBS = $(LIBNET_PREFIX)/libnet.a $(LIBSOCKET_PREFIX)/libsocket.a
     32EXTRA_CFLAGS = -I$(LIBNET_PREFIX)/include -I$(LIBSOCKET_PREFIX)/include
    3333BINARY = arp
    3434

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

    ref689ef0 r10056483  
    4545#include <ipc/ipc.h>
    4646#include <ipc/services.h>
    47 #include <ipc/net.h>
    4847#include <byteorder.h>
    4948#include <err.h>
    5049
     50#include <net_messages.h>
    5151#include <net/modules.h>
    52 #include <net/device.h>
     52#include <net_device.h>
    5353#include <arp_interface.h>
    5454#include <nil_interface.h>

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

    ref689ef0 r10056483  
    4343#include <ipc/services.h>
    4444
    45 #include <net/device.h>
     45#include <net_device.h>
    4646#include <net_hardware.h>
    4747#include <adt/generic_char_map.h>

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

    ref689ef0 r10056483  
    2929
    3030USPACE_PREFIX = ../../../..
    31 LIBS = $(LIBNET_PREFIX)/libnet.a
    32 EXTRA_CFLAGS = -I$(LIBNET_PREFIX)/include
     31LIBS = $(LIBNET_PREFIX)/libnet.a $(LIBSOCKET_PREFIX)/libsocket.a
     32EXTRA_CFLAGS = -I$(LIBNET_PREFIX)/include -I$(LIBSOCKET_PREFIX)/include
    3333BINARY = ip
    3434

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

    ref689ef0 r10056483  
    4444#include <ipc/ipc.h>
    4545#include <ipc/services.h>
    46 #include <ipc/net.h>
    4746#include <sys/types.h>
    4847#include <byteorder.h>
    … …  
    5352#include <net/inet.h>
    5453#include <net/modules.h>
    55 #include <net/device.h>
    56 #include <net/packet.h>
    57 #include <net/icmp_codes.h>
    58 
     54
     55#include <net_messages.h>
    5956#include <arp_interface.h>
    6057#include <net_checksum.h>
     58#include <net_device.h>
    6159#include <icmp_client.h>
     60#include <net/icmp_codes.h>
    6261#include <icmp_interface.h>
    6362#include <il_interface.h>

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

    ref689ef0 r10056483  
    4242#include <ipc/services.h>
    4343
    44 #include <net/device.h>
     44#include <net_device.h>
    4545#include <net/inet.h>
    4646#include <ip_interface.h>

  • uspace/srv/net/net/Makefile

    ref689ef0 r10056483  
    3030USPACE_PREFIX = ../../..
    3131ROOT_PATH = $(USPACE_PREFIX)/..
    32 LIBS = $(LIBNET_PREFIX)/libnet.a $(LIBPACKET_PREFIX)/libpacket.a
    33 EXTRA_CFLAGS = -I$(LIBNET_PREFIX)/include -I$(LIBPACKET_PREFIX)/include
     32LIBS = $(LIBNET_PREFIX)/libnet.a $(LIBSOCKET_PREFIX)/libsocket.a
     33EXTRA_CFLAGS = -I$(LIBNET_PREFIX)/include -I$(LIBSOCKET_PREFIX)/include
    3434
    3535COMMON_MAKEFILE = $(ROOT_PATH)/Makefile.common

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

    ref689ef0 r10056483  
    4646
    4747#include <ipc/ipc.h>
    48 #include <ipc/net.h>
    4948#include <ipc/services.h>
    5049
     50#include <net_messages.h>
    5151#include <net/modules.h>
    5252#include <adt/char_map.h>
    … …  
    5757#include <il_messages.h>
    5858#include <netif_remote.h>
    59 #include <net/device.h>
     59#include <net_device.h>
    6060#include <nil_interface.h>
    6161#include <net_interface.h>

  • uspace/srv/net/net/net.h

    ref689ef0 r10056483  
    4141#include <ipc/ipc.h>
    4242
    43 #include <net/device.h>
     43#include <net_device.h>
    4444#include <adt/char_map.h>
    4545#include <adt/generic_char_map.h>

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

    ref689ef0 r10056483  
    4343#include <adt/measured_strings.h>
    4444#include <adt/module_map.h>
    45 #include <packet_server.h>
     45#include <packet/packet_server.h>
    4646
    4747#include "net.h"

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

    ref689ef0 r10056483  
    3030USPACE_PREFIX = ../../../..
    3131ROOT_PATH = $(USPACE_PREFIX)/..
    32 LIBS = $(LIBNET_PREFIX)/libnet.a
    33 EXTRA_CFLAGS = -I$(LIBNET_PREFIX)/include
     32LIBS = $(LIBNET_PREFIX)/libnet.a $(LIBSOCKET_PREFIX)/libsocket.a
     33EXTRA_CFLAGS = -I$(LIBNET_PREFIX)/include -I$(LIBSOCKET_PREFIX)/include
    3434
    3535COMMON_MAKEFILE = $(ROOT_PATH)/Makefile.common

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

    ref689ef0 r10056483  
    4444#include <ipc/services.h>
    4545
     46#include <net_messages.h>
    4647#include <net/modules.h>
    4748#include <adt/measured_strings.h>
    4849#include <packet_client.h>
    49 #include <net/device.h>
     50#include <net_device.h>
    5051#include <nil_interface.h>
    5152#include <nil_messages.h>

  • uspace/srv/net/netstart/Makefile

    ref689ef0 r10056483  
    2929
    3030USPACE_PREFIX = ../../..
    31 LIBS = $(LIBNET_PREFIX)/libnet.a
    32 EXTRA_CFLAGS = -I$(LIBNET_PREFIX)/include
     31LIBS = $(LIBNET_PREFIX)/libnet.a $(LIBSOCKET_PREFIX)/libsocket.a
     32EXTRA_CFLAGS = -I$(LIBNET_PREFIX)/include -I$(LIBSOCKET_PREFIX)/include
    3333
    3434BINARY = netstart

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

    ref689ef0 r10056483  
    3030USPACE_PREFIX = ../../../..
    3131ROOT_PATH = $(USPACE_PREFIX)/..
    32 LIBS = $(LIBNET_PREFIX)/libnet.a
    33 EXTRA_CFLAGS = -I$(LIBNET_PREFIX)/include
     32LIBS = $(LIBNET_PREFIX)/libnet.a $(LIBSOCKET_PREFIX)/libsocket.a
     33EXTRA_CFLAGS = -I$(LIBNET_PREFIX)/include -I$(LIBSOCKET_PREFIX)/include
    3434
    3535COMMON_MAKEFILE = $(ROOT_PATH)/Makefile.common

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

    ref689ef0 r10056483  
    4545
    4646#include <ipc/ipc.h>
    47 #include <ipc/net.h>
    4847#include <ipc/services.h>
    4948
     49#include <net_messages.h>
    5050#include <net/modules.h>
    5151#include <net_checksum.h>
    … …  
    5353#include <ethernet_protocols.h>
    5454#include <protocol_map.h>
    55 #include <net/device.h>
     55#include <net_device.h>
    5656#include <netif_interface.h>
    5757#include <net_interface.h>

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

    ref689ef0 r10056483  
    4141#include <ipc/services.h>
    4242
    43 #include <net/device.h>
     43#include <net_device.h>
    4444#include <adt/measured_strings.h>
    4545

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

    ref689ef0 r10056483  
    3030USPACE_PREFIX = ../../../..
    3131ROOT_PATH = $(USPACE_PREFIX)/..
    32 LIBS = $(LIBNET_PREFIX)/libnet.a
    33 EXTRA_CFLAGS = -I$(LIBNET_PREFIX)/include
     32LIBS = $(LIBNET_PREFIX)/libnet.a $(LIBSOCKET_PREFIX)/libsocket.a
     33EXTRA_CFLAGS = -I$(LIBNET_PREFIX)/include -I$(LIBSOCKET_PREFIX)/include
    3434
    3535COMMON_MAKEFILE = $(ROOT_PATH)/Makefile.common

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

    ref689ef0 r10056483  
    4343#include <err.h>
    4444#include <ipc/ipc.h>
    45 #include <ipc/net.h>
    4645#include <ipc/services.h>
    4746
     47#include <net_messages.h>
    4848#include <net/modules.h>
    49 #include <net/device.h>
     49#include <net_device.h>
    5050#include <netif_interface.h>
    5151#include <nil_interface.h>

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

    ref689ef0 r10056483  
    4141#include <ipc/services.h>
    4242
    43 #include <net/device.h>
     43#include <net_device.h>
    4444#include <adt/measured_strings.h>
    4545

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

    ref689ef0 r10056483  
    2929
    3030USPACE_PREFIX = ../../../..
    31 LIBS = $(LIBNET_PREFIX)/libnet.a
    32 EXTRA_CFLAGS = -I$(LIBNET_PREFIX)/include
     31LIBS = $(LIBNET_PREFIX)/libnet.a $(LIBSOCKET_PREFIX)/libsocket.a
     32EXTRA_CFLAGS = -I$(LIBNET_PREFIX)/include -I$(LIBSOCKET_PREFIX)/include
    3333BINARY = icmp
    3434

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

    ref689ef0 r10056483  
    4444#include <ipc/ipc.h>
    4545#include <ipc/services.h>
    46 #include <ipc/net.h>
    4746#include <ipc/icmp.h>
    4847#include <sys/time.h>
    … …  
    5655#include <net/inet.h>
    5756
     57#include <net_messages.h>
    5858#include <net/modules.h>
    5959#include <packet_client.h>

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

    ref689ef0 r10056483  
    2929
    3030USPACE_PREFIX = ../../../..
    31 LIBS = $(LIBNET_PREFIX)/libnet.a
    32 EXTRA_CFLAGS = -I$(LIBNET_PREFIX)/include
     31LIBS = $(LIBNET_PREFIX)/libnet.a $(LIBSOCKET_PREFIX)/libsocket.a
     32EXTRA_CFLAGS = -I$(LIBNET_PREFIX)/include -I$(LIBSOCKET_PREFIX)/include
    3333BINARY = tcp
    3434

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

    ref689ef0 r10056483  
    4747#include <ipc/ipc.h>
    4848#include <ipc/services.h>
    49 #include <ipc/net.h>
    5049#include <ipc/socket.h>
    5150
    … …  
    5756#include <net/modules.h>
    5857
     58#include <net_messages.h>
    5959#include <adt/dynamic_fifo.h>
    6060#include <packet_client.h>
    … …  
    6666#include <icmp_interface.h>
    6767#include <net_interface.h>
     68#include <tcp_codes.h>
    6869#include <socket_core.h>
    6970#include <tl_common.h>

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

    ref689ef0 r10056483  
    4141
    4242#include <net/packet.h>
    43 #include <net/device.h>
     43#include <net_device.h>
    4444#include <socket_core.h>
    4545#include <tl_common.h>

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

    ref689ef0 r10056483  
    2929
    3030USPACE_PREFIX = ../../../..
    31 LIBS = $(LIBNET_PREFIX)/libnet.a
    32 EXTRA_CFLAGS = -I$(LIBNET_PREFIX)/include
     31LIBS = $(LIBNET_PREFIX)/libnet.a $(LIBSOCKET_PREFIX)/libsocket.a
     32EXTRA_CFLAGS = -I$(LIBNET_PREFIX)/include -I$(LIBSOCKET_PREFIX)/include
    3333BINARY = udp
    3434

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

    ref689ef0 r10056483  
    4242#include <ipc/ipc.h>
    4343#include <ipc/services.h>
    44 #include <ipc/net.h>
    4544#include <ipc/socket.h>
    4645#include <errno.h>
    … …  
    5453#include <net/modules.h>
    5554
     55#include <net_messages.h>
    5656#include <adt/dynamic_fifo.h>
    5757#include <packet_client.h>
Note: See TracChangeset for help on using the changeset viewer.