Changeset ec1bdc8 in mainline

Timestamp:

2010-09-26T18:57:30Z (14 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

Files:

• app/netecho/netecho.c (modified) (view diffs)
• app/netecho/print_error.c (modified) (view diffs)
• app/nettest1/nettest.c (modified) (view diffs)
• app/nettest1/nettest1.c (modified) (view diffs)
• app/nettest2/nettest2.c (modified) (view diffs)
• app/ping/ping.c (modified) (view diffs)
• lib/c/Makefile (modified) (view diffs)
• lib/c/generic/adt/char_map.c (added)
• lib/c/generic/adt/dynamic_fifo.c (added)
• lib/c/generic/adt/measured_strings.c (added)
• lib/c/include/adt/char_map.h (added)
• lib/c/include/adt/dynamic_fifo.h (added)
• lib/c/include/adt/generic_char_map.h (added)
• lib/c/include/adt/generic_field.h (added)
• lib/c/include/adt/int_map.h (added)
• lib/c/include/adt/measured_strings.h (moved) (moved from uspace/lib/socket/include/net_err.h ) (view diffs)
• lib/c/include/err.h (modified) (view diffs)
• lib/c/include/errno.h (modified) (view diffs)
• lib/net/adt/module_map.c (modified) (view diffs)
• lib/net/generic/packet_remote.c (modified) (view diffs)
• lib/net/il/ip_client.c (modified) (view diffs)
• lib/net/include/netif_local.h (modified) (view diffs)
• lib/net/netif/netif_local.c (modified) (view diffs)
• lib/net/tl/tl_common.c (modified) (view diffs)
• lib/socket/Makefile (modified) (view diffs)
• lib/socket/adt/char_map.c (deleted)
• lib/socket/adt/dynamic_fifo.c (deleted)
• lib/socket/adt/measured_strings.c (deleted)
• lib/socket/generic/net_modules.c (modified) (view diffs)
• lib/socket/generic/socket_client.c (modified) (view diffs)
• lib/socket/generic/socket_core.c (modified) (view diffs)
• lib/socket/include/adt/char_map.h (deleted)
• lib/socket/include/adt/dynamic_fifo.h (deleted)
• lib/socket/include/adt/generic_char_map.h (deleted)
• lib/socket/include/adt/generic_field.h (deleted)
• lib/socket/include/adt/int_map.h (deleted)
• lib/socket/include/adt/measured_strings.h (deleted)
• lib/socket/include/socket.h (modified) (view diffs)
• lib/socket/include/socket_errno.h (deleted)
• lib/socket/packet/packet.c (modified) (view diffs)
• lib/socket/packet/packet_client.c (modified) (view diffs)
• lib/socket/packet/packet_server.c (modified) (view diffs)
• srv/hw/netif/dp8390/dp8390_module.c (modified) (view diffs)
• srv/net/il/arp/arp.c (modified) (view diffs)
• srv/net/il/arp/arp_module.c (modified) (view diffs)
• srv/net/il/ip/ip.c (modified) (view diffs)
• srv/net/il/ip/ip_module.c (modified) (view diffs)
• srv/net/net/net.c (modified) (view diffs)
• srv/net/netif/lo/lo.c (modified) (view diffs)
• srv/net/netstart/netstart.c (modified) (view diffs)
• srv/net/nil/eth/eth.c (modified) (view diffs)
• srv/net/nil/eth/eth_module.c (modified) (view diffs)
• srv/net/nil/nildummy/nildummy.c (modified) (view diffs)
• srv/net/nil/nildummy/nildummy_module.c (modified) (view diffs)
• srv/net/tl/icmp/icmp.c (modified) (view diffs)
• srv/net/tl/icmp/icmp_module.c (modified) (view diffs)
• srv/net/tl/tcp/tcp.c (modified) (view diffs)
• srv/net/tl/tcp/tcp_module.c (modified) (view diffs)
• srv/net/tl/udp/udp.c (modified) (view diffs)
• srv/net/tl/udp/udp_module.c (modified) (view diffs)