Changeset c0e74b1 in mainline for uspace/srv


Ignore:
Timestamp:
2010-10-06T22:58:18Z (15 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
ae972834
Parents:
49d871ea (diff), d9e2e0e (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.

This merge continues with the overhaul of the networking subsystem and procedes
towards the ultimate goal of getting rid of the current lib socket. The current
lib socket mixes code which should either belong to libc, libnet or directly to
the packet server. By moving generic non-networking and client networking code
out of the current lib socket, I am preparing to merge the rest of it to lib net
and the packet server and fix ticket #257 for the modular builds. When this is
done, we can talk of moving some of the networking client code back to a
dedicated client library, but we can just as well keep it in lib C, similar to
how we have file system client code there.

Location:
uspace/srv
Files:
21 edited

Legend:

Unmodified
Added
Removed

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

    r49d871ea rc0e74b1  
    3434
    3535#include <assert.h>
     36#include <byteorder.h>
    3637#include <errno.h>
    3738
    38 #include <net_byteorder.h>
    3939#include <netif_local.h>
    4040#include <packet/packet.h>

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

    r49d871ea rc0e74b1  
    4545
    4646#include <net_messages.h>
    47 #include <net_modules.h>
     47#include <net/modules.h>
    4848#include <packet/packet_client.h>
    4949#include <adt/measured_strings.h>

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

    r49d871ea rc0e74b1  
    4545#include <ipc/ipc.h>
    4646#include <ipc/services.h>
     47#include <byteorder.h>
    4748#include <err.h>
    4849
    4950#include <net_messages.h>
    50 #include <net_modules.h>
    51 #include <net_byteorder.h>
     51#include <net/modules.h>
    5252#include <net_device.h>
    5353#include <arp_interface.h>

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

    r49d871ea rc0e74b1  
    4545#include <ipc/services.h>
    4646
    47 #include <net_modules.h>
     47#include <net/modules.h>
    4848#include <net_interface.h>
    4949#include <packet/packet.h>

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

    r49d871ea rc0e74b1  
    4545#include <ipc/services.h>
    4646#include <sys/types.h>
     47#include <byteorder.h>
     48
     49#include <net/socket_codes.h>
     50#include <net/in.h>
     51#include <net/in6.h>
     52#include <net/inet.h>
     53#include <net/modules.h>
    4754
    4855#include <net_messages.h>
    49 #include <net_modules.h>
    5056#include <arp_interface.h>
    51 #include <net_byteorder.h>
    5257#include <net_checksum.h>
    5358#include <net_device.h>
    … …  
    5661#include <icmp_interface.h>
    5762#include <il_interface.h>
    58 #include <in.h>
    59 #include <in6.h>
    60 #include <inet.h>
    6163#include <ip_client.h>
    6264#include <ip_interface.h>
    … …  
    6466#include <nil_interface.h>
    6567#include <tl_interface.h>
    66 #include <socket_codes.h>
    6768#include <adt/measured_strings.h>
    6869#include <adt/module_map.h>

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

    r49d871ea rc0e74b1  
    4343
    4444#include <net_device.h>
    45 #include <inet.h>
     45#include <net/inet.h>
    4646#include <ip_interface.h>
    4747#include <adt/int_map.h>

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

    r49d871ea rc0e74b1  
    4444#include <err.h>
    4545
    46 #include <net_modules.h>
     46#include <net/modules.h>
    4747#include <net_interface.h>
    4848#include <packet/packet.h>

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

    r49d871ea rc0e74b1  
    4949
    5050#include <net_messages.h>
    51 #include <net_modules.h>
     51#include <net/modules.h>
    5252#include <adt/char_map.h>
    5353#include <adt/generic_char_map.h>

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

    r49d871ea rc0e74b1  
    3838
    3939#include <ipc/ipc.h>
     40#include <ipc/net.h>
    4041
    41 #include <net_messages.h>
    4242#include <ip_interface.h>
    4343#include <adt/measured_strings.h>

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

    r49d871ea rc0e74b1  
    4545
    4646#include <net_messages.h>
    47 #include <net_modules.h>
     47#include <net/modules.h>
    4848#include <adt/measured_strings.h>
    4949#include <packet/packet_client.h>

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

    r49d871ea rc0e74b1  
    4949#include <ipc/services.h>
    5050
    51 #include <net_modules.h>
     51#include <net/modules.h>
    5252#include <net_net_messages.h>
    5353

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

    r49d871ea rc0e74b1  
    4040#include <mem.h>
    4141#include <stdio.h>
     42#include <byteorder.h>
    4243#include <str.h>
    4344#include <err.h>
    … …  
    4748
    4849#include <net_messages.h>
    49 #include <net_modules.h>
    50 #include <net_byteorder.h>
     50#include <net/modules.h>
    5151#include <net_checksum.h>
    5252#include <ethernet_lsap.h>

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

    r49d871ea rc0e74b1  
    4343#include <ipc/services.h>
    4444
    45 #include <net_modules.h>
     45#include <net/modules.h>
    4646#include <net_interface.h>
    4747#include <packet/packet.h>

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

    r49d871ea rc0e74b1  
    4646
    4747#include <net_messages.h>
    48 #include <net_modules.h>
     48#include <net/modules.h>
    4949#include <net_device.h>
    5050#include <netif_interface.h>

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

    r49d871ea rc0e74b1  
    4343#include <ipc/services.h>
    4444
    45 #include <net_modules.h>
     45#include <net/modules.h>
    4646#include <net_interface.h>
    4747#include <packet/packet.h>

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

    r49d871ea rc0e74b1  
    4646#include <sys/time.h>
    4747#include <sys/types.h>
     48#include <byteorder.h>
    4849#include <errno.h>
    4950#include <err.h>
    5051
     52#include <net/socket_codes.h>
     53#include <net/ip_protocols.h>
     54#include <net/inet.h>
     55
    5156#include <net_messages.h>
    52 #include <net_modules.h>
     57#include <net/modules.h>
    5358#include <packet/packet_client.h>
    5459#include <packet_remote.h>
    55 #include <net_byteorder.h>
    5660#include <net_checksum.h>
    5761#include <icmp_api.h>
    … …  
    6165#include <icmp_interface.h>
    6266#include <il_interface.h>
    63 #include <inet.h>
    6467#include <ip_client.h>
    6568#include <ip_interface.h>
    66 #include <ip_protocols.h>
    6769#include <net_interface.h>
    68 #include <socket_codes.h>
    6970#include <tl_messages.h>
    7071#include <tl_interface.h>

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

    r49d871ea rc0e74b1  
    4444#include <ipc/services.h>
    4545
    46 #include <net_modules.h>
     46#include <net/modules.h>
    4747#include <packet/packet.h>
    4848#include <net_interface.h>

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

    r49d871ea rc0e74b1  
    4747#include <ipc/ipc.h>
    4848#include <ipc/services.h>
     49#include <ipc/socket.h>
     50
     51#include <net/socket_codes.h>
     52#include <net/ip_protocols.h>
     53#include <net/in.h>
     54#include <net/in6.h>
     55#include <net/inet.h>
     56#include <net/modules.h>
    4957
    5058#include <net_messages.h>
    51 #include <net_modules.h>
    5259#include <adt/dynamic_fifo.h>
    5360#include <packet/packet_client.h>
    5461#include <packet_remote.h>
    5562#include <net_checksum.h>
    56 #include <in.h>
    57 #include <in6.h>
    58 #include <inet.h>
    5963#include <ip_client.h>
    6064#include <ip_interface.h>
    61 #include <ip_protocols.h>
    6265#include <icmp_client.h>
    6366#include <icmp_interface.h>
    6467#include <net_interface.h>
    65 #include <socket_codes.h>
    6668#include <tcp_codes.h>
    6769#include <socket_core.h>
    68 #include <socket_messages.h>
    6970#include <tl_common.h>
    7071#include <tl_messages.h>

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

    r49d871ea rc0e74b1  
    4444#include <ipc/services.h>
    4545
    46 #include <net_modules.h>
     46#include <net/ip_protocols.h>
     47#include <net/modules.h>
     48
    4749#include <packet/packet.h>
    4850#include <net_interface.h>
    49 #include <ip_protocols.h>
    5051#include <ip_interface.h>
    5152#include <tl_local.h>

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

    r49d871ea rc0e74b1  
    4242#include <ipc/ipc.h>
    4343#include <ipc/services.h>
     44#include <ipc/socket.h>
    4445#include <errno.h>
    4546#include <err.h>
    4647
     48#include <net/socket_codes.h>
     49#include <net/ip_protocols.h>
     50#include <net/in.h>
     51#include <net/in6.h>
     52#include <net/inet.h>
     53#include <net/modules.h>
     54
    4755#include <net_messages.h>
    48 #include <net_modules.h>
    4956#include <adt/dynamic_fifo.h>
    5057#include <packet/packet_client.h>
    5158#include <packet_remote.h>
    5259#include <net_checksum.h>
    53 #include <in.h>
    54 #include <in6.h>
    55 #include <inet.h>
    5660#include <ip_client.h>
    5761#include <ip_interface.h>
    58 #include <ip_protocols.h>
    5962#include <icmp_client.h>
    6063#include <icmp_interface.h>
    6164#include <net_interface.h>
    62 #include <socket_codes.h>
    6365#include <socket_core.h>
    64 #include <socket_messages.h>
    6566#include <tl_common.h>
    6667#include <tl_local.h>

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

    r49d871ea rc0e74b1  
    4444#include <ipc/services.h>
    4545
    46 #include <net_modules.h>
     46#include <net/modules.h>
    4747#include <packet/packet.h>
    4848#include <net_interface.h>
Note: See TracChangeset for help on using the changeset viewer.