Changeset ef689ef0 in mainline for uspace/srv


Ignore:
Timestamp:
2010-10-14T22:08:50Z (15 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
a7a85d16
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/srv
Files:
28 edited

Legend:

Unmodified
Added
Removed

  • 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.