Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset ef689ef0 in mainline


Ignore:
Timestamp:
2010-10-14T22:08:50Z (10 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
master
Children:
a7a85d1
Parents:
10056483 (diff), f63a591d (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 from lp:~jakub/helenos/net.

Location:
uspace
Files:
2 added
1 deleted
59 edited
7 moved

Legend:

Unmodified
Added
Removed
  • uspace/Makefile

    r10056483 ref689ef0  
    134134        lib/softint \
    135135        lib/softfloat \
    136         lib/socket \
     136        lib/packet \
    137137        lib/net
    138138
  • uspace/Makefile.common

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

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

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

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

    r10056483 ref689ef0  
    2929
    3030USPACE_PREFIX = ../..
    31 LIBS = $(LIBSOCKET_PREFIX)/libsocket.a
    32 EXTRA_CFLAGS = -I$(LIBSOCKET_PREFIX)/include
     31LIBS =
     32EXTRA_CFLAGS =
    3333BINARY = ping
    3434
  • uspace/lib/c/include/ipc/net.h

    r10056483 ref689ef0  
    4141#include <ipc/services.h>
    4242
     43#include <net/device.h>
     44#include <net/packet.h>
     45
    4346/** Returns a value indicating whether the value is in the interval.
    4447 * @param[in] item      The value to be checked.
     
    175178#define NET_PACKET_FIRST        (NET_SOCKET_LAST + 0)
    176179
    177 /** The last packet management system message.
    178  */
     180/** The last packet management system message. */
    179181#define NET_PACKET_LAST         (NET_PACKET_FIRST + NET_PACKET_COUNT)
    180182
     
    186188
    187189/** Returns a value indicating whether the IPC call is a generic networking
    188  *  message.
     190 * message.
    189191 * @param[in] call The IPC call to be checked.
    190192 */
     
    270272/*@}*/
    271273
     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
    272414#endif
    273415
  • uspace/lib/c/include/net/device.h

    r10056483 ref689ef0  
    2727 */
    2828
    29 /** @addtogroup netif
    30  *  @{
     29/** @addtogroup libc
     30 * @{
    3131 */
    3232
    3333/** @file
    34  *  Device identifier, state and usage statistics.
     34 * Device identifier, state and usage statistics.
    3535 */
    3636
    37 #ifndef __NET_DEVICE_ID_TYPE_H__
    38 #define __NET_DEVICE_ID_TYPE_H__
     37#ifndef LIBC_DEVICE_ID_TYPE_H_
     38#define LIBC_DEVICE_ID_TYPE_H_
    3939
    4040#include <adt/int_map.h>
    4141
    42 /** Device identifier to generic type map declaration.
    43  */
    44 #define DEVICE_MAP_DECLARE              INT_MAP_DECLARE
     42/** Device identifier to generic type map declaration. */
     43#define DEVICE_MAP_DECLARE      INT_MAP_DECLARE
    4544
    46 /** Device identifier to generic type map implementation.
    47  */
     45/** Device identifier to generic type map implementation. */
    4846#define DEVICE_MAP_IMPLEMENT    INT_MAP_IMPLEMENT
    4947
    50 /** Invalid device identifier.
    51  */
    52 #define DEVICE_INVALID_ID               (-1)
     48/** Invalid device identifier. */
     49#define DEVICE_INVALID_ID       (-1)
    5350
    54 /** Device identifier type.
    55  */
    56 typedef int     device_id_t;
     51/** Device identifier type. */
     52typedef int device_id_t;
    5753
    58 /** Device state type.
    59  */
    60 typedef enum device_state       device_state_t;
     54/** Device state type. */
     55typedef enum device_state device_state_t;
    6156
    6257/** Type definition of the device usage statistics.
    63  *  @see device_stats
     58 * @see device_stats
    6459 */
    65 typedef struct device_stats     device_stats_t;
     60typedef struct device_stats device_stats_t;
    6661
    6762/** Type definition of the device usage statistics pointer.
    68  *  @see device_stats
     63 * @see device_stats
    6964 */
    70 typedef device_stats_t *        device_stats_ref;
     65typedef device_stats_t *device_stats_ref;
    7166
    72 /** Device state.
    73  */
    74 enum    device_state{
    75         /** Device not present or not initialized.
    76          */
     67/** Device state. */
     68enum device_state {
     69        /** Device not present or not initialized. */
    7770        NETIF_NULL = 0,
    78         /** Device present and stopped.
    79          */
     71        /** Device present and stopped. */
    8072        NETIF_STOPPED,
    81         /** Device present and active.
    82          */
     73        /** Device present and active. */
    8374        NETIF_ACTIVE,
    84         /** Device present but unable to transmit.
    85          */
     75        /** Device present but unable to transmit. */
    8676        NETIF_CARRIER_LOST
    8777};
    8878
    89 /** Device usage statistics.
    90  */
    91 struct  device_stats{
    92         /** Total packets received.
    93          */
     79/** Device usage statistics. */
     80struct device_stats {
     81        /** Total packets received. */
    9482        unsigned long receive_packets;
    95         /** Total packets transmitted.
    96          */
     83        /** Total packets transmitted. */
    9784        unsigned long send_packets;
    98         /** Total bytes received.
    99          */
     85        /** Total bytes received. */
    10086        unsigned long receive_bytes;
    101         /** Total bytes transmitted.
    102          */
     87        /** Total bytes transmitted. */
    10388        unsigned long send_bytes;
    104         /** Bad packets received counter.
    105          */
     89        /** Bad packets received counter. */
    10690        unsigned long receive_errors;
    107         /** Packet transmition problems counter.
    108          */
     91        /** Packet transmition problems counter. */
    10992        unsigned long send_errors;
    110         /** No space in buffers counter.
    111          */
     93        /** No space in buffers counter. */
    11294        unsigned long receive_dropped;
    113         /** No space available counter.
    114          */
     95        /** No space available counter. */
    11596        unsigned long send_dropped;
    116         /** Total multicast packets received.
    117          */
     97        /** Total multicast packets received. */
    11898        unsigned long multicast;
    119         /** The number of collisions due to congestion on the medium.
    120          */
     99        /** The number of collisions due to congestion on the medium. */
    121100        unsigned long collisions;
    122101
    123         /* detailed receive_errors: */
    124         /** Received packet length error counter.
    125         */
     102        /* detailed receive_errors */
     103
     104        /** Received packet length error counter. */
    126105        unsigned long receive_length_errors;
    127         /** Receiver buffer overflow counter.
    128          */
     106        /** Receiver buffer overflow counter. */
    129107        unsigned long receive_over_errors;
    130         /** Received packet with crc error counter.
    131          */
     108        /** Received packet with crc error counter. */
    132109        unsigned long receive_crc_errors;
    133         /** Received frame alignment error counter.
    134          */
     110        /** Received frame alignment error counter. */
    135111        unsigned long receive_frame_errors;
    136         /** Receiver fifo overrun counter.
    137          */
     112        /** Receiver fifo overrun counter. */
    138113        unsigned long receive_fifo_errors;
    139         /** Receiver missed packet counter.
    140          */
     114        /** Receiver missed packet counter. */
    141115        unsigned long receive_missed_errors;
    142116
    143117        /* detailed send_errors */
    144         /** Transmitter aborted counter.
    145         */
     118
     119        /** Transmitter aborted counter. */
    146120        unsigned long send_aborted_errors;
    147         /** Transmitter carrier errors counter.
    148          */
     121        /** Transmitter carrier errors counter. */
    149122        unsigned long send_carrier_errors;
    150         /** Transmitter fifo overrun counter.
    151          */
     123        /** Transmitter fifo overrun counter. */
    152124        unsigned long send_fifo_errors;
    153         /** Transmitter carrier errors counter.
    154          */
     125        /** Transmitter carrier errors counter. */
    155126        unsigned long send_heartbeat_errors;
    156         /** Transmitter window errors counter.
    157          */
     127        /** Transmitter window errors counter. */
    158128        unsigned long send_window_errors;
    159129
    160130        /* for cslip etc */
    161         /** Total compressed packets received.
    162         */
     131       
     132        /** Total compressed packets received. */
    163133        unsigned long receive_compressed;
    164         /** Total compressed packet transmitted.
    165          */
     134        /** Total compressed packet transmitted. */
    166135        unsigned long send_compressed;
    167136};
     
    171140/** @}
    172141 */
    173 
  • uspace/lib/net/Makefile

    r10056483 ref689ef0  
    2929
    3030USPACE_PREFIX = ../..
    31 EXTRA_CFLAGS = -Iinclude -I$(LIBSOCKET_PREFIX)/include
     31EXTRA_CFLAGS = -Iinclude
    3232LIBRARY = libnet
    3333
    3434SOURCES = \
     35        generic/generic.c \
    3536        generic/net_remote.c \
    3637        generic/net_checksum.c \
  • uspace/lib/net/generic/net_remote.c

    r10056483 ref689ef0  
    4040#include <malloc.h>
    4141
    42 #include <net_messages.h>
     42#include <generic.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

    r10056483 ref689ef0  
    4343#include <packet_client.h>
    4444
    45 #include <net_messages.h>
    4645#include <net/packet.h>
    4746#include <net/packet_header.h>
  • uspace/lib/net/generic/packet_remote.c

    r10056483 ref689ef0  
    4343#include <sys/mman.h>
    4444
    45 #include <net_messages.h>
    4645#include <packet_client.h>
    4746#include <packet_remote.h>
  • uspace/lib/net/il/arp_remote.c

    r10056483 ref689ef0  
    3636 */
    3737
     38#include <arp_interface.h>
     39#include <arp_messages.h>
     40#include <generic.h>
     41
    3842#include <async.h>
    3943#include <errno.h>
     
    4145#include <ipc/services.h>
    4246
    43 #include <net_messages.h>
    4447#include <net/modules.h>
    45 #include <net_device.h>
    46 #include <arp_interface.h>
     48#include <net/device.h>
    4749#include <adt/measured_strings.h>
    48 #include <arp_messages.h>
    4950
    5051int arp_connect_module(services_t service){
  • uspace/lib/net/il/ip_remote.c

    r10056483 ref689ef0  
    4040 */
    4141
     42#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
    4249#include <ipc/services.h>
    4350
    44 #include <net_messages.h>
    4551#include <net/modules.h>
    46 #include <net_device.h>
     52#include <net/device.h>
    4753#include <net/inet.h>
    48 #include <ip_interface.h>
    49 #include <packet_client.h>
    50 #include <il_messages.h>
    51 #include <ip_messages.h>
    52 #include <ip_remote.h>
    5354
    5455/** Add a route to the device routing table.
  • uspace/lib/net/include/arp_interface.h

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

    r10056483 ref689ef0  
    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

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

    r10056483 ref689ef0  
    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

    r10056483 ref689ef0  
    3434#define __NET_IP_REMOTE_H__
    3535
    36 #include <async.h>
    3736#include <ipc/services.h>
    3837
     
    4039#include <net/inet.h>
    4140#include <net/in.h>
     41#include <net/packet.h>
     42#include <net/device.h>
     43#include <net/socket.h>
    4244
    4345extern int ip_set_gateway_req_remote(int, device_id_t, in_addr_t);
  • uspace/lib/net/include/net_interface.h

    r10056483 ref689ef0  
    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

    r10056483 ref689ef0  
    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

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

    r10056483 ref689ef0  
    3939#include <ipc/ipc.h>
    4040
    41 #include <net_messages.h>
    42 #include <adt/measured_strings.h>
    43 #include <net/packet.h>
     41#include <generic.h>
    4442#include <nil_messages.h>
    45 #include <net_device.h>
     43#include <nil_remote.h>
    4644
    4745#define nil_bind_service(service, device_id, me, receiver) \
     
    6765            netif_service)
    6866
    69 
    70 #include <nil_remote.h>
    71 #include <packet/packet_server.h>
    72 
    7367#define nil_device_state_msg  nil_device_state_msg_remote
    7468#define nil_received_msg      nil_received_msg_remote
  • uspace/lib/net/include/nil_remote.h

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

    r10056483 ref689ef0  
    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

    r10056483 ref689ef0  
    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

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

    r10056483 ref689ef0  
    4444#include <err.h>
    4545
    46 #include <net_messages.h>
     46#include <generic.h>
    4747#include <net/modules.h>
    4848#include <net/packet.h>
    4949#include <packet_client.h>
    50 #include <packet/packet_server.h>
    5150#include <packet_remote.h>
    5251#include <adt/measured_strings.h>
    53 #include <net_device.h>
     52#include <net/device.h>
    5453#include <nil_interface.h>
    5554#include <netif_local.h>
  • uspace/lib/net/netif/netif_remote.c

    r10056483 ref689ef0  
    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 <net_messages.h>
     46#include <generic.h>
    4747
    4848int netif_get_addr_req_remote(int netif_phone, device_id_t device_id,
  • uspace/lib/net/nil/nil_remote.c

    r10056483 ref689ef0  
    3636 */
    3737
    38 #include <net_messages.h>
    39 #include <net_device.h>
     38#include <nil_remote.h>
    4039#include <nil_interface.h>
     40#include <nil_messages.h>
     41#include <generic.h>
     42#include <net/device.h>
    4143#include <net/packet.h>
    4244#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

    r10056483 ref689ef0  
    4343#include <sys/types.h>
    4444
    45 #include <net_messages.h>
    4645#include <net/modules.h>
    4746#include <icmp_interface.h>
  • uspace/lib/net/tl/tl_common.c

    r10056483 ref689ef0  
    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/lib/packet/Makefile

    r10056483 ref689ef0  
    3030USPACE_PREFIX = ../..
    3131EXTRA_CFLAGS = -Iinclude
    32 LIBRARY = libsocket
     32LIBRARY = libpacket
    3333
    3434SOURCES = \
    35         packet/packet_server.c
     35        generic/packet_server.c
    3636
    3737include $(USPACE_PREFIX)/Makefile.common
  • uspace/lib/packet/generic/packet_server.c

    r10056483 ref689ef0  
    4646#include <ipc/ipc.h>
    4747#include <ipc/packet.h>
     48#include <ipc/net.h>
     49
    4850#include <net/packet.h>
    4951#include <net/packet_header.h>
    50 #include <packet/packet_server.h>
    51 
    52 #include <net_messages.h>
    53 #include <packet/packet_local.h>
     52
     53#include <packet_server.h>
     54#include <packet_local.h>
    5455
    5556#define FREE_QUEUES_COUNT       7
  • uspace/srv/hw/netif/dp8390/Makefile

    r10056483 ref689ef0  
    3030USPACE_PREFIX = ../../../..
    3131ROOT_PATH = $(USPACE_PREFIX)/..
    32 LIBS = $(LIBNET_PREFIX)/libnet.a $(LIBSOCKET_PREFIX)/libsocket.a
    33 EXTRA_CFLAGS = -I$(LIBNET_PREFIX)/include -I$(LIBSOCKET_PREFIX)/include
     32LIBS = $(LIBNET_PREFIX)/libnet.a
     33EXTRA_CFLAGS = -I$(LIBNET_PREFIX)/include
    3434
    3535COMMON_MAKEFILE = $(ROOT_PATH)/Makefile.common
  • uspace/srv/hw/netif/dp8390/dp8390_module.c

    r10056483 ref689ef0  
    4444#include <ipc/services.h>
    4545
    46 #include <net_messages.h>
    4746#include <net/modules.h>
    4847#include <packet_client.h>
    4948#include <adt/measured_strings.h>
    50 #include <net_device.h>
     49#include <net/device.h>
    5150#include <nil_interface.h>
    5251#include <netif_interface.h>
  • uspace/srv/net/il/arp/Makefile

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

    r10056483 ref689ef0  
    4545#include <ipc/ipc.h>
    4646#include <ipc/services.h>
     47#include <ipc/net.h>
    4748#include <byteorder.h>
    4849#include <err.h>
    4950
    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

    r10056483 ref689ef0  
    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

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

    r10056483 ref689ef0  
    4444#include <ipc/ipc.h>
    4545#include <ipc/services.h>
     46#include <ipc/net.h>
    4647#include <sys/types.h>
    4748#include <byteorder.h>
     
    5253#include <net/inet.h>
    5354#include <net/modules.h>
    54 
    55 #include <net_messages.h>
     55#include <net/device.h>
     56#include <net/packet.h>
     57#include <net/icmp_codes.h>
     58
    5659#include <arp_interface.h>
    5760#include <net_checksum.h>
    58 #include <net_device.h>
    5961#include <icmp_client.h>
    60 #include <net/icmp_codes.h>
    6162#include <icmp_interface.h>
    6263#include <il_interface.h>
  • uspace/srv/net/il/ip/ip.h

    r10056483 ref689ef0  
    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

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

    r10056483 ref689ef0  
    4646
    4747#include <ipc/ipc.h>
     48#include <ipc/net.h>
    4849#include <ipc/services.h>
    4950
    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

    r10056483 ref689ef0  
    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

    r10056483 ref689ef0  
    4343#include <adt/measured_strings.h>
    4444#include <adt/module_map.h>
    45 #include <packet/packet_server.h>
     45#include <packet_server.h>
    4646
    4747#include "net.h"
  • uspace/srv/net/netif/lo/Makefile

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

    r10056483 ref689ef0  
    4444#include <ipc/services.h>
    4545
    46 #include <net_messages.h>
    4746#include <net/modules.h>
    4847#include <adt/measured_strings.h>
    4948#include <packet_client.h>
    50 #include <net_device.h>
     49#include <net/device.h>
    5150#include <nil_interface.h>
    5251#include <nil_messages.h>
  • uspace/srv/net/netstart/Makefile

    r10056483 ref689ef0  
    2929
    3030USPACE_PREFIX = ../../..
    31 LIBS = $(LIBNET_PREFIX)/libnet.a $(LIBSOCKET_PREFIX)/libsocket.a
    32 EXTRA_CFLAGS = -I$(LIBNET_PREFIX)/include -I$(LIBSOCKET_PREFIX)/include
     31LIBS = $(LIBNET_PREFIX)/libnet.a
     32EXTRA_CFLAGS = -I$(LIBNET_PREFIX)/include
    3333
    3434BINARY = netstart
  • uspace/srv/net/nil/eth/Makefile

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

    r10056483 ref689ef0  
    4545
    4646#include <ipc/ipc.h>
     47#include <ipc/net.h>
    4748#include <ipc/services.h>
    4849
    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

    r10056483 ref689ef0  
    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

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

    r10056483 ref689ef0  
    4343#include <err.h>
    4444#include <ipc/ipc.h>
     45#include <ipc/net.h>
    4546#include <ipc/services.h>
    4647
    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

    r10056483 ref689ef0  
    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

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

    r10056483 ref689ef0  
    4444#include <ipc/ipc.h>
    4545#include <ipc/services.h>
     46#include <ipc/net.h>
    4647#include <ipc/icmp.h>
    4748#include <sys/time.h>
     
    5556#include <net/inet.h>
    5657
    57 #include <net_messages.h>
    5858#include <net/modules.h>
    5959#include <packet_client.h>
  • uspace/srv/net/tl/tcp/Makefile

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

    r10056483 ref689ef0  
    4747#include <ipc/ipc.h>
    4848#include <ipc/services.h>
     49#include <ipc/net.h>
    4950#include <ipc/socket.h>
    5051
     
    5657#include <net/modules.h>
    5758
    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>
    6968#include <socket_core.h>
    7069#include <tl_common.h>
  • uspace/srv/net/tl/tcp/tcp.h

    r10056483 ref689ef0  
    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

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

    r10056483 ref689ef0  
    4242#include <ipc/ipc.h>
    4343#include <ipc/services.h>
     44#include <ipc/net.h>
    4445#include <ipc/socket.h>
    4546#include <errno.h>
     
    5354#include <net/modules.h>
    5455
    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.