Changeset ec1bdc8 in mainline for uspace/srv/net


Ignore:
Timestamp:
2010-09-26T18:57:30Z (16 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
3fe57ea7
Parents:
2a786f9 (diff), 70ce016 (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/net
Files:
17 edited

Legend:

Unmodified
Added
Removed

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

    r2a786f9 rec1bdc8  
    4545#include <ipc/ipc.h>
    4646#include <ipc/services.h>
    47 
    48 #include <net_err.h>
     47#include <err.h>
     48
    4949#include <net_messages.h>
    5050#include <net_modules.h>

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

    r2a786f9 rec1bdc8  
    4040#include <async.h>
    4141#include <stdio.h>
     42#include <err.h>
    4243
    4344#include <ipc/ipc.h>
    4445#include <ipc/services.h>
    4546
    46 #include <net_err.h>
    4747#include <net_modules.h>
    4848#include <net_interface.h>

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

    r2a786f9 rec1bdc8  
    3838#include <async.h>
    3939#include <errno.h>
     40#include <err.h>
    4041#include <fibril_synch.h>
    4142#include <stdio.h>
    … …  
    4546#include <sys/types.h>
    4647
    47 #include <net_err.h>
    4848#include <net_messages.h>
    4949#include <net_modules.h>
    … …  
    6565#include <tl_interface.h>
    6666#include <socket_codes.h>
    67 #include <socket_errno.h>
    6867#include <adt/measured_strings.h>
    6968#include <adt/module_map.h>

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

    r2a786f9 rec1bdc8  
    4242#include <ipc/ipc.h>
    4343#include <ipc/services.h>
     44#include <err.h>
    4445
    45 #include <net_err.h>
    4646#include <net_modules.h>
    4747#include <net_interface.h>

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

    r2a786f9 rec1bdc8  
    4040#include <ddi.h>
    4141#include <errno.h>
     42#include <err.h>
    4243#include <malloc.h>
    4344#include <stdio.h>
    … …  
    4748#include <ipc/services.h>
    4849
    49 #include <net_err.h>
    5050#include <net_messages.h>
    5151#include <net_modules.h>

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

    r2a786f9 rec1bdc8  
    3737#include <async.h>
    3838#include <errno.h>
     39#include <err.h>
    3940#include <stdio.h>
    4041#include <str.h>
    … …  
    4344#include <ipc/services.h>
    4445
    45 #include <net_err.h>
    4646#include <net_messages.h>
    4747#include <net_modules.h>

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

    r2a786f9 rec1bdc8  
    4545#include <task.h>
    4646#include <str_error.h>
     47#include <err.h>
    4748#include <ipc/ipc.h>
    4849#include <ipc/services.h>
    4950
    50 #include <net_err.h>
    5151#include <net_modules.h>
    5252#include <net_net_messages.h>

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

    r2a786f9 rec1bdc8  
    4141#include <stdio.h>
    4242#include <str.h>
     43#include <err.h>
    4344
    4445#include <ipc/ipc.h>
    4546#include <ipc/services.h>
    4647
    47 #include <net_err.h>
    4848#include <net_messages.h>
    4949#include <net_modules.h>

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

    r2a786f9 rec1bdc8  
    3838#include <async.h>
    3939#include <stdio.h>
     40#include <err.h>
    4041
    4142#include <ipc/ipc.h>
    4243#include <ipc/services.h>
    4344
    44 #include <net_err.h>
    4545#include <net_modules.h>
    4646#include <net_interface.h>

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

    r2a786f9 rec1bdc8  
    4141#include <stdio.h>
    4242#include <str.h>
     43#include <err.h>
    4344#include <ipc/ipc.h>
    4445#include <ipc/services.h>
    4546
    46 #include <net_err.h>
    4747#include <net_messages.h>
    4848#include <net_modules.h>

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

    r2a786f9 rec1bdc8  
    3838#include <async.h>
    3939#include <stdio.h>
     40#include <err.h>
    4041
    4142#include <ipc/ipc.h>
    4243#include <ipc/services.h>
    4344
    44 #include <net_err.h>
    4545#include <net_modules.h>
    4646#include <net_interface.h>

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

    r2a786f9 rec1bdc8  
    4646#include <sys/time.h>
    4747#include <sys/types.h>
    48 
    49 #include <net_err.h>
     48#include <errno.h>
     49#include <err.h>
     50
    5051#include <net_messages.h>
    5152#include <net_modules.h>
    … …  
    6667#include <net_interface.h>
    6768#include <socket_codes.h>
    68 #include <socket_errno.h>
    6969#include <tl_messages.h>
    7070#include <tl_interface.h>

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

    r2a786f9 rec1bdc8  
    4040#include <async.h>
    4141#include <stdio.h>
     42#include <err.h>
    4243#include <ipc/ipc.h>
    4344#include <ipc/services.h>
    4445
    45 #include <net_err.h>
    4646#include <net_modules.h>
    4747#include <packet/packet.h>

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

    r2a786f9 rec1bdc8  
    4242//TODO remove stdio
    4343#include <stdio.h>
     44#include <errno.h>
     45#include <err.h>
    4446
    4547#include <ipc/ipc.h>
    4648#include <ipc/services.h>
    4749
    48 #include <net_err.h>
    4950#include <net_messages.h>
    5051#include <net_modules.h>
    … …  
    6364#include <net_interface.h>
    6465#include <socket_codes.h>
    65 #include <socket_errno.h>
    6666#include <tcp_codes.h>
    6767#include <socket_core.h>

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

    r2a786f9 rec1bdc8  
    4040#include <async.h>
    4141#include <stdio.h>
     42#include <err.h>
    4243#include <ipc/ipc.h>
    4344#include <ipc/services.h>
    4445
    45 #include <net_err.h>
    4646#include <net_modules.h>
    4747#include <packet/packet.h>

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

    r2a786f9 rec1bdc8  
    4242#include <ipc/ipc.h>
    4343#include <ipc/services.h>
    44 
    45 #include <net_err.h>
     44#include <errno.h>
     45#include <err.h>
     46
    4647#include <net_messages.h>
    4748#include <net_modules.h>
    … …  
    6061#include <net_interface.h>
    6162#include <socket_codes.h>
    62 #include <socket_errno.h>
    6363#include <socket_core.h>
    6464#include <socket_messages.h>

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

    r2a786f9 rec1bdc8  
    4040#include <async.h>
    4141#include <stdio.h>
     42#include <err.h>
    4243#include <ipc/ipc.h>
    4344#include <ipc/services.h>
    4445
    45 #include <net_err.h>
    4646#include <net_modules.h>
    4747#include <packet/packet.h>
Note: See TracChangeset for help on using the changeset viewer.